1 files changed, 74 insertions, 333 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 2c34eedf..a3ebac24 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -8,37 +8,61 @@ 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/document-html").HtmlDocument,
     TextDocument =  require("js/document/document-text").TextDocument;
 ////////////////////////////////////////////////////////////////////////
 //
 exports.DocumentController = Montage.create(Component, {
         //
-    hasTemplate: {value: false},
-    _documents: {value: []},
-        //TODO: what is this?!?!
-    _hackInitialStyles: {value: true},
-    _activeDocument: { value: null },
-    //TODO: Are any of these needed?
-    _iframeCounter: { value: 1, enumerable: false },
-    _iframeHolder: { value: null, enumerable: false },
-    _textHolder: { value: null, enumerable: false },
-    _codeMirrorCounter: {value: 1, enumerable: false},
-    
-    activeDocument: {
-        get: function() {
-            return this._activeDocument;
+    hasTemplate: {
+        value: false
+    },
+
+    iframeContainer: {
+        value: null
+    },
+
+    codeContainer: {
+        value: null
+    },
+
+    documents: {
+        value: []
+    },
+
+    _currentDocument: {
+            value : null
+    },
+
+    currentDocument : {
+        get : function() {
+            return this._currentDocument;
         },
-        set: function(doc) {
-                        //if(!!this._activeDocument){ this._activeDocument.isActive = false;}
+        set : function(value) {
+            if (value === this._currentDocument) {
+                return;
+            }
+
+            if(this._currentDocument) {
+                this._currentDocument.model.currentView.hide();
+            }
 
-            this._activeDocument = doc;
+            this._currentDocument = value;
 
-            if(!!this._activeDocument){
-                if(this._documents.indexOf(doc) === -1) this._documents.push(doc);
-                this._activeDocument.isActive = true;
+            if(!value) {
+                document.getElementById("iframeContainer").style.display = "block";
+                document.getElementById("codeViewContainer").style.display = "block";
+            } else if(this._currentDocument.currentView === "design") {
+                document.getElementById("codeViewContainer").style.display = "none";
+                document.getElementById("iframeContainer").style.display = "block";
+                this._currentDocument.model.currentView.show();
+                this._currentDocument.model.views.design._liveNodeList = this._currentDocument.model.documentRoot.getElementsByTagName('*');
+            } else {
+                document.getElementById("iframeContainer").style.display = "none";
+                this._currentDocument.model.parentContainer.style["display"] = "block";
+                this._currentDocument.model.currentView.show();
             }
+
         }
     },
 
@@ -52,11 +76,15 @@ exports.DocumentController = Montage.create(Component, {
             this.eventManager.addEventListener("executeSaveAll", this, false);
             this.eventManager.addEventListener("executeFileClose", this, false);
             this.eventManager.addEventListener("executeFileCloseAll", this, false);
+        }
+    },
 
-            this.eventManager.addEventListener("styleSheetDirty", this, false);
+    didCreate: {
+        value: function() {
+            this.iframeContainer = document.getElementById("iframeContainer");
+            this.codeContainer = document.getElementById("codeViewContainer");
         }
     },
-    
 
         //TODO: Ensure these APIs are not needed
         redirectRequests: {
@@ -70,11 +98,11 @@ exports.DocumentController = Montage.create(Component, {
                 if (this.redirectRequests && request.parentFrameId !== -1) {
                         //Checking for proper URL redirect (from different directories)
                         if (request.url.indexOf('js/document/templates/banner') !== -1) {
-                                        return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split(chrome.extension.getURL('js/document/templates/banner/'))[1]};
+                                        return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split(chrome.extension.getURL('js/document/templates/banner/'))[1]};
                                 } else if (request.url.indexOf('js/document/templates/html')  !== -1) {
-                                        return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split(chrome.extension.getURL('js/document/templates/html/'))[1]};
+                                        return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split(chrome.extension.getURL('js/document/templates/html/'))[1]};
                                 } else if (request.url.indexOf('js/document/templates/app')  !== -1) {
-                                        return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split(chrome.extension.getURL('js/document/templates/app/'))[1]};
+                                        return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split(chrome.extension.getURL('js/document/templates/app/'))[1]};
                                 } else {
                                         //Error, not a valid folder
                                 }
@@ -98,13 +126,7 @@ exports.DocumentController = Montage.create(Component, {
     },
         ////////////////////////////////////////////////////////////////////
 
-        
-        
-        
-        
-        
-        
-        
+
     handleExecuteFileOpen: {
         value: function(event) {
             var pickerSettings = event._event.settings || {};
@@ -131,10 +153,10 @@ exports.DocumentController = Montage.create(Component, {
     handleExecuteSave: {
         value: function(event) {
                 //
-                if((typeof this.activeDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){
+                if((typeof this.currentDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){
                         //Currently we don't need a callback handler
                         //this.activeDocument.model.save(this.saveExecuted.bind(this));
-                        this.activeDocument.model.save();
+                        this.currentDocument.model.save();
                 } else {
                         //Error: cloud not available and/or no active document
                 }
@@ -152,9 +174,9 @@ exports.DocumentController = Montage.create(Component, {
     handleExecuteSaveAll: {
         value: function(event) {
            //
-                if((typeof this.activeDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){
+                if((typeof this.currentDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){
                         //
-                        this.activeDocument.model.saveAll();
+                        this.currentDocument.model.saveAll();
                 } else {
                         //TODO: Add error handling
                 }
@@ -164,9 +186,9 @@ exports.DocumentController = Montage.create(Component, {
     handleExecuteSaveAs: {
         value: function(event) {
             var saveAsSettings = event._event.settings || {};
-            if((typeof this.activeDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){
-                saveAsSettings.fileName = this.activeDocument.model.file.name;
-                saveAsSettings.folderUri = this.activeDocument.model.file.uri.substring(0, this.activeDocument.model.file.uri.lastIndexOf("/"));
+            if((typeof this.currentDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){
+                saveAsSettings.fileName = this.currentDocument.model.file.name;
+                saveAsSettings.folderUri = this.currentDocument.model.file.uri.substring(0, this.currentDocument.model.file.uri.lastIndexOf("/"));
                 saveAsSettings.callback = this.saveAsCallback.bind(this);
                 this.application.ninja.newFileController.showSaveAsDialog(saveAsSettings);
             }
@@ -175,19 +197,16 @@ exports.DocumentController = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
     handleExecuteFileClose:{
         value: function(event) {
-                if (this.activeDocument) {
-                this.closeFile(this.activeDocument);
-                }
+            this.closeFile(this.currentDocument);
         }
     },
     ////////////////////////////////////////////////////////////////////
     //TODO: Is this used, should be cleaned up
     handleExecuteFileCloseAll:{
                 value: function(event) {
-                        var i=0;//TODO: who is using this??
-                        if(this.activeDocument && this.application.ninja.coreIoApi.cloudAvailable()){
-                                while(this._documents.length > 0){
-                                        this.closeDocument(this._documents[this._documents.length -1].uuid);
+                        if(this.currentDocument && this.application.ninja.coreIoApi.cloudAvailable()){
+                                while(this.currentDocument.length > 0){
+                                        this.closeDocument(this.currentDocument[this.currentDocument.length -1].uuid);
                                 }
                         }
                 }
@@ -272,19 +291,19 @@ exports.DocumentController = Montage.create(Component, {