From 2e04af953463643791f6362bd8ef4c6ba190abfa Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Wed, 18 Apr 2012 13:48:51 -0700
Subject: Squashed commit of the following:

commit 2054551bfb01a0f4ca2e138b9d724835462d45cd
Merge: 765c2da 616a853
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Wed Apr 18 13:48:21 2012 -0700

    Merge branch 'refs/heads/master' into integration

commit 765c2da8e1aa03550caf42b2bd5f367555ad2843
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Tue Apr 17 15:29:41 2012 -0700

    updating the picasa carousel

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

commit 9484f1c82b81e27edf2dc0a1bcc1fa3b12077406
Merge: d27f2df cacb4a2
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Tue Apr 17 15:03:50 2012 -0700

    Merge branch 'refs/heads/master' into integration

commit d27f2df4d846064444263d7832d213535962abe7
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Wed Apr 11 10:39:36 2012 -0700

    integrating new picasa carousel component

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

commit 6f98384c9ecbc8abe55ccfe1fc25a0c7ce22c493
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Tue Apr 10 14:33:00 2012 -0700

    fixed the text area case issue

    Text area was renamed from TextArea to Textarea

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

commit 1e83e26652266136802bc7af930379c1ecd631a6
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Mon Apr 9 22:10:45 2012 -0700

    integrating montage v0.8 into ninja.

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

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 node_modules/montage/ui/flow-path-lerp.js | 112 ------------------------------
 1 file changed, 112 deletions(-)
 delete mode 100644 node_modules/montage/ui/flow-path-lerp.js

(limited to 'node_modules/montage/ui/flow-path-lerp.js')

diff --git a/node_modules/montage/ui/flow-path-lerp.js b/node_modules/montage/ui/flow-path-lerp.js
deleted file mode 100644
index bc550500..00000000
--- a/node_modules/montage/ui/flow-path-lerp.js
+++ /dev/null
@@ -1,112 +0,0 @@
-/* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- 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> */
-
-var Montage = require("montage").Montage;
-
-var FlowPathLerp = exports.FlowPathLerp = Montage.create(Montage, {
-
-    _path1: {
-        enumerable: false,
-        value: null
-    },
-
-    _path2: {
-        enumerable: false,
-        value: null
-    },
-
-    _interpolant: {
-        enumerable: false,
-        value: 0
-    },
-
-    path1: {
-        get: function () {
-            return this._path1;
-        },
-        set: function (value) {
-            this._path1 = value;
-            this.resultPath = true;
-        }
-    },
-
-    path2: {
-        get: function () {
-            return this._path2;
-        },
-        set: function (value) {
-            this._path2 = value;
-            this.resultPath = true;
-        }
-    },
-
-    interpolant: {
-        get: function () {
-            return this._interpolant;
-        },
-        set: function (value) {
-            this._interpolant = value;
-            this.resultPath = true;
-        }
-    },
-
-    _resultPath: {
-        enumerable: false,
-        value: null
-    },
-
-    resultPath: {
-        get: function () {
-            return this._resultPath;
-        },
-        set: function () {
-            var self = this;
-
-            this._resultPath = {
-                value: function (slide) {
-                    var v1=self._path1.value(slide),
-                        v2=self._path2.value(slide),
-                        m1=1-self._interpolant,
-                        m2=self._interpolant,
-                        result={},
-                        i;
-
-                    for (i in v1) {
-                        if (v1.hasOwnProperty(i)&&(i!="style")) {
-                            if (v2.hasOwnProperty(i)) {
-                                if ((typeof v1[i]==="number")&&(typeof v2[i]==="number")) {
-                                    result[i]=v1[i]*m1+v2[i]*m2;
-                                } else {
-                                    result[i]=v1[i];
-                                }
-                            } else {
-                                result[i]=v1[i];
-                            }
-                        }
-                    }
-                    for (i in v2) {
-                        if (v2.hasOwnProperty(i)&&(i!="style")&&(!v1.hasOwnProperty(i))) {
-                            result[i]=v2[i];
-                        }
-                    }
-                    if (v1.style) {
-                        result.style={};
-                        for (i in v1.style) {
-                            if (v1.style.hasOwnProperty(i)) {
-                                if ((v2.style)&&(v2.style.hasOwnProperty(i))&&(typeof v1.style[i]==="number")&&(typeof v2.style[i]==="number")) {
-                                    result.style[i]=v1.style[i]*m1+v2.style[i]*m2;
-                                } else {
-                                    result.style[i]=v1.style[i];
-                                }
-                            }
-                        }
-                    }
-                    return result;
-                }
-            };
-        }
-    }
-});
-- 
cgit v1.2.3