Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti

1 files changed, 318 insertions, 317 deletions

diff --git a/js/panels/Timeline/Collapser.js b/js/panels/Timeline/Collapser.js
index 41aa8f39..8433589c 100644
--- a/js/panels/Timeline/Collapser.js
+++ b/js/panels/Timeline/Collapser.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,151 +32,151 @@ POSSIBILITY OF SUCH DAMAGE.
 /*
  * Collapser:  Takes two elements and creates a visual "expando:" clicking on one element expands/collapses the other.
  * Required properties:
- *              clicker: The element that will be clicked on.
- *              content: The element that will expand or collapse as the clicker is clicked on.
+ *      clicker: The element that will be clicked on.
+ *      content: The element that will expand or collapse as the clicker is clicked on.
  * Optional properties:
- *              isCollapsed: Is the content collapsed.  Set to true on serialization (or initialization) to start content in collapsed state.
- *                      Can be manually set as well.
- *              collapsibleClass: The CSS class to apply to the content and the clicker when collapsed.  Defaults to "collapsible-collapsed".
- *              isAnimated: Set to true to apply a transition to expand/collapse (defaults to false).
- *              transitionClass: If isAnimated is set to true, the component will apply transitionClass to the content during the 
- *                      collapse process.  You can then define transitionClass in your style sheet with the desired CSS transitions.
- *                      Defaults to "collapsible-transition".
- *              contentHeight: If both isAnimated and isCollapsedAtStart are set to true, set contentHeight to the height of the content 
- *                      (in pixels, but without the "px") when not collapsed.  If this value is not set, the first time the content is expanded 
- *                      the transition will not work. Subsequent collapses (and expansions) will transition as expected.
- *              isLabelClickable: Boolean that indicates whether or not the clicker should have listener events. Defaults to true; set to 
- *                      false for collapsers that will only be operated remotely.
- *              isToggling: Set this anually toggle the expand/collapse of the content.
- *              
+ *      isCollapsed: Is the content collapsed.  Set to true on serialization (or initialization) to start content in collapsed state.
+ *          Can be manually set as well.
+ *      collapsibleClass: The CSS class to apply to the content and the clicker when collapsed.  Defaults to "collapsible-collapsed".
+ *      isAnimated: Set to true to apply a transition to expand/collapse (defaults to false).
+ *      transitionClass: If isAnimated is set to true, the component will apply transitionClass to the content during the
+ *          collapse process.  You can then define transitionClass in your style sheet with the desired CSS transitions.
+ *          Defaults to "collapsible-transition".
+ *      contentHeight: If both isAnimated and isCollapsedAtStart are set to true, set contentHeight to the height of the content
+ *          (in pixels, but without the "px") when not collapsed.  If this value is not set, the first time the content is expanded
+ *          the transition will not work. Subsequent collapses (and expansions) will transition as expected.
+ *      isLabelClickable: Boolean that indicates whether or not the clicker should have listener events. Defaults to true; set to
+ *          false for collapsers that will only be operated remotely.
+ *      isToggling: Set this anually toggle the expand/collapse of the content.
+ *
  */
 var Montage = require("montage/core/core").Montage,
-        Component = require("montage/ui/component").Component,
-        Collapser = exports.Collapser = Montage.create(Component, {
-
-        // This component has no template.
-        hasTemplate:{
-                value: false
-        },
-        
-        /* === BEGIN: Models === */
-        
-        // contentHeight: Stores the height of the content just before collapse.
-        _contentHeight: {
-                value: 0
-        },
-        contentHeight: {
+    Component = require("montage/ui/component").Component,
+    Collapser = exports.Collapser = Montage.create(Component, {
+
+    // This component has no template.
+    hasTemplate:{
+        value: false
+    },
+
+    /* === BEGIN: Models === */
+
+    // contentHeight: Stores the height of the content just before collapse.
+    _contentHeight: {
+        value: 0
+    },
+    contentHeight: {
         serializable: true,
-                get: function() {
-                        return this._contentHeight;
-                },
-                set: function(newVal) {
-                        this._contentHeight = newVal;
-                }
-        },
-        
-        // isCollapsing: true if the collapser is collapsing (or expanding); used in the draw cycle.
-        _isCollapsing: {
-                value: false
-        },
-        
-        // isAnimated: boolean to apply transition to expand/collapse 
-        _isAnimated : {
-                value: false
-        },
-        isAnimated: {
+        get: function() {
+            return this._contentHeight;
+        },
+        set: function(newVal) {
+            this._contentHeight = newVal;
+        }
+    },
+
+    // isCollapsing: true if the collapser is collapsing (or expanding); used in the draw cycle.
+    _isCollapsing: {
+        value: false
+    },
+
+    // isAnimated: boolean to apply transition to expand/collapse
+    _isAnimated : {
+        value: false
+    },
+    isAnimated: {
         serializable: true,
-                get: function() {
-                        return this._isAnimated;
-                },
-                set: function(newVal) {
-                        this._isAnimated = newVal;
-                }
-        },
-        
-        _bypassAnimation : {
-                value: true
-        },
-        bypassAnimation: {
+        get: function() {
+            return this._isAnimated;
+        },
+        set: function(newVal) {
+            this._isAnimated = newVal;
+        }
+    },
+
+    _bypassAnimation : {
+        value: true
+    },
+    bypassAnimation: {
         serializable: true,
-                get: function() {
-                        return this._bypassAnimation;
-                },
-                set: function(newVal) {
-                        this._bypassAnimation= newVal;
-                        //console.log('bypassAnimation setter ' + newVal)
-                }
-        },
-         _oldAnimated : {
-                value: false
-         },
-        
-        // transitionClass: The CSS class to apply to the content during collapse to provide CSS transition.
-        // Note that this CSS class must be defined in your style sheet with the desired transitions.
-        _transitionClass : {
-                value: "collapsible-transition"
-        },
-        transitionClass: {
-                get: function() {
-                        return this._transitionClass;
-                },
-                set: function(newVal) {
-                        this._transitionClass = newVal;
-                }
-        },
-        
-        // isCollapsed: is the content actually collapsed at this moment
-        _isCollapsed: {
-                value: ""
-        },
-        isCollapsed : {
+        get: function() {
+            return this._bypassAnimation;
+        },
+        set: function(newVal) {
+            this._bypassAnimation= newVal;
+            //console.log('bypassAnimation setter ' + newVal)
+        }
+    },
+     _oldAnimated : {
+        value: false
+     },
+
+    // transitionClass: The CSS class to apply to the content during collapse to provide CSS transition.
+    // Note that this CSS class must be defined in your style sheet with the desired transitions.
+    _transitionClass : {
+        value: "collapsible-transition"
+    },
+    transitionClass: {
+        get: function() {
+            return this._transitionClass;
+        },
+        set: function(newVal) {
+            this._transitionClass = newVal;
+        }
+    },
+
+    // isCollapsed: is the content actually collapsed at this moment
+    _isCollapsed: {
+        value: ""
+    },
+    isCollapsed : {
         serializable: true,
-                get: function() {
-                        return this._isCollapsed;
-                },
-                set: function(newVal) {
-                        if (newVal !== this._isCollapsed) {
-                                this._isCollapsed = newVal;
-                                //this.needsDraw = true;
+        get: function() {
+            return this._isCollapsed;
+        },
+        set: function(newVal) {
+            if (newVal !== this._isCollapsed) {
+                this._isCollapsed = newVal;
+                //this.needsDraw = true;