diff options
Diffstat (limited to 'js/panels')
25 files changed, 720 insertions, 1759 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 b0ab3b19..e6da9199 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -1214,6 +1214,58 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
1214 | arrSelectedLayers = false, | 1214 | arrSelectedLayers = false, |
1215 | arrCurrentElementsSelected = []; | 1215 | arrCurrentElementsSelected = []; |
1216 | 1216 | ||
1217 | /* | ||
1218 | if (arrSelectedIndexesLength !== 0) { | ||
1219 | for(i=0;i<arrSelectedIndexesLength;i++){ | ||
1220 | for(j=0;j<currentLayersSelectedLength;j++){ | ||
1221 | |||
1222 | if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayerSelected[j]]){ | ||
1223 | matchedValues+=1; | ||
1224 | } | ||
1225 | } | ||
1226 | } | ||
1227 | |||
1228 | if(matchedValues === arrSelectedIndexesLength){ | ||
1229 | return; | ||
1230 | } | ||
1231 | } | ||
1232 | |||
1233 | if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayersSelected[j]]){ | ||
1234 | matchedValues+=1; | ||
1235 | } | ||
1236 | } | ||
1237 | } | ||
1238 | |||
1239 | |||
1240 | // TODO: this should probably check to see if it actually needs to run. | ||
1241 | |||
1242 | console.log(arrSelectedIndexes); | ||
1243 | console.log(this.currentLayersSelected); | ||
1244 | // Compare arrSelectedIndexes with this.currentLayersSelected | ||
1245 | // If the items are the same, we do not need to do anything. | ||
1246 | if (arrSelectedIndexesLength !== currentLayersSelectedLength) { | ||
1247 | // Different length in the arrays, we definitely need to continue. | ||
1248 | console.log('diferent length') | ||
1249 | boolContinue = true; | ||
1250 | } else { | ||
1251 | // Check each selected index and see if it's in this.currentLayersSelected | ||
1252 | // If we find one that isn't, we need to continue | ||
1253 | |||
1254 | for (i = 0; i < arrSelectedIndexesLength; i++) { | ||
1255 | console.log('checking for ', arrSelectedIndexes[i]); | ||
1256 | if (this.currentLayersSelected.indexOf(arrSelectedIndexes[i]) === -1) { | ||
1257 | // Ooops, one of them was not found. | ||
1258 | boolContinue = true; | ||
1259 | } | ||
1260 | } | ||
1261 | } | ||
1262 | if (boolContinue === false) { | ||
1263 | console.log('exiting') | ||
1264 | return; | ||
1265 | } | ||
1266 | */ | ||
1267 | |||
1268 | |||
1217 | // Deselect selected layers if they're not in arrSelectedIndexes. | 1269 | // Deselect selected layers if they're not in arrSelectedIndexes. |
1218 | for (i = 0; i < arrLayersLength; i++) { | 1270 | for (i = 0; i < arrLayersLength; i++) { |
1219 | if (this.arrLayers[i].layerData.isSelected === true) { | 1271 | if (this.arrLayers[i].layerData.isSelected === true) { |
@@ -1223,7 +1275,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
1223 | 1275 | ||
1224 | // Check to see if this layer, that we're deselecting, has | 1276 | // Check to see if this layer, that we're deselecting, has |
1225 | // any selected keyframes associated with it. If it does, deselect them. | 1277 | // any selected keyframes associated with it. If it does, deselect them. |
1226 | for (j = 0; j < this.selectedTweens.length; j++) { | 1278 | for (var j = 0; j < this.selectedTweens.length; j++) { |
1227 | var currentStageElement; | 1279 | var currentStageElement; |
1228 | if (typeof(this.selectedTweens[j].parentComponent.parentComponent.trackType) === "undefined") { | 1280 | if (typeof(this.selectedTweens[j].parentComponent.parentComponent.trackType) === "undefined") { |
1229 | currentStageElement = this.selectedTweens[j].parentComponent.parentComponent.stageElement; | 1281 | currentStageElement = this.selectedTweens[j].parentComponent.parentComponent.stageElement; |
@@ -1241,6 +1293,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
1241 | if (this.currentLayersSelected !== false) { | 1293 | if (this.currentLayersSelected !== false) { |
1242 | this.currentLayersSelected = false; | 1294 | this.currentLayersSelected = false; |
1243 | } | 1295 | } |
1296 | |||
1297 | // Deselect tweens | ||
1298 | //this.deselectTweens(); | ||
1299 | |||
1244 | 1300 | ||
1245 | // If we are actually going to be selecting things, create an empty array to use | 1301 | // If we are actually going to be selecting things, create an empty array to use |
1246 | if (arrSelectedIndexesLength > 0) { | 1302 | if (arrSelectedIndexesLength > 0) { |
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> |