diff options
author | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
commit | 263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch) | |
tree | 7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /node_modules/montage/ui/button.reel/button.js | |
parent | 1bb2778224982aea7b9781c6559bb659983a400f (diff) | |
parent | a827f2769d75848c0ba0bff03a927c1f2706322b (diff) | |
download | ninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz |
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts:
js/panels/properties.reel/sections/position-size.reel/position-size.html
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
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 | }, |