aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout
diff options
context:
space:
mode:
Diffstat (limited to 'js/components/layout')
-rw-r--r--js/components/layout/subtool-button.reel/subtool-button.html7
-rw-r--r--js/components/layout/subtool-button.reel/subtool-button.js10
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 100644
--- 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 100644
--- 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 },