5 files changed, 110 insertions, 291 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 2c34eedf..4f122b3b 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -8,37 +8,47 @@ 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
+    },
+
+    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._currentDocument = value;
 
-            this._activeDocument = doc;
+            if(!value) {
 
-            if(!!this._activeDocument){
-                if(this._documents.indexOf(doc) === -1) this._documents.push(doc);
-                this._activeDocument.isActive = true;
+            }  else {
+                this._currentDocument.model.currentView.show();
             }
+
+
+
         }
     },
 
@@ -52,8 +62,6 @@ 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);
         }
     },
     
@@ -70,11 +78,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 +106,7 @@ exports.DocumentController = Montage.create(Component, {
     },
         ////////////////////////////////////////////////////////////////////
 
-        
-        
-        
-        
-        
-        
-        
+
     handleExecuteFileOpen: {
         value: function(event) {
             var pickerSettings = event._event.settings || {};
@@ -308,11 +310,11 @@ exports.DocumentController = Montage.create(Component, {
 
                                         //Open in designer view
                     this.redirectRequests = false;
-                    Montage.create(HTMLDocument).init(file, this, this._onOpenDocument, 'design', template);
+                    Montage.create(HTMLDocument).init(file, this.application.ninja, this.application.ninja.openDocument, 'design', template);
                                         break;
                                 default:
                     //Open in code view
-                    Montage.create(TextDocument).init(file, this, this._onOpenTextDocument, 'code');
+                    Montage.create(TextDocument).init(file, this.application.ninja, this.application.ninja.openDocument, 'code');
                     break;
                         }
         }
@@ -325,47 +327,9 @@ exports.DocumentController = Montage.create(Component, {
         }
     },
 
-    //todo: remove this funciton as it is not used
-    textDocumentOpened: {
-       value: function(doc) {
-
-
-
-           this.application.ninja.stage.stageView.createTextView(doc);
-
-           /*
-           DocumentManager._hideCurrentDocument();
-           stageManagerModule.stageManager._scrollFlag = false;    // TODO HACK to prevent type error on Hide/Show Iframe
-           DocumentManager.activeDocument = doc;
-
-           var type;
-
-           switch(doc.documentType) {
-               case  "css" :
-                   type = "css";
-                   break;
-               case "js" :
-                   type = "javascript";
-                   break;
-           }
-
-           DocumentManager._codeEditor.editor = CodeMirror.fromTextArea(doc.textArea, {
-                            lineNumbers: true,
-                       mode: type,
-                            onCursorActivity: function() {
-                                DocumentManager._codeEditor.editor.setLineClass(DocumentManager._codeEditor.hline, null);
-                                DocumentManager._codeEditor.hline = DocumentManager._codeEditor.editor.setLineClass(DocumentManager._codeEditor.editor.getCursor().line, "activeline");
-                            }
-                });
-           DocumentManager._codeEditor.hline = DocumentManager._codeEditor.editor.setLineClass(0, "activeline");
-           */
-
-            }
-    },
-
     closeFile: {
         value: function(document) {
-            document.closeDocument(this, this.onCloseFile);
+            document.closeDocument(this.application.ninja, this.application.ninja.closeFile);
         }
     },
 
@@ -373,7 +337,8 @@ exports.DocumentController = Montage.create(Component, {
         value: function(doc) {
             var previousFocusedDocument;
 
-            this._documents.splice(this._documents.indexOf(doc), 1);
+//            this._documents.splice(this._documents.indexOf(doc), 1);
+            this.application.ninja.docController.removeObjects(this._documents.indexOf(doc));
 
             if(this._documents.length > 0) {
                 previousFocusedDocument = this._documents[this._documents.length - 1];
@@ -398,83 +363,14 @@ exports.DocumentController = Montage.create(Component, {
         }
     },
 
-    closeDocument: {
-        value: function(id) {
-            var doc = this._findDocumentByUUID(id);
-
-            var closeDocumentIndex = this._findIndexByUUID(id);
-            this._documents.splice(this._findIndexByUUID(id), 1);
-
-            if(this.activeDocument.uuid === id && this._documents.length > 0) {//closing the active document tab
-                var nextDocumentIndex = -1 ;
-                if((this._documents.length > 0) && (closeDocumentIndex === 0)){