diff options
author | Eric Guzman | 2012-02-29 16:13:19 -0800 |
---|---|---|
committer | Eric Guzman | 2012-02-29 16:13:19 -0800 |
commit | 53bdb1e7773069c4cca59e88d6da91cd0f58c94a (patch) | |
tree | 44a2147fcbb43ea483f78a1e2e082919f9c81970 /js/panels/Panel.reel/Panel.html | |
parent | b2c60efb9c6f5dfa7b0fc5c2b9feebebc805ed97 (diff) | |
parent | b09956e4a9a35c5588cc7cd1f01efb617cbe0884 (diff) | |
download | ninja-53bdb1e7773069c4cca59e88d6da91cd0f58c94a.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
Diffstat (limited to 'js/panels/Panel.reel/Panel.html')
-rwxr-xr-x | js/panels/Panel.reel/Panel.html | 12 |
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> |