aboutsummaryrefslogtreecommitdiff
path: root/js/components/SliderBase.js
diff options
context:
space:
mode:
authorhwc4872012-07-09 16:08:02 -0700
committerhwc4872012-07-09 16:08:02 -0700
commit5085d0f67df89a21715308956004164597a6ba79 (patch)
tree2c896163143a66331205a39b0a3b1b45d51bf12a /js/components/SliderBase.js
parent51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
downloadninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts: js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/components/SliderBase.js')
-rwxr-xr-xjs/components/SliderBase.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/SliderBase.js b/js/components/SliderBase.js
index 5a12fcb6..30bba8de 100755
--- a/js/components/SliderBase.js
+++ b/js/components/SliderBase.js
@@ -88,7 +88,7 @@ var SliderBase = exports.SliderBase = Montage.create(Component, {
88 if(this._enabled) 88 if(this._enabled)
89 { 89 {
90 this.element.classList.remove("disabled"); 90 this.element.classList.remove("disabled");
91 91
92 this.element.addEventListener("blur", this); 92 this.element.addEventListener("blur", this);
93 this.element.addEventListener("focus", this); 93 this.element.addEventListener("focus", this);
94 94