diff options
| author | Pushkar Joshi | 2012-05-31 17:16:21 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-05-31 17:16:21 -0700 |
| commit | 8915a7109d918a2e69b0999ebaa2deb84811fef8 (patch) | |
| tree | 19a8af74c58c9ea261f0842f36efdab959be3256 /js/components/layout/tools-list.reel/tools-list.html | |
| parent | eea0a556e44c2b60d3aaf6e46d2432d3e6303812 (diff) | |
| parent | 06b609df1ff7833592faddbd8d7abb5b9f15a74d (diff) | |
| download | ninja-8915a7109d918a2e69b0999ebaa2deb84811fef8.tar.gz | |
Merge branch 'pentool' into brushtool
Diffstat (limited to 'js/components/layout/tools-list.reel/tools-list.html')
| -rwxr-xr-x | js/components/layout/tools-list.reel/tools-list.html | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html index d5c33624..df603bf8 100755 --- a/js/components/layout/tools-list.reel/tools-list.html +++ b/js/components/layout/tools-list.reel/tools-list.html | |||
| @@ -16,11 +16,7 @@ | |||
| 16 | "element": {"#": "toolbutton"} | 16 | "element": {"#": "toolbutton"} |
| 17 | }, | 17 | }, |
| 18 | "bindings": { | 18 | "bindings": { |
| 19 | "data": { | 19 | "data": {"<-": "@repetition1.objectAtCurrentIteration"} |
| 20 | "boundObject": {"@": "repetition1"}, | ||
| 21 | "boundObjectPropertyPath": "objectAtCurrentIteration", | ||
| 22 | "oneway": true | ||
| 23 | } | ||
| 24 | } | 20 | } |
| 25 | }, | 21 | }, |
| 26 | 22 | ||
| @@ -30,11 +26,7 @@ | |||
| 30 | "element": {"#": "groupLine"} | 26 | "element": {"#": "groupLine"} |
| 31 | }, | 27 | }, |
| 32 | "bindings": { | 28 | "bindings": { |
| 33 | "condition": { | 29 | "condition": {"<-": "@repetition1.objectAtCurrentIteration.lastInGroup"} |
| 34 | "boundObject": {"@": "repetition1"}, | ||
| 35 | "boundObjectPropertyPath": "objectAtCurrentIteration.lastInGroup", | ||
| 36 | "oneway": true | ||
| 37 | } | ||
| 38 | } | 30 | } |
| 39 | }, | 31 | }, |
| 40 | 32 | ||