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, 130 insertions, 129 deletions

diff --git a/js/components/colorbar.reel/colorbar.js b/js/components/colorbar.reel/colorbar.js
index 4f3577d9..524f3c55 100755
--- a/js/components/colorbar.reel/colorbar.js
+++ b/js/components/colorbar.reel/colorbar.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
@@ -30,152 +31,152 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ////////////////////////////////////////////////////////////////////////
 //
-var Montage =                   require("montage/core/core").Montage,
-        Component =             require("montage/ui/component").Component;
+var Montage =           require("montage/core/core").Montage,
+    Component =         require("montage/ui/component").Component;
 ////////////////////////////////////////////////////////////////////////
 //Exporting as ColorBar
 exports.ColorBar = Montage.create(Component, {
-        ////////////////////////////////////////////////////////////////////
-        //No reel needed since it's just a bar component
-        hasTemplate: {
+    ////////////////////////////////////////////////////////////////////
+    //No reel needed since it's just a bar component
+    hasTemplate: {
         value: true
     },
     ////////////////////////////////////////////////////////////////////
     //Width of spectrum (not including b/w buttons)
     _colorBarSpectrumWidth: {
-        value: null
+        value: null
     },
     ////////////////////////////////////////////////////////////////////
     //Width of spectrum steps (used to calculate size of B/W buttons)
     _colorBarSpectrumWidthSteps: {
-        value: 10
+        value: 10
     },
     ////////////////////////////////////////////////////////////////////
     //Default value
     _value: {
         value: {h: 0, s: 0, v: 0}
     },
-        ////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
     //HSV Value selected from bar
     value: {
         get: function() {return this._value;},
         set: function(value) {
-                if (value) {
-                        //Checking for limits (Max and Min HSV values)
-                    if (value.h > Math.PI*2) {
-                        value.h = Math.PI*2;
-                        } else if (value.h < 0) {
-                                value.h = 0;
-                        }
-                //
-                        if (value.s > 1) {
-                                value.s = 1;
-                        } else if (value.s < 0) {
-                        value.s = 0;
-                        }
-                        //
-                        if (value.v > 1) {
-                        value.v = 1;
-                    } else if (value.v < 0) {
-                                value.v = 0;
-                        }
-                //Setting value
-                    this._value = value;
-                    //
-                    if (!this._isMouseDown) {
-                        this._dispatchActionEvent('change', true);
-                    }
+            if (value) {
+                //Checking for limits (Max and Min HSV values)
+                if (value.h > Math.PI*2) {
+                    value.h = Math.PI*2;
+                } else if (value.h < 0) {
+                    value.h = 0;
+                }
+                //
+                if (value.s > 1) {
+                    value.s = 1;
+                } else if (value.s < 0) {
+                    value.s = 0;
+                }
+                //
+                if (value.v > 1) {
+                    value.v = 1;
+                } else if (value.v < 0) {
+                    value.v = 0;
+                }
+                //Setting value
+                this._value = value;
+                //
+                if (!this._isMouseDown) {
+                    this._dispatchActionEvent('change', true);
+                }
             }
         }
     },
     ////////////////////////////////////////////////////////////////////
     //
     prepareForDraw: {
-        value: function() {
-                        //Nothing
-        }
+        value: function() {
+            //Nothing
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //Setting up and drawing canvas to object
     willDraw: {
-        value: function() {
-                //Setting the width and height of the canvas to match container
-                this.element.width = parseInt(window.getComputedStyle(this.element, null).width);
-                this.element.height = parseInt(window.getComputedStyle(this.element, null).height);
-        }
+        value: function() {
+            //Setting the width and height of the canvas to match container
+            this.element.width = parseInt(window.getComputedStyle(this.element, null).width);
+            this.element.height = parseInt(window.getComputedStyle(this.element, null).height);
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
     draw: {
-        value: function () {
-                //Local variables
-                var cb_canvas = this.element, cb_ctx, cb_grdnt, cb_slc, cb_gwidth, PI = Math.PI, i;
-                        //calculating width of spectrum (remainder is used for B/W buttons)
-                        cb_gwidth = Math.round(cb_canvas.width - cb_canvas.width/this._colorBarSpectrumWidthSteps);
-                        //Context and Gradient
-                        cb_ctx = cb_canvas.getContext('2d');
-                        cb_grdnt = cb_ctx.createLinearGradient(0, cb_canvas.height, cb_gwidth, cb_canvas.height);
-                        ////////////////////////////////////////////////////////
-                        //Looping through set intervals (Creating spectrum)
-                        for (i=0; i<60; i++) {
-                                //Calculating slice number
-                                cb_slc = Math.round(255*i/60);
-                                //Creating gradient slices (6 colors in color theory)
-                                cb_grdnt.addColorStop(i/360, 'rgb(255, '+cb_slc+', 0)');
-                                cb_grdnt.addColorStop((i+60)/360, 'rgb('+(255-cb_slc)+', 255, 0)');
-                                cb_grdnt.addColorStop((i+120)/360, 'rgb(0, 255, '+cb_slc+')');
-                                cb_grdnt.addColorStop((i+180)/360, 'rgb(0, '+(255-cb_slc)+', 255)');
-                                cb_grdnt.addColorStop((i+240)/360, 'rgb('+cb_slc+', 0, 255)');
-                                cb_grdnt.addColorStop((i+300)/360, 'rgb(255, 0,'+(255-cb_slc)+')');
-                        }
-                        //Adding Color Bar to the canvas (Gradients)
-                        cb_ctx.fillStyle = cb_grdnt;
-                        cb_ctx.fillRect(0, 0, cb_gwidth, cb_canvas.height);
+        value: function () {
+            //Local variables
+            var cb_canvas = this.element, cb_ctx, cb_grdnt, cb_slc, cb_gwidth, PI = Math.PI, i;
+            //calculating width of spectrum (remainder is used for B/W buttons)
+            cb_gwidth = Math.round(cb_canvas.width - cb_canvas.width/this._colorBarSpectrumWidthSteps);
+            //Context and Gradient
+            cb_ctx = cb_canvas.getContext('2d');
+            cb_grdnt = cb_ctx.createLinearGradient(0, cb_canvas.height, cb_gwidth, cb_canvas.height);
+            ////////////////////////////////////////////////////////
+            //Looping through set intervals (Creating spectrum)
+            for (i=0; i<60; i++) {
+                //Calculating slice number
+                cb_slc = Math.round(255*i/60);
+                //Creating gradient slices (6 colors in color theory)
+                cb_grdnt.addColorStop(i/360, 'rgb(255, '+cb_slc+', 0)');
+                cb_grdnt.addColorStop((i+60)/360, 'rgb('+(255-cb_slc)+', 255, 0)');
+                cb_grdnt.addColorStop((i+120)/360, 'rgb(0, 255, '+cb_slc+')');
+                cb_grdnt.addColorStop((i+180)/360, 'rgb(0, '+(255-cb_slc)+', 255)');
+                cb_grdnt.addColorStop((i+240)/360, 'rgb('+cb_slc+', 0, 255)');
+                cb_grdnt.addColorStop((i+300)/360, 'rgb(255, 0,'+(255-cb_slc)+')');
+            }
+            //Adding Color Bar to the canvas (Gradients)
+            cb_ctx.fillStyle = cb_grdnt;
+            cb_ctx.fillRect(0, 0, cb_gwidth, cb_canvas.height);