aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-09 14:35:44 -0700
committerValerio Virgillito2012-07-09 14:35:44 -0700
commit84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html
parentc0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
downloadninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
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>