Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture

13 files changed, 190 insertions, 273 deletions

diff --git a/js/components/ui/label-checkbox.reel/label-checkbox.js b/js/components/ui/label-checkbox.reel/label-checkbox.js
index 82c01262..21b72cb5 100755
--- a/js/components/ui/label-checkbox.reel/label-checkbox.js
+++ b/js/components/ui/label-checkbox.reel/label-checkbox.js
@@ -42,6 +42,25 @@ exports.LabelCheckbox = Montage.create(Component, {
         }
     },
 
+    _enabled: {
+        enumerable: false,
+        value: true
+    },
+
+    enabled: {
+        enumerable: true,
+        serializable: true,
+        get: function() {
+            return this._enabled;
+        },
+        set: function(value) {
+            if(value !== this._enabled) {
+                this._enabled = value;
+                this.needsDraw = true;
+            }
+        }
+    },
+
     value: {
         value: false
     },
@@ -52,7 +71,7 @@ exports.LabelCheckbox = Montage.create(Component, {
             e.initEvent("change", true, true);
             e.type = "change";
             e.wasSetByCode = false;
-            this.value = e.value = this._checkbox.checked;
+            this.checked = this.value = e.value = this._checkbox.checked;
             this.dispatchEvent(e);
         }
     },
@@ -61,6 +80,7 @@ exports.LabelCheckbox = Montage.create(Component, {
         value: function() {
             this._labelText.value = this.label;
             this._checkbox.checked = this.checked;
+            this._checkbox.disabled = !this._enabled;
         }
 
     }
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 1e894f02..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: []
     },
@@ -75,10 +71,6 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
             this.eventManager.addEventListener("executeFileCloseAll", this, false);
 
             this.eventManager.addEventListener("styleSheetDirty", this, false);
-            
-            // Temporary add listeners for the new stage templates
-            this.eventManager.addEventListener("executeWebpageOpen", this, false);
-            this.eventManager.addEventListener("executeNewWebpage", this, false);
         }
     },
     
@@ -138,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 || {};
@@ -177,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;
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -302,12 +282,8 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
                 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)){
@@ -343,30 +319,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
     },
 
     ////////////////////////////////////////////////////////////////////
-        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) {
@@ -482,14 +435,14 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
                 }
                 this.application.ninja.stage.stageView.switchDocument(this._documents[nextDocumentIndex]);
                 if(typeof doc.stopVideos !== "undefined"){doc.stopVideos();}
-                this._removeDocumentView(doc.container);
+                doc.container.parentNode.removeChild(doc.container);
             }else if(this._documents.length === 0){
                 // See above
             }else{//closing inactive document tab - just clear DOM
                 if(typeof doc.pauseAndStopVideos !== "undefined"){
                     doc.pauseAndStopVideos();
                 }
-                this._removeDocumentView(doc.container);
+                doc.container.parentNode.removeChild(doc.container);
             }
 
             NJevent("closeDocument", doc.uri);
@@ -498,41 +451,79 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         }
     },
 
-    // Document has been loaded into the Iframe. Dispatch the event.
-    // Event Detail: Contains the current ActiveDocument
+    // Open document callback
     _onOpenDocument: {
         value: function(doc){