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, 297 insertions, 296 deletions

diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js
index d3977106..6f9766c6 100755
--- a/js/io/system/coreioapi.js
+++ b/js/io/system/coreioapi.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
@@ -32,87 +33,87 @@ POSSIBILITY OF SUCH DAMAGE.
 ////////////////////////////////////////////////////////////////////////
 NOTES:
 
-        Core API reference in NINJA: this.application.ninja.coreIoApi
-        
+    Core API reference in NINJA: this.application.ninja.coreIoApi
+
 ////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////// */
-var Montage =           require("montage/core/core").Montage,
-    Component =         require("montage/ui/component").Component,
-    Popup =             require("js/components/popup.reel").Popup,
-    CloudPopup =        require("js/io/ui/cloudpopup.reel").CloudPopup,
-    ChromeApi =         require("js/io/system/chromeapi").ChromeApi,
-    NinjaLibrary =      require("js/io/system/ninjalibrary").NinjaLibrary;
+var Montage =       require("montage/core/core").Montage,
+    Component =     require("montage/ui/component").Component,
+    Popup =         require("js/components/popup.reel").Popup,
+    CloudPopup =    require("js/io/ui/cloudpopup.reel").CloudPopup,
+    ChromeApi =     require("js/io/system/chromeapi").ChromeApi,
+    NinjaLibrary =  require("js/io/system/ninjalibrary").NinjaLibrary;
 ////////////////////////////////////////////////////////////////////////
 //Exporting as Project I/O
 exports.CoreIoApi = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
     //
-        deserializedFromTemplate: {
-                enumerable: false,
-                value: function () {
-                        ////////////////////////////////////////////////////////////
-                        //Checking for local storage of URL for IO
+    deserializedFromTemplate: {
+        enumerable: false,
+        value: function () {
+            ////////////////////////////////////////////////////////////
+            //Checking for local storage of URL for IO
             if (this.application.localStorage.getItem("ioRootUrl")) {
-                                //Getting URL from local storage
+                //Getting URL from local storage
                 this.rootUrl = this.application.localStorage.getItem("ioRootUrl");
-                                //Checks for IO API to be active
-                                this.ioServiceDetected = this.cloudAvailable();
-                        } else {
-                                //IO API to be inactive
-                                this.ioServiceDetected = false;
-                        }
-                        ////////////////////////////////////////////////////////////
-                        //Instance of ninja library
-                        this.ninjaLibrary = NinjaLibrary;
-                        this.ninjaLibrary.coreApi = this;
-                        //Getting reference of chrome file system API
-                        this.chromeFileSystem = ChromeApi;
-                        //Sending size in MBs for file system storage
-                        var chromeFs = this.chromeFileSystem.init(20);
-                        //Checking for availability of API
-                        if (chromeFs) {
-                                this.chromeFileSystem.addEventListener('ready', this, false);
-                        } else {
-                                //Error, Chrome File System API not detected
-                        }
-                        ////////////////////////////////////////////////////////////
-                }
-        },
-        ////////////////////////////////////////////////////////////////////
+                //Checks for IO API to be active
+                this.ioServiceDetected = this.cloudAvailable();
+            } else {
+                //IO API to be inactive
+                this.ioServiceDetected = false;
+            }
+            ////////////////////////////////////////////////////////////
+            //Instance of ninja library
+            this.ninjaLibrary = NinjaLibrary;
+            this.ninjaLibrary.coreApi = this;
+            //Getting reference of chrome file system API
+            this.chromeFileSystem = ChromeApi;
+            //Sending size in MBs for file system storage
+            var chromeFs = this.chromeFileSystem.init(20);
+            //Checking for availability of API
+            if (chromeFs) {
+                this.chromeFileSystem.addEventListener('ready', this, false);
+            } else {
+                //Error, Chrome File System API not detected
+            }
+            ////////////////////////////////////////////////////////////
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
     //
-        handleReady: {
-                enumerable: false,
+    handleReady: {
+        enumerable: false,
         value: function (e) {
-                //Removing events
-                this.chromeFileSystem.removeEventListener('ready', this, false);
-                //Listening for library to be copied event (builds list)
-                this.chromeFileSystem.addEventListener('library', this, false);
-                //TODO: Add sync loading screen logic (Add screen here)
+            //Removing events
+            this.chromeFileSystem.removeEventListener('ready', this, false);
+            //Listening for library to be copied event (builds list)
+            this.chromeFileSystem.addEventListener('library', this, false);
+            //TODO: Add sync loading screen logic (Add screen here)
         }
-        },
-        ////////////////////////////////////////////////////////////////////
+    },
+    ////////////////////////////////////////////////////////////////////
     //
-        handleLibrary: {
-                enumerable: false,
+    handleLibrary: {
+        enumerable: false,
         value: function (e) {
-                //Removing events
-                this.chromeFileSystem.removeEventListener('library', this, false);
-                //Listening for synced library event
-                this.ninjaLibrary.addEventListener('sync', this, false);
-                //Sending library to be synced to chrome
-                this.ninjaLibrary.synchronize(e._event.ninjaChromeLibrary, this.chromeFileSystem);
-                
+            //Removing events
+            this.chromeFileSystem.removeEventListener('library', this, false);
+            //Listening for synced library event
+            this.ninjaLibrary.addEventListener('sync', this, false);
+            //Sending library to be synced to chrome
+            this.ninjaLibrary.synchronize(e._event.ninjaChromeLibrary, this.chromeFileSystem);
+
         }
-        },
-        ////////////////////////////////////////////////////////////////////
+    },
+    ////////////////////////////////////////////////////////////////////
     //
-        handleSync: {
-                enumerable: false,
+    handleSync: {
+        enumerable: false,
         value: function (e) {
-                console.log('Ninja Local Library: Ready');
-                //Removing events
-                this.ninjaLibrary.removeEventListener('sync', this, false);
-                //TODO: Add sync loading screen logic (Remove screen here)
+            console.log('Ninja Local Library: Ready');
+            //Removing events
+            this.ninjaLibrary.removeEventListener('sync', this, false);
+            //TODO: Add sync loading screen logic (Remove screen here)
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -124,12 +125,12 @@ exports.CoreIoApi = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
     //
     chromeNinjaLibrary: {
-        enumerable: false,
-        get: function() {
+        enumerable: false,
+        get: function() {
             return this._chromeNinjaLibrary;
         },
         set: function(value) {
-                this._chromeNinjaLibrary = value;
+            this._chromeNinjaLibrary = value;
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -141,15 +142,15 @@ exports.CoreIoApi = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
     //
     chromeFileSystem: {
-        enumerable: false,
-        get: function() {
+        enumerable: false,
+        get: function() {
             return this._chromeFileSystem;
         },
         set: function(value) {
-                this._chromeFileSystem = value;
+            this._chromeFileSystem = value;
         }
     },
-        ////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
     //