Merge branch 'wise-doc' into collaboration

Conflicts:
	mindplot/pom.xml
	mindplot/src/main/javascript/DesignerActionRunner.js
	mindplot/src/main/javascript/DragTopic.js
	mindplot/src/main/javascript/MindmapDesigner.js
	wise-doc/src/main/webapp/html/editor.html
	wise-doc/src/main/webapp/js/editor.js
This commit is contained in:
Pablol
2011-08-07 19:51:03 -03:00
64 changed files with 2099 additions and 9840 deletions

View File

@@ -18,7 +18,7 @@
mindplot.NodeGraph = new Class({
initialize:function(nodeModel) {
$assert(nodeModel,"model can not be null");
$assert(nodeModel, "model can not be null");
this._mouseEvents = true;
this.setModel(nodeModel);
this._onFocus = false;
@@ -74,13 +74,10 @@ mindplot.NodeGraph = new Class({
this._model.setSize(size.width, size.height);
},
getModel
:
function() {
$assert(this._model, 'Model has not been initialized yet');
return this._model;
}
,
getModel:function() {
$assert(this._model, 'Model has not been initialized yet');
return this._model;
},
setModel : function(model) {
$assert(model, 'Model can not be null');