31 files changed, 2997 insertions, 3517 deletions

diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json
index abdacbe1..6fe5da69 100644
--- a/js/panels/Materials/materials-data.json
+++ b/js/panels/Materials/materials-data.json
@@ -5,10 +5,18 @@
             "label": "Ninja Materials",
             "children": [
                 {
+                    "label": "Blue Sky",
+                    "id" : "Blue Sky"
+               },
+               {
                     "label": "Bump Metal",
                     "id" : "Bump Metal"
                 },
-                {
+                 {
+                    "label": "Dark Blur",
+                    "id" : "Dark Blur"
+                },
+               {
                     "label": "Flag",
                     "id" : "Flag"
                 },
@@ -17,10 +25,6 @@
                     "id" : "Linear Gradient"
                 },
                 {
-                    "label": "Paris",
-                    "id" : "Paris"
-                },
-                {
                     "label": "Plasma",
                     "id" : "Plasma"
                 },
@@ -29,6 +33,10 @@
                     "id" : "Pulse"
                 },
                 {
+                    "label": "Radial Blur",
+                    "id" : "Radial Blur"
+                },
+                {
                     "label": "Radial Gradient",
                     "id" : "Radial Gradient"
                 },
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
index aef48230..c3c2a6de 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
@@ -116,6 +116,14 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
     handleShowMaterialPopup: {
         enumerable: false,
         value: function (event) {
+            var piButton = this.application.eventManager.componentClaimingPointer("mouse");
+            if(piButton) {
+                this.selectedMaterialNode = piButton.element;
+            } else {
+                this.selectedMaterialNode = null;
+            }
+
+            this.materialId = event.detail.materialId;
             this._showMaterialPopup(event.detail);
         }
     },
@@ -209,11 +217,27 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
 
     willPositionPopup: {
         value: function(popup, defaultPosition) {
-            var content = popup.content.element,
+            var left,
+                top,
+                content = popup.content.element,
                 contentHt = parseFloat(content.style.height) || content.offsetHeight || 0,
                 contentWd = parseFloat(content.style.width) || content.offsetWidth || 0,
                 pt = webkitConvertPointFromNodeToPage(this.selectedMaterialNode, new WebKitPoint(0, 0));
-            return {top: pt.y - contentHt + 10, left: pt.x - contentWd + 10};
+                        
+                        if(!pt) {
+                return defaultPosition;
+            } 
+
+            top = pt.y - contentHt + 10;
+            if(top < 0) {
+                top = 0;
+            }
+            left = pt.x - contentWd + 10;
+            if(left < 0) {
+                left = 0;
+            }
+
+            return {top:top, left:left};
         }
     }
 });
diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js
index 39e51901..0e7a4e68 100755
--- a/js/panels/Splitter.js
+++ b/js/panels/Splitter.js
@@ -111,6 +111,8 @@ exports.Splitter = Montage.create(Component, {
                 else this.panel.classList.remove("collapsed");
                 this.element.classList.remove("collapsed");
                 if(this._resizeBar != null) this.resizeBar.classList.remove("collapsed");
+                // webkitTransitionEnd is not fired when expanded, so force draw here.
+                this.application.ninja.stage.resizeCanvases = true;
             }
         }
     },
diff --git a/js/panels/Timeline/DragDrop.js b/js/panels/Timeline/DragDrop.js
deleted file mode 100644
index b13df482..00000000
--- a/js/panels/Timeline/DragDrop.js
+++ /dev/null
@@ -1,161 +0,0 @@
-/* <copyright>
-Copyright (c) 2012, Motorola Mobility LLC.
-All Rights Reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of Motorola Mobility LLC nor the names of its
-  contributors may be used to endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-</copyright> */
-
-var Montage = require("montage/core/core").Montage;
-var Composer = require("montage/ui/composer/composer").Composer;
-
-exports.DragDropComposer = Montage.create(Composer, {
-
-    draggable: {
-        value: true
-    },
-
-    droppable: {
-        value: true
-    },
-
-    identifier: {
-        value: "generic"
-    },
-
-    _dragover: {
-        value: false