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, 2035 insertions, 2034 deletions

diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index ab6d106d..d3db6567 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.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
@@ -42,109 +43,109 @@ var Montage = require("montage/core/core").Montage,
     NJUtils = require("js/lib/NJUtils").NJUtils;
 
 var SnapManager = exports.SnapManager = Montage.create(Component, {
-        ///////////////////////////////////////////////////////////////////////
-        // Instance variables
-        ///////////////////////////////////////////////////////////////////////
+    ///////////////////////////////////////////////////////////////////////
+    // Instance variables
+    ///////////////////////////////////////////////////////////////////////
 
     currentStage: { value: null },
 
-        // we keep a stack of working planes to facilitate working on other planes temporarily
-        _workingPlaneStack : { value: [], writable: true },
+    // we keep a stack of working planes to facilitate working on other planes temporarily
+    _workingPlaneStack : { value: [], writable: true },
 
-        // snapping radii relative to a 25 pixel grid
-        GRID_VERTEX_HIT_RAD : { value: 10, writable: true },
-        GRID_EDGE_HIT_RAD : { value: 6, writable: true},
+    // snapping radii relative to a 25 pixel grid
+    GRID_VERTEX_HIT_RAD : { value: 10, writable: true },
+    GRID_EDGE_HIT_RAD : { value: 6, writable: true},
 
-        // these are the grid snapping tolerances scaled to the current grid spacing
-        _gridVertexHitRad : { value: this.GRID_VERTEX_HIT_RAD, writable: true },
-        _gridEdgeHitRad : { value: this.GRID_EDGE_HIT_RAD, writable: true },
+    // these are the grid snapping tolerances scaled to the current grid spacing
+    _gridVertexHitRad : { value: this.GRID_VERTEX_HIT_RAD, writable: true },
+    _gridEdgeHitRad : { value: this.GRID_EDGE_HIT_RAD, writable: true },
 
-        ELEMENT_VERTEX_HIT_RAD : { value: 18, writable: true },
-        ELEMENT_EDGE_HIT_RAD : { value: 14, writable: true },
+    ELEMENT_VERTEX_HIT_RAD : { value: 18, writable: true },
+    ELEMENT_EDGE_HIT_RAD : { value: 14, writable: true },
 
-        // keep a reference to the most recent hitRecord.  Used for drawing feedback on the stage
-        _lastHit : { value: null, writable: true },
-        _hitRecords : { value: [], writable: true },
+    // keep a reference to the most recent hitRecord.  Used for drawing feedback on the stage
+    _lastHit : { value: null, writable: true },
+    _hitRecords : { value: [], writable: true },
 
-        // keep a list of objects to avoid snapping to
-        _avoidList : { value: [], writable: true },
+    // keep a list of objects to avoid snapping to
+    _avoidList : { value: [], writable: true },
 
-        // keep a cache of 2D elements to snap to
-        _elementCache : { value: null, writable: true },
-        _isCacheInvalid : { value: false, writable: true },
+    // keep a cache of 2D elements to snap to
+    _elementCache : { value: null, writable: true },
+    _isCacheInvalid : { value: false, writable: true },
 
-        // the snap manager can handle a 2D plane for dragging.
-        // A call to initDragPlane sets these variables.
-        // a call to clearDragPlane MUST be called on the completion of a drag
-        _hasDragPlane : {value: false, writable: true },
-        _dragPlane : { value: null, writable: true },
-        _dragPlaneToWorld : { value: Matrix.I(4), writable: true },
-        _worldToDragPlane : { value: Matrix.I(4), writable: true },
-        _dragPlaneActive : {value: false, writable: true },
+    // the snap manager can handle a 2D plane for dragging.
+    // A call to initDragPlane sets these variables.
+    // a call to clearDragPlane MUST be called on the completion of a drag
+    _hasDragPlane : {value: false, writable: true },
+    _dragPlane : { value: null, writable: true },
+    _dragPlaneToWorld : { value: Matrix.I(4), writable: true },
+    _worldToDragPlane : { value: Matrix.I(4), writable: true },
+    _dragPlaneActive : {value: false, writable: true },
 
-        // cache the matrix linking stage world and global spaces
-        _stageWorldToGlobalMat : { value: Matrix.I(4), writable: true },
-        _globalToStageWorldMat : { value: Matrix.I(4), writable: true },
+    // cache the matrix linking stage world and global spaces
+    _stageWorldToGlobalMat : { value: Matrix.I(4), writable: true },
+    _globalToStageWorldMat : { value: Matrix.I(4), writable: true },
 
-        // various flags to enable snapping
-        _snapAlignEnabled : {value: true, writable: true },
-        _elementSnapEnabled : {value: true, writable: true },
-        _gridSnapEnabled : {value: true, writable: true },
+    // various flags to enable snapping
+    _snapAlignEnabled : {value: true, writable: true },
+    _elementSnapEnabled : {value: true, writable: true },
+    _gridSnapEnabled : {value: true, writable: true },
 
-        // these represent the app level snap settings as set by the end user through
-        // the menus.  These should be stored somewhere else and serialized.  Putting them here for now...
-        _snapAlignEnabledAppLevel : {value: true, writable: true },
-        _elementSnapEnabledAppLevel : {value: true, writable: true },
-        _gridSnapEnabledAppLevel : {value: true, writable: true },
+    // these represent the app level snap settings as set by the end user through
+    // the menus.  These should be stored somewhere else and serialized.  Putting them here for now...
+    _snapAlignEnabledAppLevel : {value: true, writable: true },
+    _elementSnapEnabledAppLevel : {value: true, writable: true },
+    _gridSnapEnabledAppLevel : {value: true, writable: true },
 
     // App Model pointer
     appModel: { value: null },
 
 
-        ///////////////////////////////////////////////////////////////////////
-        // Property accessors
-        ///////////////////////////////////////////////////////////////////////
-        pushWorkingPlane : { value: function (p)                { this._workingPlaneStack.push(workingPlane.slice(0)); workingPlane = p.slice(0); }},
-        popWorkingPlane : { value: function ()          { workingPlane = this._workingPlaneStack.pop(); return workingPlane; }},
+    ///////////////////////////////////////////////////////////////////////
+    // Property accessors
+    ///////////////////////////////////////////////////////////////////////
+    pushWorkingPlane : { value: function (p)        { this._workingPlaneStack.push(workingPlane.slice(0)); workingPlane = p.slice(0); }},
+    popWorkingPlane : { value: function ()      { workingPlane = this._workingPlaneStack.pop(); return workingPlane; }},
 
-        getStageWidth : { value: function ()            {
-                return parseInt(this.currentStage.offsetWidth);
-        }},
+    getStageWidth : { value: function ()        {
+        return parseInt(this.currentStage.offsetWidth);
+    }},
 
-        getStageHeight : { value: function ()           {
-                return parseInt(this.currentStage.offsetHeight);
-        }},
+    getStageHeight : { value: function ()       {
+        return parseInt(this.currentStage.offsetHeight);
+    }},
 
-    getStage : { value: function()              {        return this.currentStage;    }},
+    getStage : { value: function()      {        return this.currentStage;    }},
 
-        getGridVertexHitRad : { value: function()               {  return this._gridVertexHitRad;                               }},
-        getGridEdgeHitRad : { value: function()         {  return this._gridEdgeHitRad;                                 }},
+    getGridVertexHitRad : { value: function()       {  return this._gridVertexHitRad;               }},
+    getGridEdgeHitRad : { value: function()     {  return this._gridEdgeHitRad;                 }},
 
-        getLastHit : { value: function()                {  return this._lastHit;                                                }},
-        setLastHit : { value: function(h)               {  this._lastHit = h;                                                   }},
+    getLastHit : { value: function()        {  return this._lastHit;                        }},
+    setLastHit : { value: function(h)       {  this._lastHit = h;                           }},
 
-        hasDragPlane : { value: function()              {  return this._hasDragPlane;                                   }},
-        getDragPlane : { value: function()              {  return this._dragPlane.slice(0);                             }},
+    hasDragPlane : { value: function()      {  return this._hasDragPlane;                   }},
+    getDragPlane : { value: function()      {  return this._dragPlane.slice(0);             }},
 
-    has2DCache : { value: function()            {  return (this._elementCache && !this._isCacheInvalid);                }},
+    has2DCache : { value: function()        {  return (this._elementCache && !this._isCacheInvalid);        }},
 
-        enableSnapAlign : { value: function(e)          {  this._snapAlignEnabled = e;                                  }},
-        snapAlignEnabled : { value: function()          {  return this._snapAlignEnabled;                               }},
-        enableElementSnap : { value: function(e)                {  this._elementSnapEnabled = e;                                }},
-        elementSnapEnabled : { value: function()                {  return this._elementSnapEnabled;                             }},
-        enableGridSnap : { value: function(e)           {  this._gridSnapEnabled = e;                                   }},
-        gridSnapEnabled : { value: function()           {  return this._gridSnapEnabled;                                }},
+    enableSnapAlign : { value: function(e)      {  this._snapAlignEnabled = e;                  }},
+    snapAlignEnabled : { value: function()      {  return this._snapAlignEnabled;               }},
+    enableElementSnap : { value: function(e)        {  this._elementSnapEnabled = e;                }},
+    elementSnapEnabled : { value: function()        {  return this._elementSnapEnabled;             }},
+    enableGridSnap : { value: function(e)       {  this._gridSnapEnabled = e;                   }},
+    gridSnapEnabled : { value: function()       {  return this._gridSnapEnabled;                }},
 
-        enableSnapAlignAppLevel : { value: function(e)          {  this._snapAlignEnabledAppLevel = e;                  }},
-        snapAlignEnabledAppLevel : { value: function()          {  return this._snapAlignEnabledAppLevel;               }},
+    enableSnapAlignAppLevel : { value: function(e)      {  this._snapAlignEnabledAppLevel = e;          }},
+    snapAlignEnabledAppLevel : { value: function()      {  return this._snapAlignEnabledAppLevel;       }},