6 files changed, 243 insertions, 228 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index c6bf4c6b..cf46e73e 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: []
     },
@@ -33,6 +29,10 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         value: false
     },
 
+    _hackInitialStyles: {
+        value: true
+    },
+
     _activeDocument: { value: null },
     _iframeCounter: { value: 1, enumerable: false },
     _iframeHolder: { value: null, enumerable: false },
@@ -44,8 +44,10 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
             return this._activeDocument;
         },
         set: function(doc) {
-            if(!!this._activeDocument){ this._activeDocument.isActive = false;}
+//            if(!!this._activeDocument){ this._activeDocument.isActive = false;}
+
             this._activeDocument = doc;
+
             if(!!this._activeDocument){
                 if(this._documents.indexOf(doc) === -1) this._documents.push(doc);
                 this._activeDocument.isActive = true;
@@ -69,37 +71,25 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
             this.eventManager.addEventListener("executeFileCloseAll", this, false);
 
             this.eventManager.addEventListener("styleSheetDirty", this, false);
-            
-            this.eventManager.addEventListener("addComponentFirstDraw", this, false);
-
-            // Temporary add listeners for the new stage templates
-            this.eventManager.addEventListener("executeWebpageOpen", this, false);
-            this.eventManager.addEventListener("executeNewWebpage", this, false);
         }
     },
     
-    handleAddComponentFirstDraw: {
-        value: function (e) {
-                //TODO: Add logic to reparse the document for dynamically added styles
-                //console.log(e);
-        }
-    },
-    
-                        
-                        
-                        
 
-////////////////////////////////////////////////////////////////////
+        //TODO: Ensure these APIs are not needed
+        ////////////////////////////////////////////////////////////////////
         //
     handleWebRequest: {
         value: function (request) {
                 //TODO: Check if frameId is proper
                 if (this._hackRootFlag && request.parentFrameId !== -1) {
-                        //TODO: Optimize creating string
-                        //console.log(request);
-                        //console.log(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1], request.url);
-                                //return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split('/')[request.url.split('/').length-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/montage-html/'))[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]};
+                                } 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]};
+                                } else {
+                                        //Error, not a valid folder
+                                }
                         }
                 }
     },
@@ -140,47 +130,46 @@ 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 || {};
-                if (this.application.ninja.coreIoApi.cloudAvailable()) {
-                    newFileSettings.callback = this.createNewFile.bind(this);
-                    this.application.ninja.newFileController.showNewFileDialog(newFileSettings);
-                }
+        value: function(event) {
+            var newFileSettings = event._event.settings || {};
+            if (this.application.ninja.coreIoApi.cloudAvailable()) {
+                newFileSettings.callback = this.createNewFile.bind(this);
+                this.application.ninja.newFileController.showNewFileDialog(newFileSettings);
             }
+        }
     },
         ////////////////////////////////////////////////////////////////////
-        //TODO: Check for appropiate structures
+        //
     handleExecuteSave: {
         value: function(event) {
-            if((typeof this.activeDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){
-                //Text and HTML document classes should return the same save object for fileSave
-                this.application.ninja.ioMediator.fileSave(this.activeDocument.save(), this.fileSaveResult.bind(this));
-            }
+                //
+                if((typeof this.activeDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){
+                        //
+                        this.activeDocument.model.save(this.testCallback.bind(this)); //this.fileSaveResult.bind(this)
+                } else {
+                        //Error:
+                }
                 }
     },
+    testCallback: {
+        value: function (value) {
+                console.log(value);
+            //TODO: Move this to the model.save()
+            this.activeDocument.model.needsSave = false;
+        }
+    },
     ////////////////////////////////////////////////////////////////////
         //TODO: Check for appropiate structures
     handleExecuteSaveAll: {
         value: function(event) {
-            if((typeof this.activeDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){
-                //Text and HTML document classes should return the same save object for fileSave
-                this.application.ninja.ioMediator.fileSave(this.activeDocument.saveAll(), this.fileSaveResult.bind(this));
-            }
+           //
+                if((typeof this.activeDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){
+                        //
+                        this.activeDocument.model.saveAll(this.testCallback.bind(this)); //this.fileSaveResult.bind(this)
+                } else {
+                        //Error:
+                }
                 }
     },
     ////////////////////////////////////////////////////////////////////
@@ -198,9 +187,10 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
     ////////////////////////////////////////////////////////////////////
     handleExecuteFileClose:{
         value: function(event) {
-            if(this.activeDocument && this.application.ninja.coreIoApi.cloudAvailable()){
-                this.closeDocument(this.activeDocument.uuid);
-            }
+                if (this.activeDocument) {
+//                      this.activeDocument.closeDocument();
+                this.closeFile(this.activeDocument);
+                }
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -219,7 +209,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
     fileSaveResult: {
         value: function (result) {
             if((result.status === 204) || (result.status === 404)){//204=>existing file || 404=>new file... saved
-                this.activeDocument.needsSave = false;
+                this.activeDocument.model.needsSave = false;
                 if(this.application.ninja.currentDocument !== null){
                     //clear Dirty StyleSheets for the saved document
                     this.application.ninja.stylesController.clearDirtyStyleSheets(this.application.ninja.currentDocument);
@@ -228,20 +218,20 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         }
     },
         
+        
+        
+        ////////////////////////////////////////////////////////////////////
+        //
     createNewFile:{
         value:function(newFileObj){