diff options
| author | John Mayhew | 2012-04-04 14:41:16 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-04-04 14:41:16 -0700 |
| commit | 7249d6377c8897b2f9d8115be99717be971a0981 (patch) | |
| tree | 9415f5ba25ad643df678e561719d2708fd3ead5a /js/components | |
| parent | ebdfa77a5399d245ddf134ee8110b2d046922a71 (diff) | |
| parent | 8482e23cd9b8c4700b5130f2588e5eb24d376536 (diff) | |
| download | ninja-7249d6377c8897b2f9d8115be99717be971a0981.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/lib/drawing/world.js
Diffstat (limited to 'js/components')
| -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; |