From a3024011a91d3941f81481dd4d600e9684eb0fd4 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Thu, 2 Feb 2012 00:11:51 -0800
Subject: upgrading to Montage v0.6

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 node_modules/montage/ui/flow-path-lerp.js | 36 +++++++++++++------------------
 1 file changed, 15 insertions(+), 21 deletions(-)

(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
index 42c168ce..b88fee39 100644
--- a/node_modules/montage/ui/flow-path-lerp.js
+++ b/node_modules/montage/ui/flow-path-lerp.js
@@ -1,33 +1,27 @@
-/* <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) {         
+        set: function (value) {
             this._path1 = value;
             this.resultPath = true;
         }
@@ -37,12 +31,12 @@ var FlowPathLerp = exports.FlowPathLerp = Montage.create(Montage, {
         get: function () {
             return this._path2;
         },
-        set: function (value) {         
+        set: function (value) {
             this._path2 = value;
-            this.resultPath = true;            
+            this.resultPath = true;
         }
     },
-    
+
     interpolant: {
         get: function () {
             return this._interpolant;
@@ -52,19 +46,19 @@ var FlowPathLerp = exports.FlowPathLerp = Montage.create(Montage, {
             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),
@@ -73,7 +67,7 @@ var FlowPathLerp = exports.FlowPathLerp = Montage.create(Montage, {
                         m2=self._interpolant,
                         result={},
                         i;
-                    
+
                     for (i in v1) {
                         if (v1.hasOwnProperty(i)&&(i!="style")) {
                             if (v2.hasOwnProperty(i)) {
@@ -86,7 +80,7 @@ var FlowPathLerp = exports.FlowPathLerp = Montage.create(Montage, {
                                 result[i]=v1[i];
                             }
                         }
-                    }                    
+                    }
                     for (i in v2) {
                         if (v2.hasOwnProperty(i)&&(i!="style")&&(!v1.hasOwnProperty(i))) {
                             result[i]=v2[i];
@@ -109,4 +103,4 @@ var FlowPathLerp = exports.FlowPathLerp = Montage.create(Montage, {
             };
         }
     }
-});
\ No newline at end of file
+});
-- 
cgit v1.2.3