aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/subtool-button.reel/subtool-button.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-22 16:40:03 -0800
committerValerio Virgillito2012-02-22 16:40:03 -0800
commitf8e491fe81981c95fb1352a21d1f99cc375f240e (patch)
tree4b8c49cf9a3317154aeff29c72ac888c187df09a /js/components/layout/subtool-button.reel/subtool-button.js
parent91f6f672ee96c6e7e942b555af7057d6db52d90f (diff)
parent2afef244a3f8124f8a049e504e9782c05904ce23 (diff)
downloadninja-f8e491fe81981c95fb1352a21d1f99cc375f240e.tar.gz
Merge branch 'refs/heads/master' into file-io
Diffstat (limited to 'js/components/layout/subtool-button.reel/subtool-button.js')
-rwxr-xr-xjs/components/layout/subtool-button.reel/subtool-button.js10
1 files changed, 3 insertions, 7 deletions
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 },