aboutsummaryrefslogtreecommitdiff
path: root/js/components
diff options
context:
space:
mode:
authorEric Guzman2012-04-04 11:36:22 -0700
committerEric Guzman2012-04-04 11:36:22 -0700
commitaf52148777d554dc6e55a736574b82e4916f1fea (patch)
tree39705d138b489d2e90722238c850320fd6b6a8e9 /js/components
parentb7ca1821ad43403a2a54361ffc6a0cdf9cba0e59 (diff)
parenta11ef2eed7049835c8bdfa50a2b893632c46eaa0 (diff)
downloadninja-af52148777d554dc6e55a736574b82e4916f1fea.tar.gz
Merge branch 'refs/heads/master' into PresetsPI
Conflicts: js/controllers/presets-controller.js
Diffstat (limited to 'js/components')
-rwxr-xr-xjs/components/SliderBase.js1
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;