Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal

Conflicts:
	manifest.json

1 files changed, 298 insertions, 297 deletions

diff --git a/js/panels/Timeline/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js
index 122c2c0a..bfa6f930 100644
--- a/js/panels/Timeline/Style.reel/Style.js
+++ b/js/panels/Timeline/Style.reel/Style.js
@@ -1,24 +1,25 @@
 /* <copyright>
-Copyright (c) 2012, Motorola Mobility, Inc
+Copyright (c) 2012, Motorola Mobility LLC.
 All Rights Reserved.
-BSD License.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
-  - Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
-  - Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-  - Neither the name of Motorola Mobility nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of Motorola Mobility LLC nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -31,17 +32,17 @@ POSSIBILITY OF SUCH DAMAGE.
 /*
  * Style component:  Edits and manages a single style rule for a Layer in the Timeline.
  * Public Properties:
- *              editorProperty:  The CSS property for the style.
- *              editorValue:    The value for the editorProperty. 
- *              whichView:  Which view to show, the hintable view (where a new property can be typed in)
- *                                      or the propval view (where the property's value can be set with the tweener).
- *                                      Valid values are "hintable" and "propval", defaults to "hintable".
- * 
+ *      editorProperty:  The CSS property for the style.
+ *      editorValue:    The value for the editorProperty.
+ *      whichView:  Which view to show, the hintable view (where a new property can be typed in)
+ *                  or the propval view (where the property's value can be set with the tweener).
+ *                  Valid values are "hintable" and "propval", defaults to "hintable".
+ *
  */
 
 var Montage = require("montage/core/core").Montage;
 var Component = require("montage/ui/component").Component;
-var ElementsMediator =          require("js/mediators/element-mediator").ElementMediator
+var ElementsMediator =      require("js/mediators/element-mediator").ElementMediator
 
 
 var LayerStyle = exports.LayerStyle = Montage.create(Component, {
@@ -72,151 +73,151 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
     },
 
     /* === BEGIN: Models === */
-        // isSelected: whether or not the style is selected
-        _isSelected: {
-                value: false
-        },
-        isSelected: {
-                serializable: true,
-                get: function() {
-                        return this._isSelected;
-                },
-                set: function(newVal) {
-
-                        if (newVal !== this._isSelected) {
-                                this._isSelected = newVal;
-                                this.needsDraw = true;
-                        }
-                }
-        },
-        
+    // isSelected: whether or not the style is selected
+    _isSelected: {
+        value: false
+    },
+    isSelected: {
+        serializable: true,
+        get: function() {
+            return this._isSelected;
+        },
+        set: function(newVal) {
+
+            if (newVal !== this._isSelected) {
+                this._isSelected = newVal;
+                this.needsDraw = true;
+            }
+        }
+    },
+
     /* isActive:  Whether or not the user is actively clicking within the style; used to communicate state with
      * parent Layer.
      */
     _isActive: {
-        value: false
+        value: false
     },
     isActive: {
-        get: function() {
-                return this._isActive;
-        },
-        set: function(newVal) {
-                this._isActive = newVal;
-        }
-    },
-   
+        get: function() {
+            return this._isActive;
+        },
+        set: function(newVal) {
+            this._isActive = newVal;
+        }
+    },
+
    // Property for this editor
     _editorProperty: {
-        value: ""
+        value: ""
     },
     editorProperty: {
-        serializable: true,
-        get: function() {
-                return this._editorProperty;
-        },
-        set: function(newVal) {
-                this._editorProperty = newVal;
-                this.needsDraw = true;
-        }
-    },
-    
+        serializable: true,
+        get: function() {
+            return this._editorProperty;
+        },
+        set: function(newVal) {
+            this._editorProperty = newVal;
+            this.needsDraw = true;
+        }
+    },
+
     // Value for the property for this editor.
     _editorValue: {
-        value: ""
+        value: ""
     },
     editorValue: {
-        serializable: true,
-        get: function() {
-                return this._editorValue;
-        },
-        set: function(newVal) {
-                this._editorValue = newVal;
-                this.needsDraw = true;
-        }
-    },
-    
-        // The tweener used to change the value for this property. 
+        serializable: true,
+        get: function() {
+            return this._editorValue;
+        },
+        set: function(newVal) {
+            this._editorValue = newVal;
+            this.needsDraw = true;
+        }
+    },
+
+    // The tweener used to change the value for this property.
     _ruleTweener: {
-        value: false
+        value: false
     },
     ruleTweener: {
-        serializable: true,
-        get: function() {
-                return this._ruleTweener;
-        },
-        set: function(newVal) {
-                this._ruleTweener = newVal;
-                this.needsDraw = true;
-        }
-    },
-    
+        serializable: true,
+        get: function() {
+            return this._ruleTweener;
+        },
+        set: function(newVal) {
+            this._ruleTweener = newVal;
+            this.needsDraw = true;
+        }
+    },
+
     // The hintable we use to change the Property
     _myHintable: {
-        value: ""
+        value: ""
     },
     myHintable: {
-        get: function() {
-                return this._myHintable;
-        },
-        set: function(newVal) {
-                this._myHintable = newVal;
-        },
+        get: function() {
+            return this._myHintable;
+        },
+        set: function(newVal) {
+            this._myHintable = newVal;
+        },
         serializable: true
     },
     _myHintableValue : {
-        value: null
+        value: null
     },