3 files changed, 118 insertions, 209 deletions

diff --git a/js/controllers/color-controller.js b/js/controllers/color-controller.js
index c6d664cf..d4737aad 100755
--- a/js/controllers/color-controller.js
+++ b/js/controllers/color-controller.js
@@ -9,7 +9,6 @@ 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,
     ColorModel =                require("js/models/color-model").ColorModel,
-    ColorToolbar =              require("js/panels/Color/colortoolbar.reel").ColorToolbar,
     ColorPanelBase =            require("js/panels/Color/colorpanelbase.reel").ColorPanelBase,
     ElementsMediator =          require("js/mediators/element-mediator").ElementMediator,
     ColorPopupManager =         require("js/panels/Color/colorpopup-manager").ColorPopupManager,
@@ -368,20 +367,5 @@ exports.ColorController = Montage.create(Component, {
                 //Must be a valid CSS or null will be returned
                 return color;
         }
-    },
-    ////////////////////////////////////////////////////////////////////
-    ////////////////////////////////////////////////////////////////////
-    ////////////////////////////////////////////////////////////////////
-    //TODO: Remove, add via toolbar repetition
-    createToolbar: {
-        enumerable: true,
-        value: function () {
-            this.colorToolbar = ColorToolbar.create();
-            this.colorToolbar.element = document.getElementById("colortoolbar");
-            this.colorToolbar.needsDraw = true;
-        }
     }
-    ////////////////////////////////////////////////////////////////////
-    ////////////////////////////////////////////////////////////////////
-    ////////////////////////////////////////////////////////////////////
 });
\ No newline at end of file
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 48ceb21b..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,25 +71,10 @@ 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
         ////////////////////////////////////////////////////////////////////
         //
@@ -143,20 +130,6 @@ 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 || {};
@@ -182,6 +155,8 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
     testCallback: {
         value: function (value) {
                 console.log(value);
+            //TODO: Move this to the model.save()
+            this.activeDocument.model.needsSave = false;
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -213,13 +188,9 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
     handleExecuteFileClose:{
         value: function(event) {
                 if (this.activeDocument) {
-                        this.activeDocument.closeDocument();
+//                      this.activeDocument.closeDocument();
+                this.closeFile(this.activeDocument);
                 }
-            /*
-if(this.activeDocument && this.application.ninja.coreIoApi.cloudAvailable()){
-                this.closeDocument(this.activeDocument.uuid);
-            }
-*/
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -311,12 +282,8 @@ if(this.activeDocument && this.application.ninja.coreIoApi.cloudAvailable()){
                 this.isNewFilePath = false;//reset path identifier flag
 
                 //Sending full response object
-                // TODO: Unify those 2 methods. Using if/else for the new template
-                if(this.webTemplate) {
-                    this.openWebDocument(response);
-                } else {
-                    this.openDocument(response);
-                }
+                this.openDocument(response);
+
             } else if (!!response && (response.status === 404)){
                 alert("Unable to open file.\n [Error: File does not exist]");
             } else if (!!response && (response.status === 500)){
@@ -352,30 +319,7 @@ if(this.activeDocument && this.application.ninja.coreIoApi.cloudAvailable()){
     },
 
     ////////////////////////////////////////////////////////////////////
-        openDocument: {
-                value: function(doc) {
-                        
-                        //
-                        this.documentHackReference = doc;
-                        //
-                        switch (doc.extension) {
-                                case 'html':
-                                        //Open in designer view
-                                        Montage.create(HTMLDocument).initialize(doc, Uuid.generate(), this._createIframeElement(), this._onOpenDocument.bind(this));
-                                        break;
-                                default:
-                                        //Open in code view
-                                        var code = Montage.create(TextDocument, {"source": {value: doc.content}}), docuuid = Uuid.generate(), textArea;
-                                        textArea = this.application.ninja.stage.stageView.createTextAreaElement(docuuid);
-                                        code.initialize(doc, docuuid, textArea, textArea.parentNode);
-                                        //code.init(doc.name, doc.uri, doc.extension, null, docuuid);
-                                        code.textArea.value = doc.content;
-                                        this.application.ninja.stage.stageView.createTextView(code);
-                                        break;
-                        }
-        }
-    },
-    openWebDocument: {
+    openDocument: {
         value: function(doc) {
                 var template, dimensions;
                 if (doc.content.body.indexOf('Ninja-Banner Dimensions@@@') !== -1) {
@@ -448,7 +392,32 @@ if(this.activeDocument && this.application.ninja.coreIoApi.cloudAvailable()){
            */
 
             }
-   },
+    },
+