Merge branch 'refs/heads/TimelineUber' into TimelineProps

6 files changed, 10 insertions, 196 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 6d11bd0e..c6bf4c6b 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -427,10 +427,6 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
 
     closeDocument: {
         value: function(id) {
-            if(this.activeDocument.needsSave === true){
-                //if file dirty then alert user to save
-        }
-
             var doc = this._findDocumentByUUID(id);
 
             var closeDocumentIndex = this._findIndexByUUID(id);
diff --git a/js/controllers/elements/controller-factory.js b/js/controllers/elements/controller-factory.js
index 1bbbbce0..3ac3fe14 100755
--- a/js/controllers/elements/controller-factory.js
+++ b/js/controllers/elements/controller-factory.js
@@ -42,6 +42,8 @@ exports.ControllerFactory = Montage.create(Montage, {
                     return ImageController;
                 } else if(value.indexOf("video") !== -1) {
                     return VideoController;
+                } else {
+                    return BlockController;
                 }
             } catch (err) {
                 console.log("Could not create Controller Factory " + err);
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index ea5fe4af..20225c61 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -15,16 +15,15 @@ exports.ElementController = Montage.create(Component, {
                 var selectedLayerIndex = this.application.ninja.timeline.getLayerIndexByID(this.application.ninja.timeline.currentLayerSelected.layerData.layerID);
 
                 if(selectedLayerIndex === 0) {
-                    this.application.ninja.currentDocument.documentRoot.appendChild(el);
+                    this.application.ninja.currentSelectedContainer.appendChild(el);
                 } else {
                     var element = this.application.ninja.timeline.arrLayers[selectedLayerIndex].layerData.elementsList[0];
                     element.parentNode.insertBefore(el, element.nextSibling);
                 }
             } else {
-                this.application.ninja.currentDocument.documentRoot.appendChild(el);
+                this.application.ninja.currentSelectedContainer.appendChild(el);
             }
-            // Nested elements - TODO make sure the CSS is correct before nesting elements
-            // this.application.ninja.currentSelectedContainer.appendChild(el);
+
             if(styles) {
                 this.application.ninja.stylesController.setElementStyles(el, styles);
             }
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 8d7b74f0..e9a5f865 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -129,7 +129,7 @@ exports.ShapesController = Montage.create(CanvasController, {
                     el.elementModel.shapeModel.GLWorld.render();
                     break;
                 case "useWebGl":
-                    canvas = njModule.NJUtils.makeNJElement("canvas", "Canvas", "shape", el.className, true);
+                    canvas = njModule.NJUtils.make("canvas", el.className, this.application.ninja.currentDocument);
                     canvas.setAttribute("data-RDGE-id", njModule.NJUtils.generateRandom());
                     canvas.width = el.width;
                     canvas.height = el.height;
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index ec4314f9..2ff3e235 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -795,7 +795,9 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             ///// method to apply/test the new value
             dec.setProperty(property, value, priority);
 
-            this.styleSheetModified(rule.parentStyleSheet);
+            if(rule.parentStyleSheet) {
+                this.styleSheetModified(rule.parentStyleSheet);
+            }
 
             ///// Return browser value for value we just set
             return dec.getPropertyValue(property);
@@ -1102,7 +1104,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
                 ///// The dominant rule might not have the style property defined - why?
                 ///// If no rules have the property defined, we can use the
                 ///// most-specific single-target rule as the dominant rule (for setting styles)
-                return element.ownerDocument.defaultView.getComputedStyle(element).getPropertyValue(property);
+                return (element.ownerDocument.defaultView ? element.ownerDocument.defaultView.getComputedStyle(element).getPropertyValue(property) : null);
             }
 
             return value;
diff --git a/js/controllers/tree-controller.js b/js/controllers/tree-controller.js
deleted file mode 100644
index 2b2e910c..00000000
--- a/js/controllers/tree-controller.js
+++ /dev/null
@@ -1,185 +0,0 @@
-/* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> */
-/**
- @module montage/ui/controller/tree-controller
- @requires montage/core/core
- @requires montage/ui/controller/object-controller
- @requires montage/core/event/mutable-event
- */
-var Montage = require("montage").Montage,
-    ObjectController = require("montage/ui/controller/object-controller").ObjectController,
-    ArrayController = require("montage/ui/controller/array-controller").ArrayController,
-    MutableEvent = require("montage/core/event/mutable-event").MutableEvent;
-/**
-    TODO: Write description like the array controllers: The ArrayController helps with organizing a hierarchical
-    collection of objects, and managing user selection within that collection.
-    You can assign a TreeController instance as the <code>contentProvider</code> property for a TreeView object.
-    @class module:montage/ui/controller/tree-controller.TreeController
-    @classdesc
-    @extends module:montage/ui/controller/object-controller.ObjectController
-*/
-var TreeController = exports.TreeController = Montage.create(ObjectController, /** @lends module:montage/ui/controller/tree-controller.TreeController# */ {
-
-    rootKey : {
-        value: null
-    },
-
-    branchKey : {
-        value: 'children'
-    },
-
-    _root : {
-        value : null
-    },
-    root : {
-        get: function() {
-            return this._root;
-        },
-        set: function(value) {
-            this._root = value;
-
-            this.initArrayControllers();
-        }
-    },
-
-    rootController: {
-        value: null
-    },
-
-    initArrayControllers : {
-        value: function() {
-            var self = this;
-
-            ///// Recursive function that finds all branch nodes and initializes
-            ///// sets the tree node type to "branch" or "leaf"
-
-            function walk(node, init, depth) {
-                var branch = node[self.branchKey];
-
-                if(branch) {
-                    branch.forEach(function(node) {
-                        walk(node, init, ++depth);
-                    });
-
-                    node['treeNodeType'] = 'branch';
-                } else {
-                    node['treeNodeType'] = 'leaf';
-                }
-            }
-
-            walk(this._root, 0);
-
-        }
-    },
-
-    /**
-        @private
-     */
-    _selectedIndexes: {
-        value: null,
-        enumerable: false
-    },
-
-   /**
-        Description TODO
-        @type {Function}
-        @default null
-    */
-    selectedIndexes: {
-        get: function() {
-
-        },
-        set: function(value) {
-
-        }
-    },
-
-    branchControllers: {
-        value: []
-    },
-
-    addBranchController : {
-        value: function(controller) {
-            if(this.delegate) {
-                controller.delegate = this.delegate;
-            }
-
-            this.branchControllers.push(controller);
-        }
-    },
-
-    /**
-     @private
-     */