Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

6 files changed, 15 insertions, 39 deletions

diff --git a/js/document/document-html.js b/js/document/document-html.js
index b5684dc5..33a41a8e 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -119,10 +119,6 @@ exports.HtmlDocument = Montage.create(Component, {
         //
     serializeDocument: {
         value: function () {
-            // There are not needed for now since we cannot change them
-            //this.gridHorizontalSpacing = this.application.ninja.stage.drawUtils.gridHorizontalSpacing;
-            //this.gridVerticalSpacing = this.application.ninja.stage.drawUtils.gridVerticalSpacing;
-
             // Serialize the current scroll position
             //TODO: Move these properties to the design view class
             this.model.scrollLeft = this.application.ninja.stage._scrollLeft;
@@ -134,11 +130,6 @@ exports.HtmlDocument = Montage.create(Component, {
             // Serialize the selection, the container and grid
             //TODO: Move this property to the design view class
             this.model.selection = this.application.ninja.selectedElements.slice(0);
-            this.model.selectionContainer = this.application.ninja.currentSelectedContainer;
-            this.draw3DGrid = this.application.ninja.appModel.show3dGrid;
-
-            // Serialize the undo
-            // TODO: Save the montage undo queue
 
             // Pause the videos
             //TODO: Move these to be handled on the show/hide methods in the view
@@ -149,27 +140,15 @@ exports.HtmlDocument = Montage.create(Component, {
         //
     deserializeDocument: {
         value: function () {
-            // There are not needed for now since we cannot change them
-            //this.application.ninja.stage.drawUtils.gridHorizontalSpacing = this.gridHorizontalSpacing;
-            //this.application.ninja.stage.drawUtils.gridVerticalSpacing = this.gridVerticalSpacing;
-
             // Deserialize the current scroll position
              //TODO: Move these properties to the design view class
             this.application.ninja.stage._scrollLeft = this.model.scrollLeft;
             this.application.ninja.stage._scrollTop = this.model.scrollTop;
             this.application.ninja.stage._userContentLeft = this.model.userContentLeft;
             this.application.ninja.stage._userContentTop = this.model.userContentTop;
-                        
-                        //TODO: Move this property to the design view class
-            this.application.ninja.selectedElements = this.model.selection.slice(0);
-//            this.application.ninja.currentSelectedContainer = this.model.selectionContainer;
-            this.application.ninja.appModel.show3dGrid = this.draw3DGrid;
 
             // Serialize the undo
             // TODO: Save the montage undo queue
-                        
-                        //TODO: Move this to the document controller
-            this.model.isActive = true;
         }
     }
     ////////////////////////////////////////////////////////////////////
diff --git a/js/document/models/base.js b/js/document/models/base.js
index 6d9d2e89..76a5e62b 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -62,6 +62,20 @@ exports.BaseDocumentModel = Montage.create(Component, {
     },
     ////////////////////////////////////////////////////////////////////
         //
+    _selection: {
+        value: []
+    },
+
+    selection: {
+        get: function() {
+            return this._selection;
+        },
+        set: function(value) {
+            this._selection = value;
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
     fileTemplate: {
         value: null
     },
diff --git a/js/document/models/html.js b/js/document/models/html.js
index 0fe33990..9aa0d27e 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -27,11 +27,6 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
     },
     ////////////////////////////////////////////////////////////////////
     //
-    selection: {
-        value: []
-    },
-    ////////////////////////////////////////////////////////////////////
-    //
     selectionContainer: {
         value: []
     },
diff --git a/js/document/models/text.js b/js/document/models/text.js
index d1252b7d..6cb61d48 100755
--- a/js/document/models/text.js
+++ b/js/document/models/text.js
@@ -22,7 +22,7 @@ exports.TextDocumentModel = Montage.create(BaseDocumentModel, {
     save: {
         enumerable: false,
         value: function (callback) {
-            this.application.ninja.documentController.activeDocument.model.views.code.editor.save();//save to textarea
+            this.application.ninja.currentDocument.model.views.code.editor.save();//save to textarea
 
             var self = this;
 
@@ -60,7 +60,6 @@ exports.TextDocumentModel = Montage.create(BaseDocumentModel, {
                 }
                 //
                 this.parentContainer.removeChild(this.views.code.textViewContainer);
-                this.application.ninja.stage.showCodeViewBar(false);
                 this.application.ninja.stage.restoreAllPanels();
                 this.views.code = null;
 
diff --git a/js/document/views/code.js b/js/document/views/code.js
index 0a0ff5c1..c8b2a23e 100755
--- a/js/document/views/code.js
+++ b/js/document/views/code.js
@@ -82,12 +82,6 @@ exports.CodeDocumentView = Montage.create(BaseDocumentView, {
                 //
             var type;
             //
-            if(this.activeDocument) {
-                //need to hide only if another document was open before
-                //this.application.ninja.documentController._hideCurrentDocument();
-                                //this.hideOtherDocuments(doc.uuid);
-            }
-            //
             switch(file.extension) {
                 case  "css" :
                     type = "css";
diff --git a/js/document/views/design.js b/js/document/views/design.js
index dedfe8b6..9aeb370a 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -63,11 +63,6 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
         set: function(value) {this._document = value;}
     },
     ////////////////////////////////////////////////////////////////////
-        //
-    propertiesPanel: {
-        value: null
-    },
-    ////////////////////////////////////////////////////////////////////
     //
     _liveNodeList: {
         value: null