diff options
author | Eric Guzman | 2012-06-08 15:57:37 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-08 15:57:37 -0700 |
commit | 99f14c2998760a0d871745d41c6e3419c8137d91 (patch) | |
tree | 9e8a15334538e54830eb290465e7585bc62feeb8 | |
parent | d7e39dd2ff310b9f05676b7de49756036ab03514 (diff) | |
download | ninja-99f14c2998760a0d871745d41c6e3419c8137d91.tar.gz |
Binding Panel - Add toolbar
-rw-r--r-- | js/panels/binding-panel.reel/binding-panel.css | 6 | ||||
-rw-r--r-- | js/panels/binding-panel.reel/binding-panel.html | 18 | ||||
-rw-r--r-- | js/panels/binding-panel.reel/binding-panel.js | 1 |
3 files changed, 24 insertions, 1 deletions
diff --git a/js/panels/binding-panel.reel/binding-panel.css b/js/panels/binding-panel.reel/binding-panel.css index e3dcf140..97b6ac91 100644 --- a/js/panels/binding-panel.reel/binding-panel.css +++ b/js/panels/binding-panel.reel/binding-panel.css | |||
@@ -7,9 +7,15 @@ | |||
7 | .binding-panel { | 7 | .binding-panel { |
8 | position: relative; | 8 | position: relative; |
9 | height: 100%; | 9 | height: 100%; |
10 | display: -webkit-box; | ||
11 | -webkit-box-orient: vertical; | ||
10 | } | 12 | } |
11 | 13 | ||
12 | .bindings-list { | 14 | .bindings-list { |
15 | -webkit-box-flex: 1; | ||
13 | padding: 0; | 16 | padding: 0; |
14 | margin: 0; | 17 | margin: 0; |
15 | } | 18 | } |
19 | .binding-panel-toolbar-container { | ||
20 | -webkit-box-flex: 0; | ||
21 | } | ||
diff --git a/js/panels/binding-panel.reel/binding-panel.html b/js/panels/binding-panel.reel/binding-panel.html index a926da8d..9a2834c7 100644 --- a/js/panels/binding-panel.reel/binding-panel.html +++ b/js/panels/binding-panel.reel/binding-panel.html | |||
@@ -36,6 +36,7 @@ | |||
36 | "element": {"#": "binding-item"} | 36 | "element": {"#": "binding-item"} |
37 | }, | 37 | }, |
38 | "bindings": { | 38 | "bindings": { |
39 | "bindingArgs": {"<-": "@repetition.objectAtCurrentIteration"}, | ||
39 | "sourceObjectPropertyPath": {"<-": "@repetition.objectAtCurrentIteration.sourceObjectPropertyPath"}, | 40 | "sourceObjectPropertyPath": {"<-": "@repetition.objectAtCurrentIteration.sourceObjectPropertyPath"}, |
40 | "sourceObject": {"<-": "@repetition.objectAtCurrentIteration.sourceObject"}, | 41 | "sourceObject": {"<-": "@repetition.objectAtCurrentIteration.sourceObject"}, |
41 | "boundObjectPropertyPath": {"<-": "@repetition.objectAtCurrentIteration.boundObjectPropertyPath"}, | 42 | "boundObjectPropertyPath": {"<-": "@repetition.objectAtCurrentIteration.boundObjectPropertyPath"}, |
@@ -48,8 +49,20 @@ | |||
48 | "properties": { | 49 | "properties": { |
49 | "element": {"#": "edit-binding-view" } | 50 | "element": {"#": "edit-binding-view" } |
50 | } | 51 | } |
52 | }, | ||
53 | "toolbar": { | ||
54 | "prototype": "js/components/toolbar.reel", | ||
55 | "properties": { | ||
56 | "element": {"#": "binding-panel-toolbar"}, | ||
57 | "delegate": {"@": "owner" }, | ||
58 | "buttons": [ | ||
59 | { | ||
60 | "title": "Add", | ||
61 | "identifier": "add" | ||
62 | } | ||
63 | ] | ||
64 | } | ||
51 | } | 65 | } |
52 | |||
53 | } | 66 | } |
54 | </script> | 67 | </script> |
55 | </head> | 68 | </head> |
@@ -58,6 +71,9 @@ | |||
58 | <ul data-montage-id="bindings-list" class="bindings-list"> | 71 | <ul data-montage-id="bindings-list" class="bindings-list"> |
59 | <li data-montage-id="binding-item" class="binding-item"></li> | 72 | <li data-montage-id="binding-item" class="binding-item"></li> |
60 | </ul> | 73 | </ul> |
74 | <div data-montage-id="binding-panel-toolbar-container" class="binding-panel-toolbar-container"> | ||
75 | <div data-montage-id="binding-panel-toolbar"></div> | ||
76 | </div> | ||
61 | <div data-montage-id="edit-binding-view" class="edit-binding-view"></div> | 77 | <div data-montage-id="edit-binding-view" class="edit-binding-view"></div> |
62 | </div> | 78 | </div> |
63 | </body> | 79 | </body> |
diff --git a/js/panels/binding-panel.reel/binding-panel.js b/js/panels/binding-panel.reel/binding-panel.js index c2ce556c..3b20a88f 100644 --- a/js/panels/binding-panel.reel/binding-panel.js +++ b/js/panels/binding-panel.reel/binding-panel.js | |||
@@ -24,6 +24,7 @@ exports.BindingPanel = Montage.create(Component, { | |||
24 | 24 | ||
25 | displayEditView : { | 25 | displayEditView : { |
26 | value: function(bindingArgs) { | 26 | value: function(bindingArgs) { |
27 | this.editView.bindingArgs = bindingArgs; | ||
27 | this.editing = true; | 28 | this.editing = true; |
28 | } | 29 | } |
29 | }, | 30 | }, |