4 files changed, 301 insertions, 105 deletions

diff --git a/js/io/document/base-document.js b/js/io/document/base-document.js
index 44f54f78..918b51ad 100644..100755
--- a/js/io/document/base-document.js
+++ b/js/io/document/base-document.js
@@ -82,7 +82,12 @@ var BaseDocument = exports.BaseDocument = Montage.create(Montage, {
         value: function() {
             // Have the XHR here?
         }
-    }
+    },
 
+    save:{
+        value:function(){
+            //base function - to be overridden
+        }
+    }
 
 });
\ No newline at end of file
diff --git a/js/io/document/document-controller.js b/js/io/document/document-controller.js
index 99177de0..1a5d6058 100644..100755
--- a/js/io/document/document-controller.js
+++ b/js/io/document/document-controller.js
@@ -12,26 +12,33 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 @requires js/document/text-document
 */
 
-// TODO : Fix deps from Montage V4 Archi
-
 var Montage = require("montage/core/core").Montage,
     Component = require("montage/ui/component").Component,
-    Uuid = require("montage/core/uuid").Uuid;
-
-var HTMLDocument = require("js/io/document/html-document").HTMLDocument;
-var TextDocument = require("js/io/document/text-document").TextDocument;
+    Uuid = require("montage/core/uuid").Uuid,
+    HTMLDocument = require("js/io/document/html-document").HTMLDocument,
+    TextDocument = require("js/io/document/text-document").TextDocument;
 
 var DocumentController = exports.DocumentController = Montage.create(Component, {
-    hasTemplate: { value: false },
+    hasTemplate: {
+        value: false
+    },
+
+    _documents: {
+        value: []
+    },
 
-    _documents: { value: [] },
-    _documentsHash: { value: {} },
     _activeDocument: { value: null },
     _iframeCounter: { value: 1, enumerable: false },
     _iframeHolder: { value: null, enumerable: false },
     _textHolder: { value: null, enumerable: false },
     _codeMirrorCounter: {value: 1, enumerable: false},
 
+    tmpSourceForTesting: {
+        value: "function CodeMirror(place, givenOptions) {" +
+                "// Determine effective options based on given values and defaults." +
+                "var options = {}, defaults = CodeMirror.defaults; }"
+    },
+
     _codeEditor: {
         value: {
             "editor": {
@@ -50,33 +57,22 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
             return this._activeDocument;
         },
         set: function(doc) {
-            if(this._activeDocument) {
-                if(this.activeDocument.documentType === "htm" || this.activeDocument.documentType === "html") {
-                    // TODO selection should use the document own selectionModel
-                    //this._activeDocument.selectionModel = selectionManagerModule.selectionManager._selectedItems;
-                }
-                
-                this._activeDocument.isActive = false;
-            }
+            if(this._activeDocument)  this._activeDocument.isActive = false;
 
-            if(this._documents.indexOf(doc) === -1) {
-                //this._documentsHash[doc.uuid] = this._documents.push(doc) - 1;
-                this._documents.push(doc);
-            }
+            if(this._documents.indexOf(doc) === -1) this._documents.push(doc);
 
             this._activeDocument = doc;
             this._activeDocument.isActive = true;
 
-            if(this.activeDocument.documentType === "htm" || this.activeDocument.documentType === "html") {
-                // TODO selection should use the document own selectionModel
-                //selectionManagerModule.selectionManager._selectedItems = this._activeDocument.selectionModel;
-            }
         }
     },
 
     deserializedFromTemplate: {
         value: function() {
             this.eventManager.addEventListener("appLoaded", this, false);
+            this.eventManager.addEventListener("executeFileOpen", this, false);
+            this.eventManager.addEventListener("executeNewFile", this, false);
+            this.eventManager.addEventListener("executeSave", this, false);
         }
     },
 
@@ -86,59 +82,196 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         }
     },
 
+    handleExecuteFileOpen: {
+        value: function(event) {
+            var pickerSettings = event._event.settings || {};
+            pickerSettings.callback = this.openFileWithURI;
+            pickerSettings.callbackScope = this;
+            this.application.ninja.filePickerController.showFilePicker(pickerSettings);
+        }
+    },
+
+    handleExecuteNewFile: {
+            value: function(event) {
+                var newFileSettings = event._event.settings || {};
+                newFileSettings.callback = this.createNewFile;
+                newFileSettings.callbackScope = this;
+                this.application.ninja.newFileController.showNewFileDialog(newFileSettings);
+            }
+    },
+
+    handleExecuteSave: {
+            value: function(event) {
+                this.activeDocument.save();
+            }
+    },
+
+    createNewFile:{
+        value:function(newFileObj){
+            //console.log(newFileObj);//contains the template uri and the new file uri
+            if(!newFileObj) return;
+            this.application.ninja.ioMediator.fileNew(newFileObj.newFilePath, newFileObj.fileTemplateUri, {"operation":this.openNewFileCallback, "thisScope":this});
+
+            if((newFileObj.fileExtension !== ".html") && (newFileObj.fileExtension !== ".htm")){//open code view
+
+            }else{
+                //open design view
+            }
+        }
+    },
+
+    /**
+     * Public method
+     * doc contains:
+     *      type : file type, like js, css, etc
+     *      name : file name
+     *      source : file content
+     *      uri : file uri
+     */
+    openNewFileCallback:{
+        value:function(doc){
+            if(!doc){
+                doc = {"type": "js", "name": "filename", "source": "test file content", "uri": "/fs/fsd/"}  ;
+            }
+            this.openDocument(doc);
+        }
+    },
+
+    openFileWithURI: {
+        value: function(uriArrayObj) {
+            var uri = "", fileContent = "", response=null, filename="", fileType="js";
+            if(!!uriArrayObj && !!uriArrayObj.uri && (uriArrayObj.uri.length > 0)){
+                uri = uriArrayObj.uri[0];
+            }
+            //console.log("URI is: ", uri);
+
+            this.application.ninja.ioMediator.fileOpen({"uri":uri}, {"operation":this.openFileCallback, "thisScope":this});
+        }
+    },
+
+    /**
+     * Public method
+     * doc contains:
+     *      type : file type, like js, css, etc
+     *      name : file name
+     *      source : file content
+     *      uri : file uri
+     */
+    openFileCallback:{
+        value:function(doc){
+            this.openDocument(doc);
+        }
+    },
+
+
+    openProjectWithURI: {
+        value: function(uri) {
+            console.log("URI is: ", uri);
+
+        }
+    },
+
     /** Open a Document **/
     openDocument: {
         value: function(doc) {
-            var d;
+            var newDoc;
 
             if(!doc) return false;
 
-            try {
+           // try {
                 if (doc.type === 'html' || doc.type === 'htm') {
-                    d = Montage.create(HTMLDocument);
-                    d.initialize(doc, Uuid.generate(), this._createIframeElement(), this._onOpenDocument);
+                    newDoc = Montage.create(HTMLDocument);
+                    newDoc.initialize(doc, Uuid.generate(), this._createIframeElement(), this._onOpenDocument);