aboutsummaryrefslogtreecommitdiff
path: root/js/components
diff options
context:
space:
mode:
authorPushkar Joshi2012-04-04 15:55:48 -0700
committerPushkar Joshi2012-04-04 15:55:48 -0700
commit0681b34b506767b6caf2816b9096bc1a57a17a2d (patch)
tree20f10c767efe8d9c5c38fbc2cdb713d093bb279d /js/components
parentf4eccf3e7cb76a14a3546a646575162dbd831538 (diff)
parent8482e23cd9b8c4700b5130f2588e5eb24d376536 (diff)
downloadninja-0681b34b506767b6caf2816b9096bc1a57a17a2d.tar.gz
Merge branch 'master' into pentool
Conflicts: js/tools/PenTool.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;