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 /node_modules/montage/ui/button.reel/button.js | |
| 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 'node_modules/montage/ui/button.reel/button.js')
| -rw-r--r-- | node_modules/montage/ui/button.reel/button.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage/ui/button.reel/button.js b/node_modules/montage/ui/button.reel/button.js index 9f1342f6..91b6304d 100644 --- a/node_modules/montage/ui/button.reel/button.js +++ b/node_modules/montage/ui/button.reel/button.js | |||
| @@ -32,7 +32,7 @@ b1.addEventListener("action", function(event) { | |||
| 32 | <caption>Serialized example</caption> | 32 | <caption>Serialized example</caption> |
| 33 | { | 33 | { |
| 34 | "aButton": { | 34 | "aButton": { |
| 35 | "prototype": "montage/ui/button.reel", | 35 | "prototype": "ui/button.reel", |
| 36 | "properties": { | 36 | "properties": { |
| 37 | "element": {"#": "btnElement"} | 37 | "element": {"#": "btnElement"} |
| 38 | }, | 38 | }, |