1 files changed, 90 insertions, 85 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index f6b850b2..7758f346 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -9,11 +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/document/html-document").HTMLDocument,
-    TextDocument =      require("js/document/text-document").TextDocument;
-
-    // New Document Objects
-var Document =      require("js/document/document-html").HtmlDocument;
+    HTMLDocument =  require("js/document/document-html").HtmlDocument,
+    TextDocument =  require("js/document/document-text").TextDocument;
 ////////////////////////////////////////////////////////////////////////
 //
 var DocumentController = exports.DocumentController = Montage.create(Component, {
@@ -51,10 +48,6 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
             if(!!this._activeDocument){
                 if(this._documents.indexOf(doc) === -1) this._documents.push(doc);
                 this._activeDocument.isActive = true;
-
-                if(!!this._activeDocument.editor){
-                    this._activeDocument.editor.focus();
-                }
             }
         }
     },
@@ -311,42 +304,38 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
             this.activeDocument.uri = fileUri;
             //save a new file
             //use the ioMediator.fileSaveAll when implemented
-            this.activeDocument._userDocument.name=filename;
-            this.activeDocument._userDocument.root=destination;
-            this.activeDocument._userDocument.uri=fileUri;
-            this.application.ninja.ioMediator.fileSave(this.activeDocument.save(), this.fileSaveResult.bind(this));
-            //
+            this.activeDocument.model.file.name = filename;
+            this.activeDocument.model.file.uri = fileUri;
+            this.activeDocument.model.save();
         }
     },
 
     ////////////////////////////////////////////////////////////////////
     openDocument: {
-        value: function(doc) {
+        value: function(file) {
                 var template, dimensions;
-                if (doc.content.body.indexOf('Ninja-Banner Dimensions@@@') !== -1) {
-                        dimensions = (doc.content.body.split('Ninja-Banner Dimensions@@@'))[1].split('-->')[0].split('x');
-                        dimensions = {width: parseInt(dimensions[0]), height: parseInt(dimensions[1])};
-                        template = {type: 'banner', size: dimensions};
-                }
+
             // TODO: HACKS to remove
-                        this.documentHackReference = doc;
+                        this.documentHackReference = file;
             document.getElementById("iframeContainer").style.overflow = "hidden";
                         //
-                        switch (doc.extension) {
+                        switch (file.extension) {
                                 case 'html':
+
+                    if (file.content.body.indexOf('Ninja-Banner Dimensions@@@') !== -1) {
+                        dimensions = (file.content.body.split('Ninja-Banner Dimensions@@@'))[1].split('-->')[0].split('x');
+                        dimensions = {width: parseInt(dimensions[0]), height: parseInt(dimensions[1])};
+                        template = {type: 'banner', size: dimensions};
+                    }
+
                                         //Open in designer view
                     this._hackRootFlag = false;
-                    Montage.create(Document).init(doc, this, this._onOpenDocument, 'design', template);
+                    Montage.create(HTMLDocument).init(file, this, this._onOpenDocument, 'design', template);
                                         break;
                                 default:
-                                        //Open in code view
-                                        var code = Montage.create(TextDocument, {"source": {value: doc.content}}), docuuid = Uuid.generate(), textArea;
-                                        textArea = this.application.ninja.stage.stageView.createTextAreaElement(docuuid);
-                                        code.initialize(doc, docuuid, textArea, textArea.parentNode);
-                                        //code.init(doc.name, doc.uri, doc.extension, null, docuuid);
-                                        code.textArea.value = doc.content;
-                                        this.application.ninja.stage.stageView.createTextView(code);
-                                        break;
+                    //Open in code view
+                    Montage.create(TextDocument).init(file, this, this._onOpenTextDocument, 'code');
+                    break;
                         }
         }
     },
@@ -357,7 +346,8 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
             console.log("URI is: ", uri);
         }
     },
-    
+
+    //todo: remove this funciton as it is not used
     textDocumentOpened: {
        value: function(doc) {
 
@@ -408,14 +398,18 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
 
             this._activeDocument = null;
 
-            this.application.ninja.stage.stageView.hideRulers();
-
-//            document.getElementById("iframeContainer").style.display="block";
+            this.application.ninja.stage.hideRulers();
 
             this.application.ninja.stage.hideCanvas(true);
 
+            //TODO: Use references for those instead of calling getElementById
+            if(this._documents.length === 0){
+                document.getElementById("iframeContainer").style.display="block";
+                document.getElementById("codeViewContainer").style.display="block";
+            }
 
                         NJevent("closeDocument", doc.model.file.uri);
+
                         //TODO: Delete object here
         }
     },
@@ -459,14 +453,12 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
             if(this.activeDocument) {
                 // There is a document currently opened
                 currentDocument = this.activeDocument;
-
-                //this.application.ninja.stage.stageView.restoreAllPanels();
             } else {
                 // There is no document opened
 
                 // Show the rulers
                 // TODO: Move this indo design view
-                this.application.ninja.stage.stageView.showRulers();
+                this.application.ninja.stage.showRulers();
 
                 // Show the canvas
                 this.application.ninja.stage.hideCanvas(false);
@@ -484,69 +476,82 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         }
     },
 
-    switchDocuments: {
-        value: function(currentDocument, newDocument, didCreate) {
-
-            if(currentDocument) {
-                currentDocument.serializeDocument();
 
-                this.application.ninja.selectionController._selectionContainer = null;
-                currentDocument.model.views.design.propertiesPanel.clear();
-                currentDocument.model.views.design.hide();
+    _onOpenTextDocument: {
+        value: function(doc) {
+            var currentDocument = null;
+            if(this.activeDocument) {
+                // There is a document currently opened
+                currentDocument = this.activeDocument;
             }
 
-            this.application.ninja.stage.clearAllCanvas();
+            this.application.ninja.currentDocument = this.activeDocument = doc;
 
-            if(didCreate) {
-                newDocument.model.views.design.iframe.style.opacity = 1;
-                NJevent("onOpenDocument", newDocument);
-            } else {
-                this.activeDocument = newDocument;
-                newDocument.model.views.design.show();
-                newDocument.deserializeDocument();
-                NJevent("onSwitchDocument");
-            }
+            document.getElementById("iframeContainer").style.display = "none";
+            this.application.ninja.codeEditorController.applySettings();
+
+            this.switchDocuments(currentDocument, doc, true);
         }
     },
 
+    switchDocuments: {
+        value: function(currentDocument, newDocument, didCreate) {
 
-    _onOpenTextDocument: {
-        value: function(doc) {
-            if(this.activeDocument) {
-                if(this.activeDocument.currentView === "design"){
-                    this.activeDocument.saveAppState();
-                    this.activeDocument.container.parentNode.style["display"] = "none";
-                    this.application.ninja.stage.hideCanvas(true);
-                    this.application.ninja.stage.stageView.hideRulers();
+            if(currentDocument) {
+                if(currentDocument.currentView === "design") {
+                    currentDocument.serializeDocument();
+                    this.application.ninja._currentSelectedContainer = this.application.ninja.selectionController._selectionContainer = null;
+                    currentDocument.model.views.design.propertiesPanel.clear();
                 }
 
-                this.activeDocument.container.style["display"] = "none";
-            }
+                currentDocument.model.isActive = false;