3 files changed, 59 insertions, 172 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index ecb988ff..1796f9b5 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -21,10 +21,6 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         value: false
     },
 
-    webTemplate: {
-        value: false
-    },
-
     _documents: {
         value: []
     },
@@ -75,10 +71,6 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
             this.eventManager.addEventListener("executeFileCloseAll", this, false);
 
             this.eventManager.addEventListener("styleSheetDirty", this, false);
-            
-            // Temporary add listeners for the new stage templates
-            this.eventManager.addEventListener("executeWebpageOpen", this, false);
-            this.eventManager.addEventListener("executeNewWebpage", this, false);
         }
     },
     
@@ -138,20 +130,6 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         }
     },
 
-    handleExecuteWebpageOpen: {
-        value: function(event) {
-            this.webTemplate = true;
-            this.handleExecuteFileOpen(event);
-        }
-    },
-
-    handleExecuteNewWebpage: {
-        value: function(event) {
-            this.webTemplate = true;
-            this.handleExecuteNewFile(event);
-        }
-    },
-
     handleExecuteNewFile: {
         value: function(event) {
             var newFileSettings = event._event.settings || {};
@@ -304,12 +282,8 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
                 this.isNewFilePath = false;//reset path identifier flag
 
                 //Sending full response object
-                // TODO: Unify those 2 methods. Using if/else for the new template
-                if(this.webTemplate) {
-                    this.openWebDocument(response);
-                } else {
-                    this.openDocument(response);
-                }
+                this.openDocument(response);
+
             } else if (!!response && (response.status === 404)){
                 alert("Unable to open file.\n [Error: File does not exist]");
             } else if (!!response && (response.status === 500)){
@@ -345,30 +319,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
     },
 
     ////////////////////////////////////////////////////////////////////
-        openDocument: {
-                value: function(doc) {
-                        
-                        //
-                        this.documentHackReference = doc;
-                        //
-                        switch (doc.extension) {
-                                case 'html':
-                                        //Open in designer view
-                                        Montage.create(HTMLDocument).initialize(doc, Uuid.generate(), this._createIframeElement(), this._onOpenDocument.bind(this));
-                                        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;
-                        }
-        }
-    },
-    openWebDocument: {
+    openDocument: {
         value: function(doc) {
                 var template, dimensions;
                 if (doc.content.body.indexOf('Ninja-Banner Dimensions@@@') !== -1) {
@@ -484,14 +435,14 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
                 }
                 this.application.ninja.stage.stageView.switchDocument(this._documents[nextDocumentIndex]);
                 if(typeof doc.stopVideos !== "undefined"){doc.stopVideos();}
-                this._removeDocumentView(doc.container);
+                doc.container.parentNode.removeChild(doc.container);
             }else if(this._documents.length === 0){
                 // See above
             }else{//closing inactive document tab - just clear DOM
                 if(typeof doc.pauseAndStopVideos !== "undefined"){
                     doc.pauseAndStopVideos();
                 }
-                this._removeDocumentView(doc.container);
+                doc.container.parentNode.removeChild(doc.container);
             }
 
             NJevent("closeDocument", doc.uri);
@@ -500,41 +451,65 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         }
     },
 
-    // Document has been loaded into the Iframe. Dispatch the event.
-    // Event Detail: Contains the current ActiveDocument
+    // Open document callback
     _onOpenDocument: {
         value: function(doc){
-            this.application.ninja.currentDocument = doc;
-            this._hideCurrentDocument();
-            this.application.ninja.stage.stageView.hideOtherDocuments(doc.uuid);
 
-            this.application.ninja.stage.hideCanvas(false);
+            if(this.activeDocument) {
+                // There is a document currently opened
 
-            this.activeDocument = doc;
+//                this.application.ninja.stage.stageView.showCodeViewBar(false);
+//                this.application.ninja.stage.stageView.restoreAllPanels();
 
-            if(!this.webTemplate) {
-                this._showCurrentDocument();
+                //
+                /*
+                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();
+                }
+
+                this.activeDocument.container.style["display"] = "none";
+                */
+                // hide current document
             } else {
-                this.application.ninja.stage.stageView.showRulers();
-            }
+                // There is no document opened
 
-            this.webTemplate = false;
+                // Set the active document
+                this.activeDocument = doc;
 
-            this._initializeBodyStyles();
-            NJevent("onOpenDocument", doc);
+                // Show the canvas
+                this.application.ninja.stage.hideCanvas(false);
+
+                // Show the rulers
+                // TODO: Move this indo design view
+                this.application.ninja.stage.stageView.showRulers();
 
-                        this.application.ninja.stage.stageView.showCodeViewBar(false);
-            this.application.ninja.stage.stageView.restoreAllPanels();
+                // Initialize the documentRoot styles
+                this.initializeRootStyles(doc.documentRoot);
+                // Flag to stop stylesheet dirty event
+                this._hackInitialStyles = false;
 
-            // Flag to stop stylesheet dirty event
-            this._hackInitialStyles = false;
+                NJevent("onOpenDocument", doc);
+            }
         }
     },
 
 
     _onOpenTextDocument: {
         value: function(doc) {
-            this._hideCurrentDocument();
+            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();
+                }
+
+                this.activeDocument.container.style["display"] = "none";
+            }
+
             this.application.ninja.stage._scrollFlag = false;    // TODO HACK to prevent type error on Hide/Show Iframe
             this.activeDocument = doc;
 
@@ -589,21 +564,6 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         }