21 files changed, 149 insertions, 428 deletions

diff --git a/js/io/document/base-document.js b/js/io/document/base-document.js
index 44f54f78..d3601de5 100755
--- a/js/io/document/base-document.js
+++ b/js/io/document/base-document.js
@@ -31,6 +31,11 @@ var BaseDocument = exports.BaseDocument = Montage.create(Montage, {
         set: function(value) { this._uri = value; }
     },
 
+    externalUri: {
+        get: function() { return this._externalUri; },
+        set: function(value) { this._externalUri = value; }
+    },
+
     documentType: {
         get: function() { return this._documentType; },
         set: function(value) { this._documentType = value;  }
diff --git a/js/io/document/document-controller.js b/js/io/document/document-controller.js
index bba7e0e7..8ce43dcc 100755
--- a/js/io/document/document-controller.js
+++ b/js/io/document/document-controller.js
@@ -99,9 +99,8 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
             if(!!uriArrayObj && !!uriArrayObj.uri && (uriArrayObj.uri.length > 0)){
                 uri = uriArrayObj.uri[0];
             }
-            console.log("URI is: ", uri);
+            //console.log("URI is: ", uri);
 
-            // Get file from Jose Code with a callback to here
             if(!!uri){
                 response = this.application.ninja.coreIoApi.openFile({"uri":uri});
                 if((response.success === true) && ((response.status === 200) || (response.status === 304))){
@@ -113,7 +112,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
                 if(uri.indexOf('.') != -1){
                     fileType = uri.substr(uri.lastIndexOf('.') + 1);
                 }
-                this.openDocument({"type": ""+fileType, "name": ""+filename, "source": fileContent});
+                this.openDocument({"type": ""+fileType, "name": ""+filename, "source": fileContent, "uri": uri});
             }
 
         }
@@ -124,7 +123,6 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         value: function(uri) {
             console.log("URI is: ", uri);
 
-            // Get project from Jose Code with a callback to here
         }
     },
 
@@ -143,7 +141,9 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
                     newDoc = Montage.create(TextDocument, {
                         "source": { value: doc.source }
                     });
-                    newDoc.initialize(doc, Uuid.generate(), this._createTextAreaElement());
+                    var docUuid = Uuid.generate();
+                    var textArea = this.application.ninja.stage.stageView.createTextAreaElement(docUuid);
+                    newDoc.initialize(doc, docUuid, textArea, textArea.parentNode);
 
                     // Tmp this will be filled with the real content
                     newDoc.textArea.innerHTML = doc.source; //this.tmpSourceForTesting;
@@ -158,18 +158,6 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         }
     },
 
-    // Document has been loaded into the Iframe. Dispatch the event.
-    // Event Detail: Contains the current ActiveDocument
-    _onOpenDocument: {
-        value: function(doc){
-
-            DocumentController.activeDocument = doc;
-
-            NJevent("onOpenDocument", doc);
-
-       }
-   },
-
     textDocumentOpened: {
        value: function(doc) {
 
@@ -209,13 +197,31 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
 
     closeDocument: {
         value: function(id) {
+
+            //if file dirty then save
+
             var doc = this._findDocumentByUUID(id);
             this._removeDocumentView(doc.container);
 
             this._documents.splice(this._findIndexByUUID(id), 1);
 
             if(this.activeDocument.uuid === id && this._documents.length > 0) {
+
+                var closeDocumentIndex = this._findIndexByUUID(id);
+                var nextDocumentIndex = -1 ;
+                if((this._documents.length > 0) && (closeDocumentIndex === 0)){
+                    nextDocumentIndex = 1;
+                }else if((this._documents.length > 0) && (closeDocumentIndex > 0)){
+                    nextDocumentIndex = closeDocumentIndex - 1;
+                }
+
+                //remove the codemirror div if this is for a code view
+                /////test
+
+                ////end- test
+
                 this.switchDocument(this._documents[0].uuid);
+
             }
         }
     },
@@ -238,6 +244,9 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
 
     switchViews: {
         value: function() {
+
+            //save file if dirty
+
             this.application.ninja.stage.saveScroll();
             this._hideCurrentDocument();
 
@@ -250,19 +259,20 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
 
             } else {
                 this.application.ninja.stage._scrollFlag = false;    // TODO HACK to prevent type error on Hide/Show Iframe
-                var codeview = this._createTextAreaElement();
-                this._textHolder.style.display = "block";
-                codeview.firstChild.innerHTML = this.activeDocument.iframe.contentWindow.document.body.parentNode.innerHTML;
-
-                this._codeEditor.editor = CodeMirror.fromTextArea(codeview.firstChild, {
-                            lineNumbers: true,
-                            mode: "htmlmixed",
-                            onCursorActivity: function() {
-                                DocumentController._codeEditor.editor.setLineClass(DocumentController._codeEditor.hline, null);
-                                DocumentController._codeEditor.hline = DocumentController._codeEditor.editor.setLineClass(DocumentController._codeEditor.editor.getCursor().line, "activeline");
-                            }
-                });
-                this._codeEditor.hline = DocumentController._codeEditor.editor.setLineClass(0, "activeline");
+
+                var codeview = this.activeDocument.container;
+                //this._textHolder.style.display = "block";
+                //codeview.firstChild.innerHTML = this.activeDocument.iframe.contentWindow.document.body.parentNode.innerHTML;
+
+//                this._codeEditor.editor = CodeMirror.fromTextArea(codeview.firstChild, {
+//                            lineNumbers: true,
+//                            mode: "htmlmixed",
+//                            onCursorActivity: function() {
+//                                DocumentController._codeEditor.editor.setLineClass(DocumentController._codeEditor.hline, null);
+//                                DocumentController._codeEditor.hline = DocumentController._codeEditor.editor.setLineClass(DocumentController._codeEditor.editor.getCursor().line, "activeline");
+//                            }
+//                });
+//                this._codeEditor.hline = DocumentController._codeEditor.editor.setLineClass(0, "activeline");
             }
         }
     },
@@ -405,26 +415,5 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         value: function() {
             return "userDocument_" + (this._iframeCounter++);
         }
-    },
-
-    /**
-     * Creates a text area which will contain the content of the opened text document.
-     */
-_createTextAreaElement: {
-        value: function() {
-            var codeMirrorDiv = document.createElement("div");