aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Tween.reel/Tween.html
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-23 15:11:51 -0800
committerJose Antonio Marquez2012-02-23 15:11:51 -0800
commitbdc39718cacad2eab10a7d031ea10fda13c92a03 (patch)
tree5fa2ae85a15d8a5067fa6f608c2b285869264ead /js/panels/Timeline/Tween.reel/Tween.html
parent23b4bbd13345ecd5c00fda60b995a7fb2aab317c (diff)
parent41b69af7c0be3dd5fe4f772668862696af8b917a (diff)
downloadninja-bdc39718cacad2eab10a7d031ea10fda13c92a03.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts: js/controllers/document-controller.js
Diffstat (limited to 'js/panels/Timeline/Tween.reel/Tween.html')
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.html16
1 files changed, 6 insertions, 10 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.html b/js/panels/Timeline/Tween.reel/Tween.html
index 307dcd02..b5353b1b 100644
--- a/js/panels/Timeline/Tween.reel/Tween.html
+++ b/js/panels/Timeline/Tween.reel/Tween.html
@@ -11,8 +11,7 @@
11 "properties": { 11 "properties": {
12 "element": {"#": "tweenspace"}, 12 "element": {"#": "tweenspace"},
13 "keyframe": {"@": "keyframe"}, 13 "keyframe": {"@": "keyframe"},
14 "span": {"@": "span"}, 14 "tweenspan": {"@": "span"}
15 "tweencontainer": {"#": "tweencontainer"}
16 } 15 }
17 }, 16 },
18 17
@@ -28,8 +27,7 @@
28 "module": "js/panels/Timeline/Keyframe.reel", 27 "module": "js/panels/Timeline/Keyframe.reel",
29 "name": "Keyframe", 28 "name": "Keyframe",
30 "properties": { 29 "properties": {
31 "element": {"#": "keyframe_container"}, 30 "element": {"#": "keyframe_container"}
32 "containingSpan": {"@": "span"}
33 } 31 }
34 } 32 }
35 } 33 }
@@ -37,12 +35,10 @@
37 </head> 35 </head>
38 <body> 36 <body>
39 37
40 <div id="tweenspace"> 38 <div id="tweenspace" class="tween_container">
41 <div id="tweencontainer" class="tween_container"> 39 <div id="span_container"></div>
42 <div id="span_container"></div> 40 <div id="keyframe_container"></div>
43 <div id="keyframe_container"></div> 41 </div>
44 </div>
45 </div>
46 42
47 </body> 43 </body>
48</html> \ No newline at end of file 44</html> \ No newline at end of file