aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/PropertyTrack.reel
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/Timeline/PropertyTrack.reel')
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html30
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js30
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss12
3 files changed, 36 insertions, 36 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html
index 3f646e81..8a1a685b 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
@@ -29,9 +29,9 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29POSSIBILITY OF SUCH DAMAGE. 29POSSIBILITY OF SUCH DAMAGE.
30</copyright> --> 30</copyright> -->
31<html lang="en"> 31<html lang="en">
32 <head> 32 <head>
33 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 33 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
34 <link rel="stylesheet" type="text/css" href="css/PropertyTrack.css"> 34 <link rel="stylesheet" type="text/css" href="css/PropertyTrack.css">
35 <script type="text/montage-serialization"> 35 <script type="text/montage-serialization">
36 { 36 {
37 "owner": { 37 "owner": {
@@ -46,9 +46,9 @@ POSSIBILITY OF SUCH DAMAGE.
46 "propTween" : { 46 "propTween" : {
47 "prototype" : "js/panels/timeline/Tween.reel", 47 "prototype" : "js/panels/timeline/Tween.reel",
48 "properties" : { 48 "properties" : {
49 "element":{"#": "prop_track_lane"} 49 "element":{"#": "prop_track_lane"}
50 }, 50 },
51 "bindings" : { 51 "bindings" : {
52 "tweenData" : { 52 "tweenData" : {
53 "boundObject" : {"@": "propTweenRepetition"}, 53 "boundObject" : {"@": "propTweenRepetition"},
54 "boundObjectPropertyPath" : "objectAtCurrentIteration.tweenData", 54 "boundObjectPropertyPath" : "objectAtCurrentIteration.tweenData",
@@ -60,27 +60,27 @@ POSSIBILITY OF SUCH DAMAGE.
60 "propTweenRepetition": { 60 "propTweenRepetition": {
61 "prototype": "montage/ui/repetition.reel", 61 "prototype": "montage/ui/repetition.reel",
62 "properties": { 62 "properties": {
63 "element": {"#": "prop_track_lanes"}, 63 "element": {"#": "prop_track_lanes"},
64 "isSelectionEnabled" : false 64 "isSelectionEnabled" : false
65 }, 65 },
66 "bindings": { 66 "bindings": {
67 "objects": { 67 "objects": {
68 "boundObject": {"@": "owner"}, 68 "boundObject": {"@": "owner"},
69 "boundObjectPropertyPath": "propTweens", 69 "boundObjectPropertyPath": "propTweens",
70 "oneway": false 70 "oneway": false
71 } 71 }
72 } 72 }
73 } 73 }
74 } 74 }
75 </script> 75 </script>
76 </head> 76 </head>
77 <body> 77 <body>
78 78
79 <div data-montage-id="property-track" class="timeline-track"> 79 <div data-montage-id="property-track" class="timeline-track">
80 <div data-montage-id="prop_track_lanes" class="prop-track"> 80 <div data-montage-id="prop_track_lanes" class="prop-track">
81 <div data-montage-id="prop_track_lane"></div> 81 <div data-montage-id="prop_track_lane"></div>
82 </div> 82 </div>
83 </div> 83 </div>
84 84
85 </body> 85 </body>
86</html> 86</html>
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index 6c68fa63..43ff34f9 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -212,10 +212,10 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
212 // check if there is an editor property assigned yet 212 // check if there is an editor property assigned yet
213 // get this property track's editor prop name from layer data arrays 213 // get this property track's editor prop name from layer data arrays
214 var selectIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID), 214 var selectIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID),
215 currentSelectedStyleIndex = this.getCurrentSelectedStyleIndex(selectIndex); 215 currentSelectedStyleIndex = this.getCurrentSelectedStyleIndex(selectIndex);
216 216
217 if (this.trackType == "style") { 217 if (this.trackType == "style") {
218 //console.log("PropertyTrack.handleClick; selectIndex = ", selectIndex, "; styleIndex = ", currentSelectedStyleIndex) 218 //console.log("PropertyTrack.handleClick; selectIndex = ", selectIndex, "; styleIndex = ", currentSelectedStyleIndex)
219 if (this.application.ninja.timeline.arrLayers[selectIndex].layerData.arrLayerStyles[currentSelectedStyleIndex].editorProperty == null) { 219 if (this.application.ninja.timeline.arrLayers[selectIndex].layerData.arrLayerStyles[currentSelectedStyleIndex].editorProperty == null) {
220 console.log("Please enter a style property for this track before adding keyframes."); 220 console.log("Please enter a style property for this track before adding keyframes.");
221 return; 221 return;
@@ -238,20 +238,20 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
238 } 238 }
239 } 239 }
240 }, 240 },
241 241
242 getCurrentSelectedStyleIndex: { 242 getCurrentSelectedStyleIndex: {
243 value: function(layerIndex) { 243 value: function(layerIndex) {
244 var returnVal = false, 244 var returnVal = false,
245 i = 0, 245 i = 0,
246 arrLayerStylesLength = this.application.ninja.timeline.arrLayers[layerIndex].layerData.arrLayerStyles.length; 246 arrLayerStylesLength = this.application.ninja.timeline.arrLayers[layerIndex].layerData.arrLayerStyles.length;
247 for (i = 0; i < arrLayerStylesLength; i++) { 247 for (i = 0; i < arrLayerStylesLength; i++) {
248 var currItem = this.application.ninja.timeline.arrLayers[layerIndex].layerData.arrLayerStyles[i]; 248 var currItem = this.application.ninja.timeline.arrLayers[layerIndex].layerData.arrLayerStyles[i];
249 if (currItem.isSelected === true) { 249 if (currItem.isSelected === true) {
250 returnVal = i; 250 returnVal = i;
251 } 251 }
252 } 252 }
253 return returnVal; 253 return returnVal;
254 } 254 }
255 }, 255 },
256 256
257 handleNewPropTween:{ 257 handleNewPropTween:{
diff --git a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
index 38a16622..2127b92d 100644
--- a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
+++ b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
31/* PropertyTrack.scss 31/* PropertyTrack.scss
32 * Main SCSS file for PropertyTrack component, compiled by SASS into the file css/PropertyTrack.css. 32 * Main SCSS file for PropertyTrack component, compiled by SASS into the file css/PropertyTrack.css.
33 */ 33 */
34 34
35// Import theme settings 35// Import theme settings
36@import "../../../../../scss/imports/themes/default/colors"; 36@import "../../../../../scss/imports/themes/default/colors";
37@import "../../../../../scss/imports/themes/default/mixins"; 37@import "../../../../../scss/imports/themes/default/mixins";
@@ -41,18 +41,18 @@ POSSIBILITY OF SUCH DAMAGE.
41 41
42 42
43.content-main .collapsible-content .timeline-track { 43.content-main .collapsible-content .timeline-track {
44 height: 18px; 44 height: 18px;
45 padding-top: 2px; 45 padding-top: 2px;
46 border-bottom: 1px solid $color-menu-divider; 46 border-bottom: 1px solid $color-menu-divider;
47 background-image: url("../images/gridline.jpg"); 47 background-image: url("../images/gridline.jpg");
48 } 48 }
49 49
50 50
51.timeline-track .content-main { 51.timeline-track .content-main {
52 background-color: $color-menu-bg; 52 background-color: $color-menu-bg;
53} 53}
54 54
55.prop-track .collapsible-content.collapsible-collapsed { 55.prop-track .collapsible-content.collapsible-collapsed {
56 overflow: hidden; 56 overflow: hidden;
57 height: 0px; 57 height: 0px;
58} 58}