aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Panel.reel/Panel.html
diff options
context:
space:
mode:
authorJon Reid2012-02-27 12:08:17 -0800
committerJon Reid2012-02-27 12:08:17 -0800
commitd55224f36da55e26c266a02efa6e58d4ecf1253e (patch)
tree36faa8ff93c0f7b925f5c0a7fb85b5d209da1f8e /js/panels/Panel.reel/Panel.html
parentec5f81c6c0ccf865505ab82ebf9240c667f05c91 (diff)
parentcf9e9b711ba3d77a2a0888f8ab763383f53a1619 (diff)
downloadninja-d55224f36da55e26c266a02efa6e58d4ecf1253e.tar.gz
Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-local
Diffstat (limited to 'js/panels/Panel.reel/Panel.html')
-rwxr-xr-xjs/panels/Panel.reel/Panel.html12
1 files changed, 10 insertions, 2 deletions
diff --git a/js/panels/Panel.reel/Panel.html b/js/panels/Panel.reel/Panel.html
index dc76d871..7556952c 100755
--- a/js/panels/Panel.reel/Panel.html
+++ b/js/panels/Panel.reel/Panel.html
@@ -14,7 +14,15 @@
14 "properties": { 14 "properties": {
15 "element": {"#": "resizeBar"}, 15 "element": {"#": "resizeBar"},
16 "panel": {"#": "panel"}, 16 "panel": {"#": "panel"},
17 "isVertical": true 17 "isVertical": true,
18 "willSave": false
19 },
20 "bindings": {
21 "ownerId": {
22 "boundObject": {"@": "owner"},
23 "boundObjectPropertyPath": "panelBase.panelName",
24 "oneway": true
25 }
18 } 26 }
19 }, 27 },
20 28
@@ -55,7 +63,7 @@
55 </div> 63 </div>
56 </div> 64 </div>
57 </div> 65 </div>
58 <div id="resizeBar" class="resizeBar"></div> 66 <div data-montage-id="resizeBar" class="resizeBar"></div>
59</article> 67</article>
60 68
61</body> 69</body>