Merge branch 'wise-doc' of ssh://wisemapping.com/var/git-repos/wise-source into wise-doc

This commit is contained in:
Paulo Veiga
2011-08-09 02:28:40 -03:00
8 changed files with 644 additions and 13777 deletions

View File

@@ -227,6 +227,9 @@
<include>model/Mindmap-min.js</include>
<include>model/NodeModel-min.js</include>
<include>model/RelationshipModel-min.js</include>
<include>ActionDispatcher-min.js</include>
<include>BrixActionDispatcher-min.js</include>
<include>LocalActionDispatcher-min.js</include>
<include>MindmapDesigner-min.js</include>
<include>ScreenManager-min.js</include>
<include>Workspace-min.js</include>
@@ -311,6 +314,13 @@
</include>
<include>collaboration/frameworks/brix/BrixFramework-min.js</include>
<include>widget/IconPanel-min.js</include>
<include>widget/ToolbarPanel-min.js</include>
<include>widget/FontFamilyPanel-min.js</include>
<include>widget/FontSizePanel-min.js</include>
<include>widget/TopicShapePanel-min.js</include>
<include>widget/Menu-min.js</include>
<include>footer-min.js</include>
</includes>

View File

@@ -30,11 +30,7 @@ mindplot.BrixActionDispatcher = new Class({
topicsIds = [topicsIds];
}
var topic = framework.getTopic(topicsIds[0]);
var callback = function(event, topic) {
topic.getBrixModel().removeListener("valueChanged", callback);
this._actionDispatcher.changeTextOnTopic(topic.getId(), event.getNewValue());
}.bindWithEvent(this, topic);
topic.setText(text, true, callback);
topic.setText(text, true);
}
});

View File

@@ -22,14 +22,14 @@ mindplot.collaboration.frameworks.AbstractCollaborativeFramework = new Class({
var node = mindmap.createNode(type,id);
node.setText(branch.getText());
mindmap.addBranch(node);
}.bind(this))
}.bind(this));
return mindmap;
},
_buildInitialCollaborativeModel: function(){
var mindmap = this._collaborativeModelFactory.buildMindMap();
this.addMindmap(mindmap);
var centralTopic = mindmap.createNode(mindplot.model.NodeModel.CENTRAL_TOPIC_TYPE);
mindmap.addBranch(centralTopic);
mindmap.addBranch(centralTopic, true);
this.addMindmap(mindmap);
return mindmap;
},
addMindmap:function(model){},

View File

@@ -46,15 +46,11 @@ mindplot.collaboration.frameworks.brix.model.NodeModel = new Class({
model.put("type",this._type);
model.put("id",this._id);
model.put("text",this._type==mindplot.model.NodeModel.CENTRAL_TOPIC_TYPE?"Central Topic":"Main Topic");
model.addListener("valueChanged",this._valueChangedListener.bind(this));
return model;
},
getBrixModel:function(){
return this._brixModel;
},
_valueChangedListener:function(event){
console.log("property: "+ event.getProperty()+" value: "+event.getNewValue());
},
clone : function() {
var result = new mindplot.model.NodeModel(this._type, this._mindmap);
result._order = this._order;
@@ -110,10 +106,9 @@ mindplot.collaboration.frameworks.brix.model.NodeModel = new Class({
return this._type;
},
setText : function(text,updateModel, callback) {
setText : function(text,updateModel) {
this.parent(text);
if($defined(updateModel) && updateModel){
this._brixModel.addListener("valueChanged",callback);
this._brixModel.put("text",text);
}
},