Merge branch 'refs/heads/NINJA-master' into TimelineUber

Conflicts:
	js/panels/Timeline/DragDrop.js
	js/panels/Timeline/Keyframe.reel/Keyframe.js
	js/panels/Timeline/Layer.reel/Layer.js
	js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
	js/panels/Timeline/Span.reel/Span.js
	js/panels/Timeline/Style.reel/Style.js
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
	js/panels/Timeline/Track.reel/Track.html
	js/panels/Timeline/Track.reel/Track.js
	js/panels/Timeline/Track.reel/css/Track.css
	js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
	js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js
	js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css
	js/panels/Timeline/Tween.reel/Tween.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 150 insertions, 149 deletions

diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index 1030acb4..89a389a4 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.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
@@ -59,26 +60,26 @@ Methods:
      - Delete stylesheets
      - Enable  stylesheets
      - Disable stylesheets
-     
+
      use case : set background color
       - needs to know most specific rule WITH that property
-      - 
+      -
 
 */
 
 var stylesController = exports.StylesController = Montage.create(Component, {
-    
+
     ///// Initialize after the active document has been set, and
     ///// bind the document to prop w/ setter. The setter calls to find
     ///// the stage and default css files.
 
-    ///// Active document gets automatically set when the 
+    ///// Active document gets automatically set when the
     ///// document controller changes it
     _currentDocument : {
         value : null,
         enumerable : false
     },
-    
+
     currentDocument : {
         get : function() {
             return this._currentDocument;
@@ -97,7 +98,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
 
             ///// setting document via binding
             this._currentDocument = document;
-            
+
             ///// Stage stylesheet should always be found
             this._stageStylesheet  = this.getSheetFromElement(this.CONST.STAGE_SHEET_ID);
             // Returns null if sheet not found (as in non-ninja projects)
@@ -191,29 +192,29 @@ var stylesController = exports.StylesController = Montage.create(Component, {
         }
     },
     /* ----------------- Rule methods ----------------- */
-    
+
     ///// Add Rule
     ///// Passed in rule will be appended to the default stylesheet
     ///// The rule can be in the form of a string (one argument), or
     ///// the selector string and declaration string (two arguments), or
     ///// the selector string and a declaration object.
     ///// Optionally pass in the rule index (defaults to end of sheet)
-    
+
     /*
-    Signature 1 : 
+    Signature 1 :
     addRule( "#div1", "color:blue; width:100px;", 3)
               [str]    [str]                    [num]
-    
-    Signature 2 (w/ styles object literal): 
+
+    Signature 2 (w/ styles object literal):
     addRule( "#div1", { color:"blue", width:"100px" }, 3)
               [str]    [obj]                         [num]
-    
-    Signature 3 (w/ full rule as one string) : 
+
+    Signature 3 (w/ full rule as one string) :
     addRule( "#div1 { color:blue; width:100px; }", 3)
               [str]                              [num]
-    
+
     */
-    
+
     addRule : {
         value : function(selector, declaration, stylesheet, index) {
             stylesheet = stylesheet || this._defaultStylesheet;
@@ -228,20 +229,20 @@ var stylesController = exports.StylesController = Montage.create(Component, {
                 rule;
 
             index = index || (argType === 'number') ? declaration : rulesLength;
-            
+
             if(argType === 'string') {
                 ruleText += '{' + declaration + '}';
             } else if(argType === 'object') {
                 ruleText += '{' + this.cssFromObject(declaration) + '}';
             }
-            
+
             stylesheet.insertRule(ruleText, index);
 
             ///// Invalidate cache because rule dominance is affected
             this._clearCache();
 
             this.styleSheetModified(stylesheet);
-            
+
             rule = stylesheet.rules[index];
 
             ///// attach specificity to rule object
@@ -256,7 +257,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             return rule;
         }
     },
-    
+
     ///// Create Override Rule
     ///// Takes a given rule and creates a rule with a selector of equal
     ///// or greater specificity, and inserts it after the original rule
@@ -264,10 +265,10 @@ var stylesController = exports.StylesController = Montage.create(Component, {
     ///// and the class will have to be applied to the element in order for
     ///// the rule to stick
     ///// Returns an object containing this classname and the rule itself
-    
+
     createOverrideRule : {
         value : function(ruleToOverride, element) {
-            
+
             ///// Locally-scoped function to de-clutter variable declarations
             function getSelector(el, rule) {
                 return this._getMostSpecificSelectorForElement(el, rule[this.CONST.SPECIFICITY_KEY]).selector;
@@ -283,12 +284,12 @@ var stylesController = exports.StylesController = Montage.create(Component, {
 
             ///// Create new rule with selector and insert it after the rule we're overriding
             rule = this.addRule(overrideData.selector + ' { }', this.getRuleIndex(ruleToOverride)+1);
-            
+
             return {
                 className : overrideData.className,
                 rule      : rule
             };
-            
+
         }
     },
 
@@ -341,18 +342,18 @@ var stylesController = exports.StylesController = Montage.create(Component, {