diff options
| author | Jonathan Duran | 2012-04-04 11:21:46 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-04-04 11:21:46 -0700 |
| commit | 04ca16276e73dbd238b42fd898f8b3cccc730f18 (patch) | |
| tree | 95aee6605f1018550875812166d292554830d7ca /js/components | |
| parent | 61404b1965ffe7011ec86953f853f0954ccc308d (diff) | |
| parent | a11ef2eed7049835c8bdfa50a2b893632c46eaa0 (diff) | |
| download | ninja-04ca16276e73dbd238b42fd898f8b3cccc730f18.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/tools/SelectionTool.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
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; |