diff options
| author | hwc487 | 2012-04-04 16:32:53 -0700 |
|---|---|---|
| committer | hwc487 | 2012-04-04 16:32:53 -0700 |
| commit | 6ee8b65742fbe61b4429dc8c7dc9ca33a3e43600 (patch) | |
| tree | f267e05f623ed90d1cc841b8c79a338d6d8e807c /js/components | |
| parent | 16f62ca09cc428043e8fef8bdeea11a989e62bc0 (diff) | |
| parent | 17ca01f54591187f5c0812c0fd2cb7260afa9639 (diff) | |
| download | ninja-6ee8b65742fbe61b4429dc8c7dc9ca33a3e43600.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping
Conflicts:
js/panels/presets/animations-presets.reel/animations-presets.js
js/panels/presets/style-presets.reel/style-presets.js
js/panels/presets/transitions-presets.reel/transitions-presets.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; |