aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/CSSPanel/css-shorthand-map.js11
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js40
-rwxr-xr-xjs/panels/color/colorchippopup.reel/colorchippopup.html62
-rwxr-xr-xjs/panels/color/colorchippopup.reel/colorchippopup.js589
-rwxr-xr-xjs/panels/color/colorchippopup.reel/config.rb9
-rwxr-xr-xjs/panels/color/colorchippopup.reel/css/colorchippopup.css239
-rwxr-xr-xjs/panels/color/colorchippopup.reel/css/colorchippopup.scss240
-rwxr-xr-xjs/panels/color/colorchippopup.reel/img/icon_bitmap.pngbin3072 -> 0 bytes
-rwxr-xr-xjs/panels/color/colorchippopup.reel/img/icon_colorwheel.pngbin3420 -> 0 bytes
-rwxr-xr-xjs/panels/color/colorchippopup.reel/img/icon_gradient.pngbin2815 -> 0 bytes
-rwxr-xr-xjs/panels/color/colorchippopup.reel/img/icon_nofill.pngbin2951 -> 0 bytes
-rwxr-xr-xjs/panels/color/colorchippopup.reel/img/knob.pngbin1036 -> 0 bytes
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/colorpanelbase.js97
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/colorpanelpopup.html2
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/colorpanelpopup.js169
-rwxr-xr-xjs/panels/color/colorpopup-manager.js639
-rwxr-xr-xjs/panels/color/colortoolbar.reel/colortoolbar.html53
-rwxr-xr-xjs/panels/color/colortoolbar.reel/colortoolbar.js138
-rwxr-xr-xjs/panels/color/colortoolbar.reel/config.rb9
-rwxr-xr-xjs/panels/color/colortoolbar.reel/css/colortoolbar.css45
-rwxr-xr-xjs/panels/color/colortoolbar.reel/css/colortoolbar.scss52
-rw-r--r--js/panels/css-panel/styles-view-delegate.js22
-rwxr-xr-xjs/panels/properties.reel/properties.css8
-rwxr-xr-xjs/panels/properties.reel/properties.js19
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.js18
25 files changed, 695 insertions, 1766 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 = {
68 'padding-left' : ['padding'], 68 'padding-left' : ['padding'],
69 'padding-right' : ['padding'], 69 'padding-right' : ['padding'],
70 'padding-top' : ['padding'], 70 'padding-top' : ['padding'],
71 71
72 '-webkit-animation-name' : ['-webkit-animation'],
73 '-webkit-animation-duration' : ['-webkit-animation'],
74 '-webkit-animation-timing-function' : ['-webkit-animation'],
75 '-webkit-animation-delay' : ['-webkit-animation'],
76 '-webkit-animation-iteration-count' : ['-webkit-animation'],
77 '-webkit-animation-direction' : ['-webkit-animation'],
78 '-webkit-animation-fill-mode' : ['-webkit-animation'],
79
72 '-webkit-transition-property' : ['-webkit-transition'], 80 '-webkit-transition-property' : ['-webkit-transition'],
73 '-webkit-transition-duration' : ['-webkit-transition'], 81 '-webkit-transition-duration' : ['-webkit-transition'],
74 '-webkit-transition-timing-function' : ['-webkit-transition'], 82 '-webkit-transition-timing-function' : ['-webkit-transition'],
@@ -91,6 +99,7 @@ exports.CSS_SHORTHAND_TO_SUBPROP_MAP = {
91 'list' : ["list-style-type", "list-style-image", "list-style-position"], 99 'list' : ["list-style-type", "list-style-image", "list-style-position"],
92 'margin' : ["margin-top", "margin-right", "margin-bottom", "margin-left"], 100 'margin' : ["margin-top", "margin-right", "margin-bottom", "margin-left"],
93 'padding' : ["padding-top", "padding-right", "padding-bottom", "padding-left"], 101 'padding' : ["padding-top", "padding-right", "padding-bottom", "padding-left"],
102 '-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"],
94 '-webkit-transition' : ["-webkit-transition-property", "-webkit-transition-duration", 103 '-webkit-transition' : ["-webkit-transition-property", "-webkit-transition-duration",
95 "-webkit-transition-timing-function", "-webkit-transition-delay"] 104 "-webkit-transition-timing-function", "-webkit-transition-delay"]
96}; \ No newline at end of file 105}; \ 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 45353a08..3d31a50b 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -1217,8 +1217,21 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1217 arrCurrentElementsSelected = []; 1217 arrCurrentElementsSelected = [];
1218 var matchedValues = 0; 1218 var matchedValues = 0;
1219 1219
1220 for(i=0;i<arrSelectedIndexesLength;i++){ 1220 /*
1221 for(j=0;j<currentLayersSelectedLength;j++){ 1221 if (arrSelectedIndexesLength !== 0) {
1222 for(i=0;i<arrSelectedIndexesLength;i++){
1223 for(j=0;j<currentLayersSelectedLength;j++){
1224
1225 if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayerSelected[j]]){
1226 matchedValues+=1;
1227 }
1228 }
1229 }
1230
1231 if(matchedValues === arrSelectedIndexesLength){
1232 return;
1233 }
1234 }
1222 1235
1223 if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayersSelected[j]]){ 1236 if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayersSelected[j]]){
1224 matchedValues+=1; 1237 matchedValues+=1;
@@ -1226,11 +1239,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1226 } 1239 }
1227 } 1240 }
1228 1241
1229 if(matchedValues === arrSelectedIndexesLength){
1230 return;
1231 }
1232 1242
1233 /*
1234 // TODO: this should probably check to see if it actually needs to run. 1243 // TODO: this should probably check to see if it actually needs to run.
1235 1244
1236 console.log(arrSelectedIndexes); 1245 console.log(arrSelectedIndexes);
@@ -1266,6 +1275,21 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1266 if (arrSelectedIndexes.indexOf(i) < 0) { 1275 if (arrSelectedIndexes.indexOf(i) < 0) {
1267 this.arrLayers[i].layerData.isSelected = false; 1276 this.arrLayers[i].layerData.isSelected = false;
1268 this.triggerLayerBinding(i); 1277 this.triggerLayerBinding(i);
1278
1279 // Check to see if this layer, that we're deselecting, has
1280 // any selected keyframes associated with it. If it does, deselect them.
1281 for (var j = 0; j < this.selectedTweens.length; j++) {
1282 var currentStageElement;
1283 if (typeof(this.selectedTweens[j].parentComponent.parentComponent.trackType) === "undefined") {
1284 currentStageElement = this.selectedTweens[j].parentComponent.parentComponent.stageElement;
1285 } else {
1286 currentStageElement = this.selectedTweens[j].parentComponent.parentComponent.parentComponent.parentComponent.parentComponent.parentComponent.stageElement;
1287 }
1288 if (this.arrLayers[i].layerData.stageElement === currentStageElement) {
1289 this.selectedTweens[j].deselectTween();
1290 this.selectedTweens.splice(j, 1);
1291 }
1292 }
1269 } 1293 }
1270 } 1294 }
1271 } 1295 }
@@ -1273,8 +1297,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1273 this.currentLayersSelected = false; 1297 this.currentLayersSelected = false;
1274 } 1298 }
1275 1299
1276 // Deselect any tweens 1300 // Deselect tweens
1277 this.deselectTweens(); 1301 //this.deselectTweens();
1278 1302
1279 1303
1280 // If we are actually going to be selecting things, create an empty array to use 1304 // If we are actually going to be selecting things, create an empty array to use
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 @@
1<!DOCTYPE html>
2<!--
3 <copyright>
4 This file contains proprietary software owned by Motorola Mobility, Inc.
5 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
6 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
7 </copyright>
8-->
9<html lang="en">
10 <head>
11
12 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
13
14 <link rel="stylesheet" type="text/css" href="css/colorchippopup.css">
15
16 <script type="text/montage-serialization">
17 {
18 "owner": {
19 "prototype": "js/panels/Color/colorchippopup.reel",
20 "properties": {
21 "element": {"#": "cc_popup"}
22 }
23 }
24 }
25 </script>
26
27 </head>
28
29 <body>
30
31 <div data-montage-id="cc_popup" class="cc_popup">
32 <div id="cc_pu_options">
33
34 <div id="cc_pu_hex">#<input id="cc_pu_hottext_hex" class="cc_pu_hottext_hex" maxlength="6" /></div>
35
36 <button id="cc_pu_wheel" title="Color Wheel">Color Wheel</button>
37 <button id="cc_pu_images" title="Background Image">Images</button>
38 <button id="cc_pu_gradients" title="Gradient">Gradients</button>
39 <button id="cc_pu_palettes" title="Color Palette">Palettes</button>
40 <button id="cc_pu_nocolor" title="No Color">No Color</button>
41
42 </div>
43
44 <div id="cc_pu_content">
45 <div id="cc_pu_wheel_container" class="cc_pu_wheel_container"></div>
46 <div id="cc_pu_gradient_container" class="cc_pu_gradient_container"></div>
47 <div id="cc_pu_palette_container" class="cc_pu_palette_container"></div>
48 <div id="cc_pu_image_container" class="cc_pu_image_container"></div>
49 </div>
50
51 <div id="cc_pu_alpha">
52 <div id="cc_pu_a_label">Alpha</div>
53 <div id="cc_pu_a_slider" class="cc_pu_a_slider"></div>
54 <input id="cc_pu_a_hottext" class="cc_pu_a_hottext"/>
55 <div id="cc_pu_a_label2">%</div>
56 </div> </