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

Fix error on brix framework loading ...

Browse Source
This commit is contained in:
Paulo Veiga
2011-09-06 22:12:11 -03:00
parent 6468f6f0bc
commit dbed45c802
5 changed files with 67 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mindplot/src/main/javascript/collaboration/CollaborationManager.js
View File

@@ -20,7 +20,6 @@ mindplot.collaboration.CollaborationManager = new Class({
initialize:function() {
this.collaborativeModelReady = false;
this.collaborativeModelReady = null;
this.wiseReady = false;
},
isCollaborationFrameworkAvailable : function() {
@@ -30,13 +29,6 @@ mindplot.collaboration.CollaborationManager = new Class({
setCollaborativeFramework : function(framework) {
this._collaborativeFramework = framework;
this.collaborativeModelReady = true;
if (this.wiseReady) {
buildCollaborativeMindmapDesigner();
}
},
setWiseReady:function(ready) {
this.wiseReady = ready;
},
isCollaborativeFrameworkReady:function() {
@@ -58,5 +50,5 @@ mindplot.collaboration.CollaborationManager.getInstance = function() {
mindplot.collaboration.CollaborationManager.__collaborationManager = new mindplot.collaboration.CollaborationManager();
}
return mindplot.collaboration.CollaborationManager.__collaborationManager;
}
};
mindplot.collaboration.CollaborationManager.getInstance();

5
mindplot/src/main/javascript/collaboration/framework/brix/BrixFramework.js
View File

@@ -41,7 +41,8 @@ mindplot.collaboration.framework.brix.BrixFramework = new Class({
});
instanciated = false;
mindplot.collaboration.framework.brix.BrixFramework.instanciate = function() {
mindplot.collaboration.framework.brix.BrixFramework.init = function(onload) {
$assert(onload, "load function can not be null");
if ((typeof isGoogleBrix != "undefined") && !instanciated) {
instanciated = true;
var app = new goog.collab.CollaborativeApp();
@@ -50,6 +51,7 @@ mindplot.collaboration.framework.brix.BrixFramework.instanciate = function() {
app.addListener('modelLoad', function(model) {
var framework = new mindplot.collaboration.framework.brix.BrixFramework(model, app);
mindplot.collaboration.CollaborationManager.getInstance().setCollaborativeFramework(framework);
onload();
}.bind(this));
}
};
@@ -80,6 +82,5 @@ mindplot.collaboration.framework.brix.BrixFramework.buildMenu = function(app) {
app.setMenuBar(menuBar);
};
mindplot.collaboration.framework.brix.BrixFramework.instanciate();