Merge branch 'master' into pentool

Conflicts:
	js/helper-classes/3D/view-utils.js

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, {
             var pressComposer = PressComposer.create();
             pressComposer.delegate = this;
             this.addComposer(pressComposer);
-            pressComposer.addEventListener("pressstart", this, false);
+            pressComposer.addEventListener("pressStart", this, false);
             pressComposer.addEventListener("press", this, false);
-            pressComposer.addEventListener("presscancel", this, false);
+            pressComposer.addEventListener("pressCancel", this, false);
         }
     },
 
-    handlePressstart: {
+    handlePressStart: {
         value: function(e) {
             var interactionStartEvent = document.createEvent("CustomEvent");
             interactionStartEvent.initCustomEvent("montage_range_interaction_start", true, true, null);