From 648ee61ae84216d0236e0dbc211addc13b2cfa3a Mon Sep 17 00:00:00 2001
From: Kris Kowal
Date: Fri, 6 Jul 2012 11:52:06 -0700
Subject: Expand tabs
---
js/panels/Timeline/Keyframe.reel/Keyframe.html | 14 +++---
js/panels/Timeline/Keyframe.reel/Keyframe.js | 60 +++++++++++++-------------
2 files changed, 37 insertions(+), 37 deletions(-)
(limited to 'js/panels/Timeline/Keyframe.reel')
diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.html b/js/panels/Timeline/Keyframe.reel/Keyframe.html
index 9f8baf86..fc11e0d9 100644
--- a/js/panels/Timeline/Keyframe.reel/Keyframe.html
+++ b/js/panels/Timeline/Keyframe.reel/Keyframe.html
@@ -29,9 +29,9 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
-->
-
-
-
+
+
diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.js b/js/panels/Timeline/Keyframe.reel/Keyframe.js
index 9ded9c76..1d79efc3 100644
--- a/js/panels/Timeline/Keyframe.reel/Keyframe.js
+++ b/js/panels/Timeline/Keyframe.reel/Keyframe.js
@@ -71,11 +71,11 @@ var Keyframe = exports.Keyframe = Montage.create(Component, {
value:function(){
this.element.addEventListener("click", this, false);
- // Drag and drop event handlers
- this.element.addEventListener("mouseover", this.handleMouseover.bind(this), false);
- this.element.addEventListener("mouseout", this.handleMouseout.bind(this), false);
- this.element.addEventListener("dragstart", this.handleDragstart.bind(this), false);
- this.element.addEventListener("dragend", this.handleDragend.bind(this), false);
+ // Drag and drop event handlers
+ this.element.addEventListener("mouseover", this.handleMouseover.bind(this), false);
+ this.element.addEventListener("mouseout", this.handleMouseout.bind(this), false);
+ this.element.addEventListener("dragstart", this.handleDragstart.bind(this), false);
+ this.element.addEventListener("dragend", this.handleDragend.bind(this), false);
}
},
@@ -125,38 +125,38 @@ var Keyframe = exports.Keyframe = Montage.create(Component, {
}
},
- handleMouseover: {
- value: function(event) {
- this.element.draggable = true;
- }
- },
- handleMouseout: {
- value: function(event) {
- this.element.draggable = false;
- }
- },
- handleDragstart: {
- value: function(event) {
- //this.parentComponent.parentComponent.dragLayerID = this.layerID;
+ handleMouseover: {
+ value: function(event) {
+ this.element.draggable = true;
+ }
+ },
+ handleMouseout: {
+ value: function(event) {
+ this.element.draggable = false;
+ }
+ },
+ handleDragstart: {
+ value: function(event) {
+ //this.parentComponent.parentComponent.dragLayerID = this.layerID;
event.dataTransfer.setData('Text', 'Keyframe');
// Get my index in my track's tween array
var i = 0,
- tweenRepetitionLength = this.parentComponent.parentComponent.parentComponent.tweenRepetition.childComponents.length,
- myIndex = null;
+ tweenRepetitionLength = this.parentComponent.parentComponent.parentComponent.tweenRepetition.childComponents.length,
+ myIndex = null;
for (i = 0; i < tweenRepetitionLength; i++) {
- if (this.parentComponent.parentComponent.parentComponent.tweenRepetition.childComponents[i].uuid === this.parentComponent.uuid) {
- myIndex = i;
- }
+ if (this.parentComponent.parentComponent.parentComponent.tweenRepetition.childComponents[i].uuid === this.parentComponent.uuid) {
+ myIndex = i;
+ }
}
this.parentComponent.parentComponent.parentComponent.draggingIndex = myIndex;
this.selectKeyframe();
- }
- },
- handleDragend: {
- value: function(event) {
- this.parentComponent.isDragging = false;
- }
- }
+ }
+ },
+ handleDragend: {
+ value: function(event) {
+ this.parentComponent.isDragging = false;
+ }
+ }
});
--
cgit v1.2.3
From 04343eda8c2f870b0da55cfdc8003c99fe1cc4de Mon Sep 17 00:00:00 2001
From: Kris Kowal
Date: Fri, 6 Jul 2012 11:53:10 -0700
Subject: Remove trailing spaces
---
js/panels/Timeline/Keyframe.reel/Keyframe.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'js/panels/Timeline/Keyframe.reel')
diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.js b/js/panels/Timeline/Keyframe.reel/Keyframe.js
index 1d79efc3..201b912c 100644
--- a/js/panels/Timeline/Keyframe.reel/Keyframe.js
+++ b/js/panels/Timeline/Keyframe.reel/Keyframe.js
@@ -70,7 +70,7 @@ var Keyframe = exports.Keyframe = Montage.create(Component, {
prepareForDraw:{
value:function(){
this.element.addEventListener("click", this, false);
-
+
// Drag and drop event handlers
this.element.addEventListener("mouseover", this.handleMouseover.bind(this), false);
this.element.addEventListener("mouseout", this.handleMouseout.bind(this), false);
@@ -124,7 +124,7 @@ var Keyframe = exports.Keyframe = Montage.create(Component, {
ev.stopPropagation();
}
},
-
+
handleMouseover: {
value: function(event) {
this.element.draggable = true;
@@ -139,7 +139,7 @@ var Keyframe = exports.Keyframe = Montage.create(Component, {
value: function(event) {
//this.parentComponent.parentComponent.dragLayerID = this.layerID;
event.dataTransfer.setData('Text', 'Keyframe');
-
+
// Get my index in my track's tween array
var i = 0,
tweenRepetitionLength = this.parentComponent.parentComponent.parentComponent.tweenRepetition.childComponents.length,
@@ -158,5 +158,5 @@ var Keyframe = exports.Keyframe = Montage.create(Component, {
this.parentComponent.isDragging = false;
}
}
-
+
});
--
cgit v1.2.3
From 9461e7731f91dd03a15b0a62667e722a60c84721 Mon Sep 17 00:00:00 2001
From: Kris Kowal
Date: Fri, 6 Jul 2012 12:44:57 -0700
Subject: Remove byte order markers (BOM)
---
js/panels/Timeline/Keyframe.reel/Keyframe.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'js/panels/Timeline/Keyframe.reel')
diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.html b/js/panels/Timeline/Keyframe.reel/Keyframe.html
index fc11e0d9..6ef5c068 100644
--- a/js/panels/Timeline/Keyframe.reel/Keyframe.html
+++ b/js/panels/Timeline/Keyframe.reel/Keyframe.html
@@ -1,4 +1,4 @@
-
+