diff options
author | Eric Guzman | 2012-06-19 01:20:36 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-19 01:20:36 -0700 |
commit | 2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch) | |
tree | f69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/components/layout/bread-crumb.reel/bread-crumb.html | |
parent | 5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff) | |
parent | 1007cbf983ad0f2460a4122a492a96023fdb4439 (diff) | |
download | ninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts:
js/stage/binding-view.reel/binding-view.js
Diffstat (limited to 'js/components/layout/bread-crumb.reel/bread-crumb.html')
-rwxr-xr-x | js/components/layout/bread-crumb.reel/bread-crumb.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html index 0dabc781..68f3be2b 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.html +++ b/js/components/layout/bread-crumb.reel/bread-crumb.html | |||
@@ -40,7 +40,7 @@ | |||
40 | "buttonsListController": { | 40 | "buttonsListController": { |
41 | "prototype": "montage/ui/controller/array-controller", | 41 | "prototype": "montage/ui/controller/array-controller", |
42 | "bindings": { | 42 | "bindings": { |
43 | "content": {"<<->": "@owner.containerElements"} | 43 | "content": {"<->": "@owner.containerElements"} |
44 | } | 44 | } |
45 | }, | 45 | }, |
46 | 46 | ||