diff options
author | Eric Guzman | 2012-04-04 11:36:22 -0700 |
---|---|---|
committer | Eric Guzman | 2012-04-04 11:36:22 -0700 |
commit | af52148777d554dc6e55a736574b82e4916f1fea (patch) | |
tree | 39705d138b489d2e90722238c850320fd6b6a8e9 /js/components/SliderBase.js | |
parent | b7ca1821ad43403a2a54361ffc6a0cdf9cba0e59 (diff) | |
parent | a11ef2eed7049835c8bdfa50a2b893632c46eaa0 (diff) | |
download | ninja-af52148777d554dc6e55a736574b82e4916f1fea.tar.gz |
Merge branch 'refs/heads/master' into PresetsPI
Conflicts:
js/controllers/presets-controller.js
Diffstat (limited to 'js/components/SliderBase.js')
-rwxr-xr-x | js/components/SliderBase.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/components/SliderBase.js b/js/components/SliderBase.js index 9f007456..8df868a2 100755 --- a/js/components/SliderBase.js +++ b/js/components/SliderBase.js | |||
@@ -268,7 +268,6 @@ var SliderBase = exports.SliderBase = Montage.create(Component, { | |||
268 | 268 | ||
269 | _dispatchActionEvent: { | 269 | _dispatchActionEvent: { |
270 | value: function() { | 270 | value: function() { |
271 | // console.log("dispatching event", this._element.id, this._eventType, this._wasSetByCode); | ||
272 | var actionEvent = document.createEvent("CustomEvent"); | 271 | var actionEvent = document.createEvent("CustomEvent"); |
273 | actionEvent.initEvent(this._eventType, true, true); | 272 | actionEvent.initEvent(this._eventType, true, true); |
274 | actionEvent.type = this._eventType; | 273 | actionEvent.type = this._eventType; |