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, 322 insertions, 321 deletions

diff --git a/js/document/mediators/template.js b/js/document/mediators/template.js
index 982b410f..4065f471 100755
--- a/js/document/mediators/template.js
+++ b/js/document/mediators/template.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,16 +31,16 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ////////////////////////////////////////////////////////////////////////
 //
-var Montage =                   require("montage/core/core").Montage,
-        Component =             require("montage/ui/component").Component,
-        TemplateCreator =       require("node_modules/tools/template/template-creator").TemplateCreator,
-        ClassUuid =             require("js/components/core/class-uuid").ClassUuid;
+var Montage =           require("montage/core/core").Montage,
+    Component =         require("montage/ui/component").Component,
+    TemplateCreator =   require("node_modules/tools/template/template-creator").TemplateCreator,
+    ClassUuid =         require("js/components/core/class-uuid").ClassUuid;
 ////////////////////////////////////////////////////////////////////////
-//      
+//
 exports.TemplateDocumentMediator = Montage.create(Component, {
-        ////////////////////////////////////////////////////////////////////
-        //
-        hasTemplate: {
+    ////////////////////////////////////////////////////////////////////
+    //
+    hasTemplate: {
         value: false
     },
     ////////////////////////////////////////////////////////////////////
@@ -53,55 +54,55 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
     //
     getDataDirectory: {
-        value: function (path) {
-                //TODO: Implement user overwrite
-                return this._getUserDirectory(path+'data/');
-        }
+        value: function (path) {
+            //TODO: Implement user overwrite
+            return this._getUserDirectory(path+'data/');
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
     getNinjaDirectory: {
-        value: function (path) {
-                //TODO: Implement user overwrite
-                return this._getUserDirectory(this.getDataDirectory(path)+'ninja/');
-        }
+        value: function (path) {
+            //TODO: Implement user overwrite
+            return this._getUserDirectory(this.getDataDirectory(path)+'ninja/');
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
     getCanvasDirectory: {
-        value: function (path) {
-                //TODO: Implement user overwrite
-                return this._getUserDirectory(this.getNinjaDirectory(path)+'canvas/');
-        }
+        value: function (path) {
+            //TODO: Implement user overwrite
+            return this._getUserDirectory(this.getNinjaDirectory(path)+'canvas/');
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
     _getUserDirectory: {
-        value: function (path) {
-                //Checking for data directory
+        value: function (path) {
+            //Checking for data directory
             var check = this.application.ninja.coreIoApi.fileExists({uri: path}), directory;
             //Creating directory if doesn't exists
             switch (check.status) {
-                case 204: //Exists
-                        directory = path;
-                        break;
-                case 404: //Doesn't exists
-                        directory = this.application.ninja.coreIoApi.createDirectory({uri: path});
-                        //Checking for success
-                        if (directory.status === 201) {
-                                directory = path;
-                        } else {
-                                //Error
-                                directory = null;
-                        }
-                        break;
-                default: //Error
-                        directory = null;
-                        break;
+                case 204: //Exists
+                    directory = path;
+                    break;
+                case 404: //Doesn't exists
+                    directory = this.application.ninja.coreIoApi.createDirectory({uri: path});
+                    //Checking for success
+                    if (directory.status === 201) {
+                        directory = path;
+                    } else {
+                        //Error
+                        directory = null;
+                    }
+                    break;
+                default: //Error
+                    directory = null;
+                    break;
             }
             //Returning the path to the directory on disk (null for any error)
             return directory;
-        }
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
@@ -109,7 +110,7 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
         value: function (html) {
             //Creating temp object to mimic HTML
             var doc = window.document.implementation.createHTMLDocument(), template, docHtmlTag,
-                hackHtml = document.createElement('html'), hackTag;
+                hackHtml = document.createElement('html'), hackTag;
             //Setting content to temp
             doc.getElementsByTagName('html')[0].innerHTML = html;
             //TODO: Improve this, very bad way of copying attributes (in a pinch to get it working)
@@ -118,13 +119,13 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
             docHtmlTag = doc.getElementsByTagName('html')[0];
             //Looping through the attributes to copy them
             if (hackTag) {
-                    for (var m in hackTag.attributes) {
-                                        if (hackTag.attributes[m].value) {
-                                                docHtmlTag.setAttribute(hackTag.attributes[m].name.replace(/ninjahtmlhack/gi, 'html'), hackTag.attributes[m].value.replace(/ninjahtmlhack/gi, 'html'));
-                                        }
-                                }
-                        }
-                        //Garbage collection
+                for (var m in hackTag.attributes) {
+                    if (hackTag.attributes[m].value) {
+                        docHtmlTag.setAttribute(hackTag.attributes[m].name.replace(/ninjahtmlhack/gi, 'html'), hackTag.attributes[m].value.replace(/ninjahtmlhack/gi, 'html'));
+                    }
+                }
+            }
+            //Garbage collection
             hackHtml = hackTag = null;
             //Creating return object
             return {head: doc.head.innerHTML, body: doc.body.innerHTML, document: doc};
@@ -134,42 +135,42 @@ exports.TemplateDocumentMediator = Montage.create(Component, {
     //TODO: Expand to allow more templates, clean up variables
     parseNinjaTemplateToHtml: {
         value: function (saveExternalData, template, ninjaWrapper, libCopyCallback) {
-                //TODO: Improve reference for rootUrl
+            //TODO: Improve reference for rootUrl
             var regexRootUrl,
-                rootUrl = this.application.ninja.coreIoApi.rootUrl + escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1])),
-                mjsCreator = template.mjsTemplateCreator.create(),
-                mJsSerialization,
-                toremovetags = [],
-                presentNodes,
-                montageTemplate;
+                rootUrl = this.application.ninja.coreIoApi.rootUrl + escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1])),
+                mjsCreator = template.mjsTemplateCreator.create(),
+                mJsSerialization,
+                toremovetags = [],
+                presentNodes,
+                montageTemplate;
             //Creating instance of template creator
             montageTemplate = mjsCreator.initWithDocument(template.document);
             //Setting up expression for parsing URLs
             regexRootUrl = new RegExp(rootUrl.replace(/\//gi, '\\\/'), 'gi');