aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Panel.reel/Panel.html
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-28 14:01:05 -0800
committerPushkar Joshi2012-02-28 14:01:05 -0800
commit63307c9abf120985d979a40a53a0598d3f0d5c5a (patch)
tree57d9cffd7aa0959ea31fe0fa2d89a9080198bcb3 /js/panels/Panel.reel/Panel.html
parente1a65d0c2a13e12ee53be98c731616e35aa07a41 (diff)
parent7c9291a5bab4abd849547f8878f6fb962fc88250 (diff)
downloadninja-63307c9abf120985d979a40a53a0598d3f0d5c5a.tar.gz
Merge branch 'master' into pentool
Conflicts: manifest.json
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>