Merge pull request #379 from kriskowal/bsd-v0.7.0

BSD License for v0.7.0

1 files changed, 59 insertions, 58 deletions

diff --git a/js/panels/Timeline/Collapser.js b/js/panels/Timeline/Collapser.js
index 41aa8f39..8db1b17f 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
@@ -38,16 +39,16 @@ POSSIBILITY OF SUCH DAMAGE.
  *                      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 
+ *              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 
+ *              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 
+ *              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,
@@ -57,9 +58,9 @@ var Montage = require("montage/core/core").Montage,
         hasTemplate:{
                 value: false
         },
-        
+
         /* === BEGIN: Models === */
-        
+
         // contentHeight: Stores the height of the content just before collapse.
         _contentHeight: {
                 value: 0
@@ -73,13 +74,13 @@ var Montage = require("montage/core/core").Montage,
                         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: boolean to apply transition to expand/collapse
         _isAnimated : {
                 value: false
         },
@@ -92,7 +93,7 @@ var Montage = require("montage/core/core").Montage,
                         this._isAnimated = newVal;
                 }
         },
-        
+
         _bypassAnimation : {
                 value: true
         },
@@ -109,7 +110,7 @@ var Montage = require("montage/core/core").Montage,
          _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 : {
@@ -123,7 +124,7 @@ var Montage = require("montage/core/core").Montage,
                         this._transitionClass = newVal;
                 }
         },
-        
+
         // isCollapsed: is the content actually collapsed at this moment
         _isCollapsed: {
                 value: ""
@@ -140,7 +141,7 @@ var Montage = require("montage/core/core").Montage,
                         }
                 }
         },
-        
+
         // collapsedClass:  the class to apply to the clicker and content when the content is collapsed.
         _collapsedClass : {
                 value: "collapsible-collapsed"
@@ -153,14 +154,14 @@ var Montage = require("montage/core/core").Montage,
                         this._collapsedClass = newVal;
                 }
         },
-        
+
         // _origOverflowValue: Stores the original overflow value of the collapsible element.
         // Why store the value? While the collapsible element is collapsed, obviously we will need overflow: hidden.
         // But when the collapsible element is open, we will need overflow to return to its original value.
         _origOverflowValue : {
                 value: false
         },
-        
+
         // isLabelClickable: Boolean for whether or not the label is clickable. If set to false,
         // the label click listener is never applied.  For collapsibles that will only be operated remotely.
         // Defaults to true.
@@ -217,7 +218,7 @@ var Montage = require("montage/core/core").Montage,
                 set: function(newVal) {
                         if (newVal !== this._isToggling) {
                                 this._isToggling = newVal;
-                                
+
                                 if (this.bypassAnimation === true) {
                                         this._oldAnimated = this.isAnimated;
                                         this.isAnimated = false;
@@ -227,11 +228,11 @@ var Montage = require("montage/core/core").Montage,
                         }
                 }
         },
-        
+
         /* === END: Models === */
-        
+
         /* === BEGIN: Draw cycle === */
-        
+
         prepareForDraw: {
                 value: function() {
                         // Get the original value of the overflow property:
@@ -239,7 +240,7 @@ var Montage = require("montage/core/core").Montage,
                         if (this.isCollapsed === false) {
                                 this.myContent.style.height = "auto";
                         }
-                        
+
 
                         // If the content area is supposed to start out collapsed:
                         if (this.isCollapsed) {
@@ -259,19 +260,19 @@ var Montage = require("montage/core/core").Montage,
         },
         draw: {
                 value: function() {
-                        // Is the content area expanding/collapsing?    
-                        this.myContent.classList.remove(this.transitionClass);  
+                        // Is the content area expanding/collapsing?
+                        this.myContent.classList.remove(this.transitionClass);
                         if (this._isCollapsing) {