Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/panels/Timeline/Layer.reel/Layer.js
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/panels/properties.reel/properties.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 265 insertions, 290 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index c6bf4c6b..2c34eedf 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -9,31 +9,18 @@ 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,
     Uuid =                      require("montage/core/uuid").Uuid,
-    HTMLDocument =      require("js/document/html-document").HTMLDocument,
-    TextDocument =      require("js/document/text-document").TextDocument;
-
-    // New Document Objects
-var Document =      require("js/document/document-html").HtmlDocument;
+    HTMLDocument =  require("js/document/document-html").HtmlDocument,
+    TextDocument =  require("js/document/document-text").TextDocument;
 ////////////////////////////////////////////////////////////////////////
 //
-var DocumentController = exports.DocumentController = Montage.create(Component, {
-    hasTemplate: {
-        value: false
-    },
-
-    webTemplate: {
-        value: false
-    },
-
-    _documents: {
-        value: []
-    },
-    
-    _hackRootFlag: {
-        value: false
-    },
-
+exports.DocumentController = Montage.create(Component, {
+        //
+    hasTemplate: {value: false},
+    _documents: {value: []},
+        //TODO: what is this?!?!
+    _hackInitialStyles: {value: true},
     _activeDocument: { value: null },
+    //TODO: Are any of these needed?
     _iframeCounter: { value: 1, enumerable: false },
     _iframeHolder: { value: null, enumerable: false },
     _textHolder: { value: null, enumerable: false },
@@ -44,21 +31,19 @@ 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;
-
-                if(!!this._activeDocument.editor){
-                    this._activeDocument.editor.focus();
-                }
             }
         }
     },
 
     deserializedFromTemplate: {
-        value: function() {
+        value: function() { //TODO: Add event naming consistency (save, fileOpen and newFile should be consistent, all file events should be executeFile[operation name])
             this.eventManager.addEventListener("appLoaded", this, false);
             this.eventManager.addEventListener("executeFileOpen", this, false);
             this.eventManager.addEventListener("executeNewFile", this, false);
@@ -69,37 +54,30 @@ 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
+        redirectRequests: {
+        value: false
+    },
+        ////////////////////////////////////////////////////////////////////
         //
     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]};
+                if (this.redirectRequests && request.parentFrameId !== -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 if (request.url.indexOf('js/document/templates/app')  !== -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/app/'))[1]};
+                                } else {
+                                        //Error, not a valid folder
+                                }
                         }
                 }
     },
@@ -120,7 +98,6 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
     },
         ////////////////////////////////////////////////////////////////////
 
-
         
         
         
@@ -140,47 +117,47 @@ 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()){
+                        //Currently we don't need a callback handler
+                        //this.activeDocument.model.save(this.saveExecuted.bind(this));
+                        this.activeDocument.model.save();
+                } else {
+                        //Error: cloud not available and/or no active document
+                }
                 }
     },
     ////////////////////////////////////////////////////////////////////
+        //
+    saveExecuted: {
+        value: function (value) {
+                //File saved, any callbacks or events should go here (must be added in handleExecuteSave passed as callback)
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
         //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
+           //
+                if((typeof this.activeDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){