25 files changed, 699 insertions, 1767 deletions

diff --git a/js/panels/CSSPanel/css-shorthand-map.js b/js/panels/CSSPanel/css-shorthand-map.js
index d469e2a1..e38627f7 100755
--- a/js/panels/CSSPanel/css-shorthand-map.js
+++ b/js/panels/CSSPanel/css-shorthand-map.js
@@ -68,7 +68,15 @@ exports.CSS_SHORTHAND_MAP = {
     'padding-left' : ['padding'],
     'padding-right' : ['padding'],
     'padding-top' : ['padding'],
-    
+
+    '-webkit-animation-name'            : ['-webkit-animation'],
+    '-webkit-animation-duration'        : ['-webkit-animation'],
+    '-webkit-animation-timing-function' : ['-webkit-animation'],
+    '-webkit-animation-delay'           : ['-webkit-animation'],
+    '-webkit-animation-iteration-count' : ['-webkit-animation'],
+    '-webkit-animation-direction'       : ['-webkit-animation'],
+    '-webkit-animation-fill-mode'       : ['-webkit-animation'],
+
     '-webkit-transition-property' : ['-webkit-transition'],
     '-webkit-transition-duration' : ['-webkit-transition'],
     '-webkit-transition-timing-function' : ['-webkit-transition'],
@@ -91,6 +99,7 @@ exports.CSS_SHORTHAND_TO_SUBPROP_MAP = {
     'list' : ["list-style-type", "list-style-image", "list-style-position"],
     'margin' : ["margin-top", "margin-right", "margin-bottom", "margin-left"],
     'padding' : ["padding-top", "padding-right", "padding-bottom", "padding-left"],
+    '-webkit-animation': ["webkit-animation-name", "webkit-animation-duration", "webkit-animation-timing-function", "webkit-animation-delay", "webkit-animation-iteration-count", "webkit-animation-direction", "webkit-animation-fill-mode"],
     '-webkit-transition' : ["-webkit-transition-property", "-webkit-transition-duration",
                             "-webkit-transition-timing-function", "-webkit-transition-delay"]
 };
\ No newline at end of file
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 50171260..3d31a50b 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -1217,20 +1217,29 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                         arrCurrentElementsSelected = [];
             var matchedValues = 0;
 
-            for(i=0;i<arrSelectedIndexesLength;i++){
-                for(j=0;j<currentLayersSelectedLength;j++){
+                /*
+            if (arrSelectedIndexesLength !== 0) {
+                    for(i=0;i<arrSelectedIndexesLength;i++){
+                        for(j=0;j<currentLayersSelectedLength;j++){
+        
+                            if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayerSelected[j]]){
+                                matchedValues+=1;
+                            }
+                        }
+                    }
+        
+                    if(matchedValues === arrSelectedIndexesLength){
+                        return;
+                    }
+            } 
 
-                    if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayerSelected[j]]){
+                    if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayersSelected[j]]){
                         matchedValues+=1;
                     }
                 }
             }
 
-            if(matchedValues === arrSelectedIndexesLength){
-                return;
-            }
 
-                /*
                  // TODO: this should probably check to see if it actually needs to run.
 
                                         console.log(arrSelectedIndexes);
@@ -1266,6 +1275,21 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                         if (arrSelectedIndexes.indexOf(i) < 0) {
                                                 this.arrLayers[i].layerData.isSelected = false;
                                 this.triggerLayerBinding(i);
+                                
+                                // Check to see if this layer, that we're deselecting, has
+                                // any selected keyframes associated with it.  If it does, deselect them.
+                                for (var j = 0; j < this.selectedTweens.length; j++) {
+                                        var currentStageElement;
+                                        if (typeof(this.selectedTweens[j].parentComponent.parentComponent.trackType) === "undefined") {
+                                                currentStageElement = this.selectedTweens[j].parentComponent.parentComponent.stageElement; 
+                                        } else {
+                                                currentStageElement = this.selectedTweens[j].parentComponent.parentComponent.parentComponent.parentComponent.parentComponent.parentComponent.stageElement;
+                                        }
+                                        if (this.arrLayers[i].layerData.stageElement === currentStageElement) {
+                                                this.selectedTweens[j].deselectTween();
+                                                this.selectedTweens.splice(j, 1);
+                                        }
+                                }
                         }
                 }
             }
@@ -1273,8 +1297,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 this.currentLayersSelected = false;
             }
 
-            // Deselect any tweens
-                this.deselectTweens();
+            // Deselect tweens
+            //this.deselectTweens();
 
             
             // If we are actually going to be selecting things, create an empty array to use
@@ -1773,6 +1797,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                                 currentLayersSelectedLength = this.currentLayersSelected.length,
                                 arrLayersLength = this.arrLayers.length,
                                 returnVal = arrLayersLength -1;
+                        if (returnVal === -1) {
+                                return false;
+                        }
                         if (this.currentLayersSelected === false) {
                                 return false;
                         }
diff --git a/js/panels/color/colorchippopup.reel/colorchippopup.html b/js/panels/color/colorchippopup.reel/colorchippopup.html
deleted file mode 100755
index cdb26894..00000000
--- a/js/panels/color/colorchippopup.reel/colorchippopup.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<!-- 
-        <copyright>
-        This file contains proprietary software owned by Motorola Mobility, Inc.
-        No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
-        (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
-        </copyright>
--->
-<html lang="en">
-        <head>
-        
-        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-        
-        <link rel="stylesheet" type="text/css" href="css/colorchippopup.css">
-                
-                <script type="text/montage-serialization">
-        {
-            "owner": {
-                "prototype": "js/panels/Color/colorchippopup.reel",
-                "properties": {
-                    "element": {"#": "cc_popup"}
-                }
-            }
-        }
-                </script>
-                
-        </head>
-        
-        <body>
-    
-        <div data-montage-id="cc_popup" class="cc_popup">
-                <div id="cc_pu_options">
-                        
-                        <div id="cc_pu_hex">#<input id="cc_pu_hottext_hex" class="cc_pu_hottext_hex" maxlength="6" /></div>
-                        
-                        <button id="cc_pu_wheel" title="Color Wheel">Color Wheel</button>
-                        <button id="cc_pu_images" title="Background Image">Images</button>
-                        <button id="cc_pu_gradients" title="Gradient">Gradients</button>