1 files changed, 90 insertions, 43 deletions

diff --git a/node_modules/montage/ui/composer/translate-composer.js b/node_modules/montage/ui/composer/translate-composer.js
index 4ce165dc..6e762af9 100644
--- a/node_modules/montage/ui/composer/translate-composer.js
+++ b/node_modules/montage/ui/composer/translate-composer.js
@@ -4,7 +4,7 @@
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
 /**
-    @module montage/ui/composer/long-press-composer
+    @module montage/ui/composer/translate-composer
     @requires montage
     @requires montage/ui/composer/composer
 */
@@ -66,6 +66,11 @@ var TranslateComposer = exports.TranslateComposer = Montage.create(Composer,/**
         value: null
     },
 
+    _shouldDispatchTranslate: {
+        value: false,
+        enumerable: false
+    },
+
     _isSelfUpdate: {
         enumerable: false,
         value: false
@@ -203,7 +208,19 @@ var TranslateComposer = exports.TranslateComposer = Montage.create(Composer,/**
         }
     },
 
-    invertAxis: {value: null},
+    _invertAxis: {
+        value: false,
+        enumerable: false
+    },
+
+    invertAxis: {
+        get: function() {
+            return this._invertAxis;
+        },
+        set: function(value) {
+            this._invertAxis=value?true:false;
+        }
+    },
 
     _hasMomentum: {
         enumerable: false,
@@ -233,33 +250,34 @@ var TranslateComposer = exports.TranslateComposer = Montage.create(Composer,/**
         }
     },
 
-    _momentumDuration: {
+    __momentumDuration: {
         enumerable: false,
         value: 650
     },
 
-    momentumDuration: {
+    _momentumDuration: {
         get: function () {
-            return this._momentumDuration;
+            return this.__momentumDuration;
         },
         set: function (value) {
-            this._momentumDuration=isNaN(value)?1:value>>0;
-            if (this._momentumDuration<1) this._momentumDuration=1;
-        }
+            this.__momentumDuration=isNaN(value)?1:value>>0;
+            if (this.__momentumDuration<1) this.__momentumDuration=1;
+        },
+        enumerable: false
     },
 
-    _bouncingDuration: {
+    __bouncingDuration: {
         enumerable: false,
         value: 750
     },
 
-    bouncingDuration: {
+    _bouncingDuration: {
         get: function () {
-            return this._bouncingDuration;
+            return this.__bouncingDuration;
         },
         set: function (value) {
-            this._bouncingDuration=isNaN(value)?1:value>>0;
-            if (this._bouncingDuration<1) this._bouncingDuration=1;
+            this.__bouncingDuration=isNaN(value)?1:value>>0;
+            if (this.__bouncingDuration<1) this.__bouncingDuration=1;
         }
     },
 
@@ -538,38 +556,44 @@ var TranslateComposer = exports.TranslateComposer = Montage.create(Composer,/**
         value: function (event) {
             var self = this;
 
+            var oldTranslateY = this._translateY;
             this.translateY = this._translateY - (event.wheelDeltaY * 20) / 120;
             this._dispatchTranslateStart();
             window.clearTimeout(this._translateEndTimeout);
             this._translateEndTimeout = window.setTimeout(function () {
                 self._dispatchTranslateEnd();
             }, 400);
-            event.preventDefault();
+
+            // If we're not at one of the extremes (i.e. the scroll actully
+            // changed the translate) then we want to preventDefault to stop
+            // the page scrolling.
+            if (oldTranslateY !== this._translateY) {
+                event.preventDefault();
+            }
         }
     },
 
     _move: {
         enumerable: false,
         value: function (x, y) {
-
+            var pointerDelta;
             this._isSelfUpdate=true;
-            var delta;
             if (this._axis!="vertical") {
-                var delta = this.invertAxis ? (x-this._pointerX) : (this._pointerX-x);
+                pointerDelta = this._invertAxis ? (this._pointerX-x) : (x-this._pointerX);
                 if ((this._translateX<0)||(this._translateX>this._maxTranslateX)) {
-                    this.translateX+=(delta/2)*this._pointerSpeedMultiplier;
+                    this.translateX+=((pointerDelta)/2)*this._pointerSpeedMultiplier;
                 } else {
-                    this.translateX+=(delta)*this._pointerSpeedMultiplier;
+                    this.translateX+=(pointerDelta)*this._pointerSpeedMultiplier;
                 }
             }
             if (this._axis!="horizontal") {
+                pointerDelta = this._invertAxis ? (this._pointerY-y) : (y-this._pointerY);
                 if ((this._translateY<0)||(this._translateY>this._maxTranslateY)) {
-                    this.translateY+=((this._pointerY-y)/2)*this._pointerSpeedMultiplier;
+                    this.translateY+=((pointerDelta)/2)*this._pointerSpeedMultiplier;
                 } else {
-                    this.translateY+=(this._pointerY-y)*this._pointerSpeedMultiplier;
+                    this.translateY+=(pointerDelta)*this._pointerSpeedMultiplier;
                 }
             }
-
             this._isSelfUpdate=false;
             this._pointerX=x;
             this._pointerY=y;
@@ -577,6 +601,9 @@ var TranslateComposer = exports.TranslateComposer = Montage.create(Composer,/**
                 this._dispatchTranslateStart();
                 this._isFirstMove = false;
             }
+            if (this._shouldDispatchTranslate) {
+                this._dispatchTranslate();
+            }
         }
     },
 
@@ -627,6 +654,17 @@ var TranslateComposer = exports.TranslateComposer = Montage.create(Composer,/**
         }
     },
 
+    _dispatchTranslate: {
+        enumerable: false,
+        value: function() {
+            var translateEvent = document.createEvent("CustomEvent");
+            translateEvent.initCustomEvent("translate", true, true, null);
+            translateEvent.translateX = this._translateX;
+            translateEvent.translateY = this._translateY;
+            this.dispatchEvent(translateEvent);
+        }
+    },
+
 
     _end: {
         enumerable: false,
@@ -662,8 +700,8 @@ var TranslateComposer = exports.TranslateComposer = Montage.create(Composer,/**
                 } else {
                     momentumY=0;
                 }
-                endX=startX-(momentumX*this._momentumDuration/2000);
-                endY=startY-(momentumY*this._momentumDuration/2000);
+                endX=startX-(momentumX*this.__momentumDuration/2000);
+                endY=startY-(momentumY*this.__momentumDuration/2000);
                 animateMomentum=true;