integrating the latest montage version

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 347 insertions, 294 deletions

diff --git a/node_modules/montage/ui/composer/translate-composer.js b/node_modules/montage/ui/composer/translate-composer.js
index 6e762af9..86e6fb09 100644
--- a/node_modules/montage/ui/composer/translate-composer.js
+++ b/node_modules/montage/ui/composer/translate-composer.js
@@ -3,19 +3,24 @@
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
+ /*global require,exports */
 /**
     @module montage/ui/composer/translate-composer
-    @requires montage
+    @requires montage/core/core
     @requires montage/ui/composer/composer
 */
 var Montage = require("montage").Montage,
     Composer = require("ui/composer/composer").Composer,
     defaultEventManager = require("core/event/event-manager").defaultEventManager;
 /**
+    Provides translateX and translateY properties that are updated when the
+    user clicks/touches and drags on the given element. Should be used wherever
+    a user interacts with an element by dragging it.
+
     @class module:montage/ui/composer/translate-composer.TranslateComposer
     @extends module:montage/ui/composer/composer.Composer
 */
-var TranslateComposer = exports.TranslateComposer = Montage.create(Composer,/** @lends module:montage/ui/event/composer/translate-composer.TranslateComposer# */ {
+var TranslateComposer = exports.TranslateComposer = Montage.create(Composer,/** @lends module:montage/ui/composer/translate-composer.TranslateComposer# */ {
 
     /**
     These elements perform some native action when clicked/touched and so we
@@ -53,11 +58,16 @@ var TranslateComposer = exports.TranslateComposer = Montage.create(Composer,/**
         value: 1
     },
 
+    /**
+        How many pixels to translate by for each pixel of cursor movement.
+        @type {Number}
+        @default 1
+    */
     pointerSpeedMultiplier: {
-        get: function () {
+        get: function() {
             return this._pointerSpeedMultiplier;
         },
-        set: function (value) {
+        set: function(value) {
             this._pointerSpeedMultiplier = value;
         }
     },
@@ -76,33 +86,59 @@ var TranslateComposer = exports.TranslateComposer = Montage.create(Composer,/**
         value: false
     },
 
+    _allowFloats: {
+        enumerable: false,
+        value: false
+    },
+    /**
+        Allow (@link translateX} and {@link translateY} to be floats.
+        @type {Boolean}
+        @default false
+    */
+    allowFloats: {
+        get: function() {
+            return this._allowFloats;
+        },
+        set: function(value) {
+            if (this._allowFloats !== value) {
+                this._allowFloats = value;
+                this.translateX = this._translateX;
+                this.translateY = this._translateY;
+            }
+        }
+    },
+
     _translateX: {
         enumerable: false,
         value: 0
     },
-
+    /**
+        Amount of translation in the X (left/right) direction. Can be inverted with
+        {@link invertXAxis}, and restricted to a range with
+        {@link minTranslateX} and {@link maxTranslateX}.
+        @type {Number}
+        @default 0
+    */
     translateX: {
-        get: function () {
+        get: function() {
             return this._translateX;
         },
-        set: function (value) {
-            if (this._axis==="vertical") {
-                this._translateX=0;
+        set: function(value) {
+            if (this._axis === "vertical") {
+                this._translateX = this._minTranslateX || 0;
             } else {
-                var tmp=isNaN(value)?0:value>>0;
+                var tmp = isNaN(value) ? 0 : this._allowFloats ? parseFloat(value) : value >> 0;
 
-                if ((!this._hasBouncing)||(!this._isSelfUpdate)) {
-                    if (tmp<0) {
-                        tmp=0;
-                    }
-                    if (tmp>this._maxTranslateX) {
-                        tmp=this._maxTranslateX;
-                    }
-                    if (!this._isSelfUpdate) {
-                        this.isAnimating = false;
-                    }
+                if (this._minTranslateX !== null && tmp < this._minTranslateX) {
+                    tmp = this._minTranslateX;
                 }
-                this._translateX=tmp;
+                if (this._maxTranslateX !== null && tmp > this._maxTranslateX) {
+                    tmp = this._maxTranslateX;
+                }
+                if (!this._isSelfUpdate) {
+                    this.isAnimating = false;
+                }
+                this._translateX = tmp;
             }
         }
     },
@@ -111,77 +147,143 @@ var TranslateComposer = exports.TranslateComposer = Montage.create(Composer,/**
         enumerable: false,
         value: 0
     },
-
+    /**
+        Amount of translation in the Y (up/down) direction. Can be inverted with
+        {@link invertYAxis}, and restricted to a range with
+        {@link minTranslateY} and {@link maxTranslateY}.
+        @type {Number}
+        @default 0
+    */
     translateY: {
-        get: function () {
+        get: function() {
             return this._translateY;
         },
-        set: function (value) {
-            if (this._axis==="horizontal") {
-                this._translateY=0;
+        set: function(value) {
+            if (this._axis === "horizontal") {
+                this._translateY = this._minTranslateY || 0;
             } else {
-                var tmp=isNaN(value)?0:value>>0;
+                var tmp = isNaN(value) ? 0 : this._allowFloats ? parseFloat(value) : value >> 0;
 
-                if ((!this._hasBouncing)||(!this._isSelfUpdate)) {
-                    if (tmp<0) {
-                        tmp=0;
-                    }
-                    if (tmp>this._maxTranslateY) {
-                        tmp=this._maxTranslateY;
-                    }
-                    if (!this._isSelfUpdate) {
-                        this.isAnimating = false;
-                    }
+                if (this._minTranslateY !== null && tmp < this._minTranslateY) {
+                    tmp = this._minTranslateY;
+                }
+                if (this._maxTranslateY !== null && tmp > this._maxTranslateY) {
+                    tmp = this._maxTranslateY;
                 }
-                this._translateY=tmp;
+                if (!this._isSelfUpdate) {
+                    this.isAnimating = false;
+                }
+                this._translateY = tmp;
             }
         }
     },
 
-    _maxTranslateX: {
+    _minTranslateX: {
         enumerable: false,
-        value: 0
+        value: null
     },
+    /**
+        The minimum value {@link translateX} can take. If set to null then
+        there is no minimum.
+        @type {number|null}
+        @default null
+    */
+    minTrans