diff options
| author | Jon Reid | 2012-06-15 10:10:41 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-15 10:10:41 -0700 |
| commit | 526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch) | |
| tree | 65939e59615aaa10a7db77211e71616ad531bd0e /js/panels/Panel.reel/Panel.html | |
| parent | b5b760ee82e5cc4da176914983a6002cbf86c11a (diff) | |
| parent | 5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff) | |
| download | ninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz | |
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
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": [ |