diff options
author | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
commit | 2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch) | |
tree | d352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /js/panels/Panel.reel/Panel.html | |
parent | 244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff) | |
parent | c59eb371559a3061ce53223e249ca97daace5968 (diff) | |
download | ninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/document/document-html.js
js/document/templates/app/main.js
js/panels/Panel.reel/Panel.js
node_modules/montage/ui/native-control.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/Panel.reel/Panel.html')
-rwxr-xr-x | js/panels/Panel.reel/Panel.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/panels/Panel.reel/Panel.html b/js/panels/Panel.reel/Panel.html index f0fb1044..5937b58f 100755 --- a/js/panels/Panel.reel/Panel.html +++ b/js/panels/Panel.reel/Panel.html | |||
@@ -75,7 +75,6 @@ | |||
75 | "prototype": "montage/ui/button.reel", | 75 | "prototype": "montage/ui/button.reel", |
76 | "properties": { | 76 | "properties": { |
77 | "element": {"#": "btnClose"}, | 77 | "element": {"#": "btnClose"}, |
78 | "pressedClass": "hide", | ||
79 | "identifier": "btnClose" | 78 | "identifier": "btnClose" |
80 | }, | 79 | }, |
81 | "listeners": [ | 80 | "listeners": [ |