Merge branch 'pentool' into brushtool

Conflicts:
	imports/codemirror/mode/scheme/scheme.js
	js/tools/BrushTool.js

1 files changed, 658 insertions, 0 deletions

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
new file mode 100644
index 00000000..0c5121cd
--- /dev/null
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -0,0 +1,658 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+
+var Montage = require("montage/core/core").Montage;
+var Component = require("montage/ui/component").Component;
+var Collapser = require("js/panels/Timeline/Collapser").Collapser;
+var defaultEventManager = require("montage/core/event/event-manager").defaultEventManager;
+
+var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
+
+    hasTemplate:{
+        value:true
+    },
+
+    _trackID:{
+        serializable:true,
+        value:null
+    },
+
+    trackID:{
+        serializable:true,
+        get:function () {
+            return this._trackID;
+        },
+        set:function (value) {
+            this._trackID = value;
+            this.needsDraw = true;
+        }
+    },
+
+    // Are the various collapsers collapsed or not
+    _isMainCollapsed:{
+        value:""
+    },
+    isMainCollapsed:{
+        get:function () {
+            return this._isMainCollapsed;
+        },
+        set:function (newVal) {
+            if (newVal !== this._isMainCollapsed) {
+                this._isMainCollapsed = newVal;
+                this.needsDraw = true;
+            }
+
+        }
+    },
+    _isTransformCollapsed:{
+        value:true
+    },
+    isTransformCollapsed:{
+        get:function () {
+            return this._isTransformCollapsed;
+        },
+        set:function (newVal) {
+            if (newVal !== this._isTransformCollapsed) {
+                this._isTransformCollapsed = newVal;
+                this.needsDraw = true;
+            }
+        }
+    },
+    _isPositionCollapsed:{
+        value:true
+    },
+    isPositionCollapsed:{
+        get:function () {
+            return this._isPositionCollapsed;
+        },
+        set:function (newVal) {
+            if (newVal !== this._isPositionCollapsed) {
+                this._isPositionCollapsed = newVal;
+                this.needsDraw = true;
+            }
+        }
+    },
+    _isStyleCollapsed:{
+        value:true
+    },
+    isStyleCollapsed:{
+        get:function () {
+            return this._isStyleCollapsed;
+        },
+        set:function (newVal) {
+            if (newVal !== this._isStyleCollapsed) {
+                this._isStyleCollapsed = newVal;
+                this.needsDraw = true;
+            }
+        }
+    },
+    
+    _arrStyleTracks : {
+        serializable:true,
+        enumerable:true,
+        value: []
+    },
+    arrStyleTracks: {
+        serializable:true,
+        enumerable:true,
+        get: function() {
+                return this._arrStyleTracks;
+        },
+        set: function(newVal) {
+                this._arrStyleTracks = newVal;
+                this.needsDraw = true;
+        }
+    },
+    _styleTracksRepetition: {
+        serializable: true,
+        value: null
+    },
+    styleTracksRepetition : {
+        serializable: true,
+        get: function() {
+                return this._styleTracksRepetition;
+        },
+        set: function(newVal) {
+                this._styleTracksRepetition = newVal;
+                this.needsDraw = true;
+        }
+    },
+    
+    /* Position Property Tracks */
+    _arrPositionTracks : {
+        serializable:true,
+        enumerable:true,
+        value: []
+    },
+    arrPositionTracks: {
+        serializable:true,
+        enumerable:true,
+        get: function() {
+                return this._arrPositionTracks;
+        },
+        set: function(newVal) {
+                this._arrPositionTracks = newVal;
+                this.needsDraw = true;
+        }
+    },
+    _positionTracksRepetition: {
+        serializable: true,
+        value: null
+    },
+    positionTracksRepetition : {
+        serializable: true,
+        get: function() {
+                return this._positionTracksRepetition;
+        },
+        set: function(newVal) {
+                this._positionTracksRepetition = newVal;
+                this.needsDraw = true;
+        }
+    },
+    
+    
+    /* Transform Property Tracks */
+    _arrTransformTracks : {
+        serializable:true,
+        enumerable:true,
+        value: []
+    },
+    arrTransformTracks: {
+        serializable:true,
+        enumerable:true,
+        get: function() {
+                return this._arrTransformTracks;
+        },
+        set: function(newVal) {
+                this._arrTransformTracks = newVal;
+                this.needsDraw = true;
+        }
+    },
+    _transformTracksRepetition: {
+        serializable: true,
+        value: null
+    },
+    transformTracksRepetition : {
+        serializable: true,
+        get: function() {
+                return this._transformTracksRepetition;
+        },
+        set: function(newVal) {
+                this._transformTracksRepetition = newVal;
+                this.needsDraw = true;
+        }
+    },
+
+    _tweens:{
+        enumerable: false,
+        value:[]
+    },
+
+    tweens:{
+        serializable:true,
+        get:function () {
+            return this._tweens;
+        },
+        set:function (newVal) {
+            this._tweens = newVal;
+            this.needsDraw=true;
+        }
+    },
+
+    _tweenRepetition:{
+        serializable:true,
+        value:null
+    },
+
+    tweenRepetition:{
+        serializable:true,
+        get:function () {
+            return this._spanRepetition;
+        },
+        set:function (newVal) {
+            this._spanRepetition = newVal;
+        }
+    },