zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge WiseDoc with Master. WiseDoc branch must not be used.

Browse Source
This commit is contained in:
Paulo Veiga
2011-10-02 12:22:09 -03:00
parent 304f9f4c97
commit a994099397
18 changed files with 6335 additions and 1059 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mindplot/pom.xml
View File

@@ -67,7 +67,7 @@
<filelist dir="${basedir}/src/main/javascript/" files="model/RelationshipModel.js"/>
<filelist dir="${basedir}/src/main/javascript/" files="ActionDispatcher.js"/>
<filelist dir="${basedir}/src/main/javascript/" files="BrixActionDispatcher.js"/>
<filelist dir="${basedir}/src/main/javascript/" files="LocalActionDispatcher.js"/>
<filelist dir="${basedir}/src/main/javascript/" files="StandaloneActionDispatcher.js"/>
<filelist dir="${basedir}/src/main/javascript/" files="DesignerModel.js"/>
<filelist dir="${basedir}/src/main/javascript/" files="MindmapDesigner.js"/>
<filelist dir="${basedir}/src/main/javascript/" files="ScreenManager.js"/>

3
mindplot/src/main/javascript/Beta2PelaMigrator.js
View File

@@ -25,7 +25,8 @@ mindplot.Beta2PelaMigrator = new Class({
return this._pelaSerializer.toXML(mindmap);
},
loadFromDom : function(dom) {
loadFromDom : function(dom,mapId) {
$assert($defined(mapId),"mapId can not be null");
var mindmap = this._betaSerializer.loadFromDom(dom);
mindmap.setVersion(mindplot.ModelCodeName.PELA);
return mindmap;

9
mindplot/src/main/javascript/MindmapDesigner.js
View File

@@ -25,9 +25,12 @@ mindplot.MindmapDesigner = new Class({
// Dispatcher manager ...
var commandContext = new mindplot.CommandContext(this);
this._actionDispatcher = new mindplot.BrixActionDispatcher(commandContext);
// this._actionDispatcher = new mindplot.LocalActionDispatcher(commandContext);
// this._actionDispatcher = new mindplot.LocalActionDispatcher(commandContext);
if (profile.collab == 'standalone') {
this._actionDispatcher = new mindplot.StandaloneActionDispatcher(commandContext);
} else {
this._actionDispatcher = new mindplot.BrixActionDispatcher(commandContext);
}
this._actionDispatcher.addEvent("modelUpdate", function(event) {
this.fireEvent("modelUpdate", event);
}.bind(this));

2
mindplot/src/main/javascript/LocalActionDispatcher.js → mindplot/src/main/javascript/StandaloneActionDispatcher.js
View File

@@ -16,7 +16,7 @@
* limitations under the License.
*/
mindplot.LocalActionDispatcher = new Class({
mindplot.StandaloneActionDispatcher = new Class({
Extends: mindplot.ActionDispatcher,
initialize: function(commandContext) {
this.parent(commandContext);

2
mindplot/src/main/javascript/collaboration/framework/AbstractCollaborativeFramework.js
View File

@@ -46,7 +46,7 @@ mindplot.collaboration.framework.AbstractCollaborativeFramework = new Class({
getActionDispatcher:function() {
if (this._actionDispatcher == null) {
var context = mindplot.ActionDispatcher.getInstance()._commandContext;
this._actionDispatcher = new mindplot.LocalActionDispatcher(context);
this._actionDispatcher = new mindplot.StandaloneActionDispatcher(context);
}
return this._actionDispatcher;
}