1 files changed, 86 insertions, 74 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index f6b850b2..26c3ebaa 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -13,7 +13,8 @@ var Montage = 		require("montage/core/core").Montage,
     TextDocument =      require("js/document/text-document").TextDocument;
 
     // New Document Objects
-var Document =      require("js/document/document-html").HtmlDocument;
+var Document_HTML =      require("js/document/document-html").HtmlDocument;
+var Document_Text =      require("js/document/document-text").TextDocument;
 ////////////////////////////////////////////////////////////////////////
 //
 var DocumentController = exports.DocumentController = Montage.create(Component, {
@@ -51,10 +52,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 +308,39 @@ 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(Document_HTML).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(Document_Text).init(file, this, this._onOpenTextDocument, 'code');
+                    break;
                         }
         }
     },
@@ -357,7 +351,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,12 +403,17 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
 
             this._activeDocument = null;
 
-            this.application.ninja.stage.stageView.hideRulers();
+            this.application.ninja.stage.hideRulers();
 
 //            document.getElementById("iframeContainer").style.display="block";
 
             this.application.ninja.stage.hideCanvas(true);
 
+            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
@@ -466,7 +466,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
 
                 // 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 +484,81 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         }
     },
 
+
+    _onOpenTextDocument: {
+        value: function(doc) {
+            var currentDocument=null;
+            if(this.activeDocument) {
+                // There is a document currently opened
+                currentDocument = this.activeDocument;
+            }
+
+            this.application.ninja.stage._scrollFlag = false;    // TODO HACK to prevent type error on Hide/Show Iframe
+            this.activeDocument = doc;
+            document.getElementById("iframeContainer").style.display = "none";
+            this.application.ninja.codeEditorController.applySettings();
+            this.switchDocuments(currentDocument, doc, true);
+        }
+    },
+
     switchDocuments: {
         value: function(currentDocument, newDocument, didCreate) {
 
-            if(currentDocument) {
+            if(currentDocument && currentDocument.currentView === "design") {
                 currentDocument.serializeDocument();
-
                 this.application.ninja.selectionController._selectionContainer = null;
                 currentDocument.model.views.design.propertiesPanel.clear();
-                currentDocument.model.views.design.hide();
             }
 
-            this.application.ninja.stage.clearAllCanvas();
-
-            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");
+            if(currentDocument) {
+                currentDocument.model.currentView.hide();
+                currentDocument.model.isActive = false;
+            }
+            if(currentDocument && newDocument && (currentDocument.model.parentContainer !== newDocument.model.parentContainer)){
+                currentDocument.model.parentContainer.style["display"] = "none";
             }
-        }
-    },
 
+            if(newDocument && newDocument.currentView === "code"){
+                this.application.ninja.stage.showCodeViewBar(true);
+                this.application.ninja.stage.collapseAllPanels();
+                this.application.ninja.stage.hideCanvas(true);
+                this.application.ninja.stage.hideRulers();
 
-    _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();
-                }
+                newDocument.model.views.code.editor.focus();
 
-                this.activeDocument.container.style["display"] = "none";
+            }else if(currentDocument && newDocument && newDocument.currentView === "design"){
+                this.application.ninja.stage.showCodeViewBar(false);
+                this.application.ninja.stage.restoreAllPanels();