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>

23 files changed, 1708 insertions, 751 deletions

diff --git a/js/document/html-document.js b/js/document/_toDelete/html-document.js
index 61223499..447d90e3 100755
--- a/js/document/html-document.js
+++ b/js/document/_toDelete/html-document.js
@@ -454,55 +454,6 @@ exports.HTMLDocument = Montage.create(TextDocument, {
         }
     },
 
-    /**
-     * Return the specified inline attribute from the element.
-     */
-    GetElementAttribute: {
-        value: function(element, attribute) {
-
-            var value;
-
-            if(attribute === "src") {
-                return element[attribute].replace(window.location.href, '');
-            }
-
-            value = element[attribute];
-
-            if(value !== undefined) return value;
-//            if(value || value === false) return [value, "inline"];
-
-            // 3.
-            //value = this._document.defaultView.getComputedStyle(element,null).getPropertyValue(attribute);
-            //if(value) return value;
-
-            return null;
-        }
-    },
-
-    GetElementStyle: {
-        value: function(element, style) {
-//            return this._queryStylesheets(element, style);
-        }
-    },
-
-    SetStyle: {
-        value: function(type, selector, style, value) {
-            try {
-                for(var j=0; j<this._stylesheets.length;j++){
-                    for(var i=0; i<this._stylesheets[j].cssRules.length;i++) {
-                        if(this._stylesheets[j].cssRules[i].selectorText === type + selector) {
-                            this._stylesheets[j].cssRules[i].style[style] = value;
-
-                            return true;
-                        }
-                    }
-                }
-            } catch(err) {
-                console.log("Cannot change the style of selector: " + selector + " " + err);
-            }
-        }
-    },
-
     GetElementFromPoint: {
         value: function(x, y) {
             return this._window.getElement(x,y);
@@ -919,97 +870,5 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                         //Error
                 }
         }
-        },
-        ////////////////////////////////////////////////////////////////////
-    saveAppState:{
-        enumerable: false,
-        value: function () {
-
-            this.savedLeftScroll = this.application.ninja.stage._iframeContainer.scrollLeft;
-            this.savedTopScroll = this.application.ninja.stage._iframeContainer.scrollTop;
-
-            this.gridHorizontalSpacing = this.application.ninja.stage.drawUtils.gridHorizontalSpacing;
-            this.gridVerticalSpacing = this.application.ninja.stage.drawUtils.gridVerticalSpacing;
-
-            if(typeof this.application.ninja.selectedElements !== 'undefined'){
-                this.selectionModel = this.application.ninja.selectedElements.slice(0);
-            }
-
-            this.draw3DGrid = this.application.ninja.appModel.show3dGrid;
-
-            //persist a clone of history per document
-            this.undoStack = this.application.ninja.undocontroller.undoQueue.slice(0);
-            this.redoStack = this.application.ninja.undocontroller.redoQueue.slice(0);
-            this.application.ninja.undocontroller.clearHistory();//clear history to give the next document a fresh start
-
-            //pause videos on switching or closing the document, so that the browser does not keep downloading the media data
-            this.pauseVideos();
-        }
-    },
-
-    ////////////////////////////////////////////////////////////////////
-    restoreAppState:{
-        enumerable: false,
-        value: function () {
-            this.application.ninja.stage.drawUtils.gridHorizontalSpacing = this.gridHorizontalSpacing;
-            this.application.ninja.stage.drawUtils.gridVerticalSpacing = this.gridVerticalSpacing;
-           
-            if((this.savedLeftScroll !== null) && (this.savedTopScroll !== null)){
-                this.application.ninja.stage._iframeContainer.scrollLeft = this.savedLeftScroll;
-                this.application.ninja.stage._iframeContainer.scrollTop = this.savedTopScroll;
-                this.application.ninja.stage.handleScroll();
-            }
-
-            this.application.ninja.currentSelectedContainer = this.documentRoot;
-            if(this.selectionModel){
-                this.application.ninja.selectedElements = this.selectionModel.slice(0);
-            }
-
-            this.application.ninja.appModel.show3dGrid = this.draw3DGrid;
-
-            this.application.ninja.undocontroller.undoQueue = this.undoStack.slice(0);
-            this.application.ninja.undocontroller.redoQueue = this.redoStack.slice(0);
-
-
-        }
-    },
-        ////////////////////////////////////////////////////////////////////
-    /**
-     *pause videos on switching or closing the document, so that the browser does not keep downloading the media data
-    */
-    pauseVideos:{
-        value:function(){
-            var videosArr = this.documentRoot.getElementsByTagName("video"), i=0;
-            for(i=0;i<videosArr.length;i++){
-                if(!videosArr[i].paused){
-                    videosArr[i].pause();
-                }
-            }
-        }
-    },
-
-    /**
-     * remove the video src on closing the document, so that the browser does not keep downloading the media data, if the tag does not get garbage collected
-     *removeSrc : boolean to remove the src if the video... set only in the close document flow
-    */
-    stopVideos:{
-        value:function(){
-            var videosArr = this.documentRoot.getElementsByTagName("video"), i=0;
-            for(i=0;i<videosArr.length;i++){
-                videosArr[i].src = "";
-            }
-        }
-    },
-    pauseAndStopVideos:{
-        value:function(){
-            var videosArr = this.documentRoot.getElementsByTagName("video"), i=0;
-            for(i=0;i<videosArr.length;i++){
-                if(!videosArr[i].paused){
-                    videosArr[i].pause();
-                }
-                videosArr[i].src = "";
-            }
-        }
-    }
-    ////////////////////////////////////////////////////////////////////
+        }
 });
\ No newline at end of file
diff --git a/js/document/text-document.js b/js/document/_toDelete/text-document.js
index 2574b67c..2574b67c 100755
--- a/js/document/text-document.js
+++ b/js/document/_toDelete/text-document.js
diff --git a/js/document/document-html.js b/js/document/document-html.js
index 89717dd6..c60a12a2 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -6,361 +6,172 @@ 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;
-    HtmlDocumentModel = require("js/document/models/html").HtmlDocumentModel;
+var Montage =                   require("montage/core/core").Montage,
+        Component =             require("montage/ui/component").Component,
+    HtmlDocumentModel =         require("js/document/models/html").HtmlDocumentModel,
+    DesignDocumentView =        require("js/document/views/design").DesignDocumentView;
 ////////////////////////////////////////////////////////////////////////
 //      
 exports.HtmlDocument = Montage.create(Component, {
         ////////////////////////////////////////////////////////////////////
         //
         hasTemplate: {
-                enumerable: false,
         value: false
     },