Merge branch 'pentool' into brushtool

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

1 files changed, 61 insertions, 0 deletions

diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.js b/js/panels/Timeline/Keyframe.reel/Keyframe.js
new file mode 100644
index 00000000..859cdfb1
--- /dev/null
+++ b/js/panels/Timeline/Keyframe.reel/Keyframe.js
@@ -0,0 +1,61 @@
+/* <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 Keyframe = exports.Keyframe = Montage.create(Component, {
+
+    hasTemplate:{
+        value: true
+    },
+
+    _position:{
+        value:0
+    },
+
+    position:{
+        serializable:true,
+        get:function(){
+            return this._position;
+        },
+        set:function(value){
+            this._position = value;
+            this.needsDraw = true;
+        }
+    },
+
+    prepareForDraw:{
+        value:function(){
+            this.element.addEventListener("click", this, false);
+        }
+    },
+
+    draw:{
+        value:function(){
+            this.element.style.left = (this.position - 3) + "px";
+        }
+    },
+
+    deselectKeyframe:{
+        value:function(){
+            this.element.classList.remove("keyframeSelected");
+        }
+    },
+
+    selectKeyframe:{
+        value:function(){
+            this.element.classList.add("keyframeSelected");
+            this.parentComponent.selectTween();
+        }
+    },
+
+    handleClick:{
+        value:function(ev){
+            this.selectKeyframe();
+        }
+    }
+});