diff options
author | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
commit | 9f32d7e5454db3189209fc68a286a7fdb0c31fe8 (patch) | |
tree | a51c2bf67839a25158c30752b44fdea0eac28b9d /node_modules/montage/ui/range-input.reel | |
parent | dc1e8dde18c40cf740bd2fe09165784e0d415fab (diff) | |
parent | 6d33345a9e609e36539d2efa25569f5eeb04a2af (diff) | |
download | ninja-9f32d7e5454db3189209fc68a286a7fdb0c31fe8.tar.gz |
Merge branch 'master' into pentool
Conflicts:
js/helper-classes/3D/view-utils.js
Diffstat (limited to 'node_modules/montage/ui/range-input.reel')
-rw-r--r-- | node_modules/montage/ui/range-input.reel/range-input.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/node_modules/montage/ui/range-input.reel/range-input.js b/node_modules/montage/ui/range-input.reel/range-input.js index e97c2de9..159cddf3 100644 --- a/node_modules/montage/ui/range-input.reel/range-input.js +++ b/node_modules/montage/ui/range-input.reel/range-input.js | |||
@@ -18,13 +18,13 @@ var RangeInput = exports.RangeInput = Montage.create(TextInput, { | |||
18 | var pressComposer = PressComposer.create(); | 18 | var pressComposer = PressComposer.create(); |
19 | pressComposer.delegate = this; | 19 | pressComposer.delegate = this; |
20 | this.addComposer(pressComposer); | 20 | this.addComposer(pressComposer); |
21 | pressComposer.addEventListener("pressstart", this, false); | 21 | pressComposer.addEventListener("pressStart", this, false); |
22 | pressComposer.addEventListener("press", this, false); | 22 | pressComposer.addEventListener("press", this, false); |
23 | pressComposer.addEventListener("presscancel", this, false); | 23 | pressComposer.addEventListener("pressCancel", this, false); |
24 | } | 24 | } |
25 | }, | 25 | }, |
26 | 26 | ||
27 | handlePressstart: { | 27 | handlePressStart: { |
28 | value: function(e) { | 28 | value: function(e) { |
29 | var interactionStartEvent = document.createEvent("CustomEvent"); | 29 | var interactionStartEvent = document.createEvent("CustomEvent"); |
30 | interactionStartEvent.initCustomEvent("montage_range_interaction_start", true, true, null); | 30 | interactionStartEvent.initCustomEvent("montage_range_interaction_start", true, true, null); |