Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/tools/SelectionTool.js

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

1 files changed, 36 insertions, 111 deletions

diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js
index 53cca029..dbb3f30d 100755
--- a/js/controllers/selection-controller.js
+++ b/js/controllers/selection-controller.js
@@ -6,8 +6,7 @@ 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,
-    NJUtils     = require("js/lib/NJUtils").NJUtils;
+    Component = require("montage/ui/component").Component;
 
 exports.SelectionController = Montage.create(Component, {
 
@@ -45,13 +44,10 @@ exports.SelectionController = Montage.create(Component, {
         value: function() {
             this.eventManager.addEventListener("openDocument", this, false);
             this.eventManager.addEventListener("elementAdded", this, false);
-            this.eventManager.addEventListener("elementDeleted", this, false);
+            this.eventManager.addEventListener("elementsRemoved", this, false);
             this.eventManager.addEventListener("selectAll", this, false);
-            this.eventManager.addEventListener("deleteSelection", this, false);
             this.eventManager.addEventListener("switchDocument", this, false);
             this.eventManager.addEventListener("closeDocument", this, false);
-//            defaultEventManager.addEventListener( "undo", this, false);
-//            defaultEventManager.addEventListener( "redo", this, false);
         }
     },
 
@@ -67,35 +63,25 @@ exports.SelectionController = Montage.create(Component, {
     
     initWithDocument: {
         value: function(currentSelectionArray) {
-            this._selectedItems = [];
             this._isDocument = true;
 
             if(currentSelectionArray) {
                 if(currentSelectionArray.length >= 1) {
-                    this._selectedItems = currentSelectionArray;
                     this._isDocument = false;
 
-
-
                     this.application.ninja.selectedElements = currentSelectionArray;
                     NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument});
-
-
-
                 }
             }
 
-            //
             this._selectionContainer = this.application.ninja.currentSelectedContainer;
-
         }
     },
 
     handleSwitchDocument: {
         value: function() {
             if(this.application.ninja.documentController.activeDocument.currentView === "design"){
-                this._selectedItems = this.application.ninja.selectedElements.slice(0);
-                this._isDocument = this._selectedItems.length === 0;
+                this._isDocument = this.application.ninja.selectedElements.length === 0;
                 NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} );
             }
         }
@@ -107,21 +93,12 @@ exports.SelectionController = Montage.create(Component, {
         }
     },
 
-    handleElementDeleted: {
+    handleElementsRemoved: {
         value: function(event) {
             if(!this._isDocument) {
-                if(this.findSelectedElement(event.detail) !== -1) {
-                    this.executeSelectElement();
-                    var element = event.detail;
-                     if (element) {
-                        if (element.elementModel) {
-                            if (element.elementModel.shapeModel) {
-                                if (element.elementModel.shapeModel.GLWorld)
-                                    element.elementModel.shapeModel.GLWorld.clearTree();
-                            }
-                        }
-                    }
-                }
+                this.application.ninja.selectedElements = [];
+                this._isDocument = true;
+                NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument});
             }
         }
     },
@@ -142,23 +119,19 @@ exports.SelectionController = Montage.create(Component, {
         }
     },
 
-    handleDeleteSelection: {
-        value: function(event) {
-            this.application.ninja.selectedElements = [];
-            this._isDocument = true;
-            NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument});
-        }
-    },
-
     /**
      * Select Element. This function will not check that element, it will simply add it to the selection array.
      */
     executeSelectElement: {
-        value: function(item) {
+        value: function(element) {
             this.application.ninja.selectedElements = [];
 
-            if(item) {
-                this.application.ninja.selectedElements.push({_element: item, uuid: item.uuid});
+            if(element) {
+                if(Array.isArray(element)) {
+                    this.application.ninja.selectedElements = Array.prototype.slice.call(element, 0);
+                } else {
+                    this.application.ninja.selectedElements.push(element);
+                }
                 this._isDocument = false;
             } else {
                 this._isDocument = true;
@@ -171,23 +144,20 @@ exports.SelectionController = Montage.create(Component, {
     },
 
     selectElement: {
-        value: function(item) {
+        value: function(element) {
 
-            if(this.findSelectedElement(item) === -1) {
+            if(this.findSelectedElement(element) === -1) {
 
-                if(this.application.ninja.currentDocument.inExclusion(item) !== -1){
+                if(this.application.ninja.currentDocument.inExclusion(element) !== -1){
                     if(this.isDocument) return;     // If the stage is already selected do nothing.
-                    this.executeSelectElement();    // Else execute selection with no item
+                    this.executeSelectElement();    // Else execute selection with no element
                 } else {
-
-//                    if(item.parentNode.id === "UserContent") {
-                    if(item.parentNode.uuid === this.selectionContainer.uuid) {
-                        this.executeSelectElement(item);
+                    if(element.parentNode.uuid === this.selectionContainer.uuid) {
+                        this.executeSelectElement(element);
                     } else {
-                        var outerElement = item.parentNode;
+                        var outerElement = element.parentNode;
 
                         while(outerElement.parentNode && outerElement.parentNode.uuid !== this.selectionContainer.uuid) {
-                        //while(outerElement.parentNode && outerElement.parentNode.id !== "UserContent") {
                             // If element is higher up than current container then return
                             if(outerElement.id === "UserContent") return;
                             // else keep going up the chain
@@ -202,13 +172,13 @@ exports.SelectionController = Montage.create(Component, {
     },
 
     selectElements: {
-        value: function(items) {
-            if(items && items.length > 0) {
+        value: function(elements) {
+            if(elements && elements.length > 0) {
                 var that = this;
                 this.application.ninja.selectedElements = [];
 
-                items.forEach(function(item) {
-                    that.application.ninja.selectedElements.push({_element: item, uuid: item.uuid});
+                elements.forEach(function(element) {
+                    that.application.ninja.selectedElements.push(element);
                     that._isDocument = false;
                 });
 
@@ -218,22 +188,22 @@ exports.SelectionController = Montage.create(Component, {
     },
 
     shiftSelectElement: {
-        value: function(item) {
-            if(this.application.ninja.currentDocument.inExclusion(item) !== -1) return;
+        value: function(element) {
+            if(this.application.ninja.currentDocument.inExclusion(element) !== -1) return;
 
-            (this.findSelectedElement(item) !== -1 ) ? this.removeElement(item) : this.insertElement(item);
+            (this.findSelectedElement(element) !== -1 ) ? this.removeElement(element) : this.insertElement(element