aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html
diff options
context:
space:
mode:
authorhwc4872012-07-09 16:08:02 -0700
committerhwc4872012-07-09 16:08:02 -0700
commit5085d0f67df89a21715308956004164597a6ba79 (patch)
tree2c896163143a66331205a39b0a3b1b45d51bf12a /js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html
parent51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
downloadninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts: js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html')
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html30
1 files changed, 15 insertions, 15 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>