aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/tool-button.reel
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-15 17:04:39 -0800
committerValerio Virgillito2012-02-15 17:04:39 -0800
commitfe71cb9aa1700199c0089166ad54fc56eb760644 (patch)
treeb0c7c24b1f45a079e1c09312ca716e3d35aecad4 /js/components/layout/tool-button.reel
parent747616980cad14f0b65fbcc7f497ed9680a39d29 (diff)
parentd366c0bd1af6471511217ed574083e15059519b5 (diff)
downloadninja-fe71cb9aa1700199c0089166ad54fc56eb760644.tar.gz
Merge branch 'refs/heads/master' into components
Diffstat (limited to 'js/components/layout/tool-button.reel')
-rwxr-xr-x[-rw-r--r--]js/components/layout/tool-button.reel/tool-button.css0
-rwxr-xr-x[-rw-r--r--]js/components/layout/tool-button.reel/tool-button.html0
-rwxr-xr-x[-rw-r--r--]js/components/layout/tool-button.reel/tool-button.js2
3 files changed, 1 insertions, 1 deletions
diff --git a/js/components/layout/tool-button.reel/tool-button.css b/js/components/layout/tool-button.reel/tool-button.css
index 46152424..46152424 100644..100755
--- a/js/components/layout/tool-button.reel/tool-button.css
+++ b/js/components/layout/tool-button.reel/tool-button.css
diff --git a/js/components/layout/tool-button.reel/tool-button.html b/js/components/layout/tool-button.reel/tool-button.html
index 81a9b927..81a9b927 100644..100755
--- a/js/components/layout/tool-button.reel/tool-button.html
+++ b/js/components/layout/tool-button.reel/tool-button.html
diff --git a/js/components/layout/tool-button.reel/tool-button.js b/js/components/layout/tool-button.reel/tool-button.js
index 509512d0..72f46830 100644..100755
--- a/js/components/layout/tool-button.reel/tool-button.js
+++ b/js/components/layout/tool-button.reel/tool-button.js
@@ -42,7 +42,7 @@ exports.ToolButton = Montage.create(Component, {
42 }, 42 },
43 43
44 _currentSubSelected: { value: 0}, 44 _currentSubSelected: { value: 0},
45 45
46 prepareForDraw: { 46 prepareForDraw: {
47 enumerable: false, 47 enumerable: false,
48 value: function() { 48 value: function() {