Merge branch 'refs/heads/master' into components

2 files changed, 37 insertions, 35 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 84b994ce..b1a22c1b 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -9,8 +9,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var Montage =           require("montage/core/core").Montage,
     Component =         require("montage/ui/component").Component,
     Uuid =                      require("montage/core/uuid").Uuid,
-    HTMLDocument =      require("js/io/document/html-document").HTMLDocument,
-    TextDocument =      require("js/io/document/text-document").TextDocument,
+    HTMLDocument =      require("js/document/html-document").HTMLDocument,
+    TextDocument =      require("js/document/text-document").TextDocument,
     DocumentController;
 ////////////////////////////////////////////////////////////////////////
 //
@@ -28,29 +28,23 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
     _iframeHolder: { value: null, enumerable: false },
     _textHolder: { value: null, enumerable: false },
     _codeMirrorCounter: {value: 1, enumerable: false},
-
-    tmpSourceForTesting: {
-        value: "function CodeMirror(place, givenOptions) {" +
-                "// Determine effective options based on given values and defaults." +
-                "var options = {}, defaults = CodeMirror.defaults; }"
-            },
-
+    
     activeDocument: {
         get: function() {
             return this._activeDocument;
         },
         set: function(doc) {
-            if(this._activeDocument)  this._activeDocument.isActive = false;
-                
-            if(this._documents.indexOf(doc) === -1) this._documents.push(doc);
+            if(!!this._activeDocument) this._activeDocument.isActive = false;
 
             this._activeDocument = doc;
-            this._activeDocument.isActive = true;
+            if(!!this._activeDocument){
 
-            if(!!this._activeDocument.editor){
-                this._activeDocument.editor.focus();
+                if(this._documents.indexOf(doc) === -1) this._documents.push(doc);
+                this._activeDocument.isActive = true;
+                if(!!this._activeDocument.editor){
+                    this._activeDocument.editor.focus();
+                }
             }
-
         }
     },
 
@@ -62,21 +56,12 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
             this.eventManager.addEventListener("executeSave", this, false);
 
             this.eventManager.addEventListener("recordStyleChanged", this, false);
-
-                        // Temporary testing opening a new file after Ninja has loaded
-                        this.eventManager.addEventListener("executeNewProject", this, false);
         }
     },
 
     handleAppLoaded: {
         value: function() {
-            //this.openDocument({"type": "html"});
-        }
-    },
-        
-        handleExecuteNewProject: {
-        value: function() {
-            this.openDocument({"type": "html"});
+            //
         }
     },
 
@@ -104,16 +89,26 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
     handleExecuteSave: {
         value: function(event) {
                 //Text and HTML document classes should return the same save object for fileSave
-                this.application.ninja.ioMediator.fileSave(this.activeDocument.save(), this.clearDocumentDirtyFlag.bind(this));
+                this.application.ninja.ioMediator.fileSave(this.activeDocument.save(), this.fileSaveResult.bind(this));
                 }
     },
-
+    ////////////////////////////////////////////////////////////////////
+    //
+    fileSaveResult: {
+        value: function (result) {
+                if(result.status === 204){
+                this.clearDocumentDirtyFlag();
+            }
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+        
+        
     clearDocumentDirtyFlag:{
         value: function(){
             this.activeDocument.dirtyFlag = false;
         }
     },
-        ////////////////////////////////////////////////////////////////////
         
         
     createNewFile:{
@@ -189,7 +184,7 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
                         switch (doc.extension) {
                                 case 'html': case 'html':
                                         //Open in designer view
-                                        Montage.create(HTMLDocument).initialize(doc, Uuid.generate(), this._createIframeElement(), this._onOpenDocument);
+                                        Montage.create(HTMLDocument).initialize(doc, Uuid.generate(), this._createIframeElement(), this._onOpenDocument.bind(this));
                                         break;
                                 default:
                                         //Open in code view
@@ -255,7 +250,6 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
         }
 
             var doc = this._findDocumentByUUID(id);
-            this._removeDocumentView(doc.container);
 
             var closeDocumentIndex = this._findIndexByUUID(id);
             this._documents.splice(this._findIndexByUUID(id), 1);
@@ -268,8 +262,11 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
                     nextDocumentIndex = closeDocumentIndex - 1;
                 }
                 this.application.ninja.stage.stageView.switchDocument(this._documents[nextDocumentIndex]);
+                this._removeDocumentView(doc.container);
             }else if(this._documents.length === 0){
-                //if there are no documents to switch to then just show the iframeContainer
+                this.activeDocument = null;
+                this._removeDocumentView(doc.container);
+                this.application.ninja.stage.stageView.hideRulers();
                 document.getElementById("iframeContainer").style.display="block";
             }
         }
@@ -280,11 +277,15 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
     _onOpenDocument: {
         value: function(doc){
             //var data = DocumentManager.activeDocument;
-            //DocumentManager._hideCurrentDocument();
 
-            //stageManagerModule.stageManager.toggleCanvas();
+            this._hideCurrentDocument();
+            this.application.ninja.stage.stageView.hideOtherDocuments(doc.uuid);
+
+            this.application.ninja.stage.hideCanvas(false);
+
+            this.activeDocument = doc;
 
-            DocumentController.activeDocument = doc;
+            this._showCurrentDocument();
 
             NJevent("onOpenDocument", doc);
 //            appDelegateModule.MyAppDelegate.onSetActiveDocument();
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 640119c4..15a18a51 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -59,6 +59,7 @@ exports.ShapesController = Montage.create(CanvasController, {
                     break;
                 case "useWebGl":
                     var canvas = njModule.NJUtils.makeNJElement("canvas", "Canvas", "shape", el.className, true);
+                    canvas.setAttribute("data-RDGE-id", njModule.NJUtils.generateRandom());
                     canvas.width = el.width;
                     canvas.height = el.height;
                     this.application.ninja.elementMediator.replaceElement(el, canvas);