diff options
author | Eric Guzman | 2012-02-22 23:19:45 -0800 |
---|---|---|
committer | Eric Guzman | 2012-02-22 23:19:45 -0800 |
commit | 9e8cd4448a6d0f809a55c3bdea8b45ed75339794 (patch) | |
tree | c7b5105153f17aedecd0669c611dbea44be7374c /js/components/layout/subtool-button.reel | |
parent | a5ee11857f923d3e49b44c0a8c480e9d0b026d5b (diff) | |
parent | 2afef244a3f8124f8a049e504e9782c05904ce23 (diff) | |
download | ninja-9e8cd4448a6d0f809a55c3bdea8b45ed75339794.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/components/layout/subtool-button.reel')
-rwxr-xr-x | js/components/layout/subtool-button.reel/subtool-button.html | 7 | ||||
-rwxr-xr-x | js/components/layout/subtool-button.reel/subtool-button.js | 10 |
2 files changed, 5 insertions, 12 deletions
diff --git a/js/components/layout/subtool-button.reel/subtool-button.html b/js/components/layout/subtool-button.reel/subtool-button.html index 9dad007d..24fce57c 100755 --- a/js/components/layout/subtool-button.reel/subtool-button.html +++ b/js/components/layout/subtool-button.reel/subtool-button.html | |||
@@ -16,8 +16,7 @@ | |||
16 | "module": "js/components/layout/subtool-button.reel", | 16 | "module": "js/components/layout/subtool-button.reel", |
17 | "name": "SubToolButton", | 17 | "name": "SubToolButton", |
18 | "properties": { | 18 | "properties": { |
19 | "element": {"#": "buttonBackground"}, | 19 | "element": {"#": "toolButton"} |
20 | "button": {"#": "toolBarButton"} | ||
21 | } | 20 | } |
22 | } | 21 | } |
23 | } | 22 | } |
@@ -26,9 +25,7 @@ | |||
26 | </head> | 25 | </head> |
27 | 26 | ||
28 | <body> | 27 | <body> |
29 | <div id="buttonBackground" class="buttonBackground"> | 28 | <div id="toolButton" class="toolbutton"></div> |
30 | <div id="toolBarButton" class="buttonBackground"></div> | ||
31 | </div> | ||
32 | </body> | 29 | </body> |
33 | 30 | ||
34 | </html> | 31 | </html> |
diff --git a/js/components/layout/subtool-button.reel/subtool-button.js b/js/components/layout/subtool-button.reel/subtool-button.js index d1adca43..2b066f24 100755 --- a/js/components/layout/subtool-button.reel/subtool-button.js +++ b/js/components/layout/subtool-button.reel/subtool-button.js | |||
@@ -35,7 +35,7 @@ exports.SubToolButton = Montage.create(Component, { | |||
35 | boundObjectPropertyPath: "selected", | 35 | boundObjectPropertyPath: "selected", |
36 | oneway: false | 36 | oneway: false |
37 | }); | 37 | }); |
38 | 38 | this.element.classList.add(this.data.id); | |
39 | } | 39 | } |
40 | }, | 40 | }, |
41 | 41 | ||
@@ -43,13 +43,9 @@ exports.SubToolButton = Montage.create(Component, { | |||
43 | enumerable: false, | 43 | enumerable: false, |
44 | value: function() { | 44 | value: function() { |
45 | if(this._selected) { | 45 | if(this._selected) { |
46 | this.element.classList.add( "buttonSelected" ); | 46 | this.element.classList.add("active"); |
47 | this.button.classList.remove( this.data.id + "Unpressed" ); | ||
48 | this.button.classList.add( this.data.id + "Pressed" ); | ||
49 | } else { | 47 | } else { |
50 | this.element.classList.remove( "buttonSelected" ); | 48 | this.element.classList.remove("active"); |
51 | this.button.classList.remove( this.data.id + "Pressed" ); | ||
52 | this.button.classList.add( this.data.id + "Unpressed" ); | ||
53 | } | 49 | } |
54 | } | 50 | } |
55 | }, | 51 | }, |