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/Track.reel/Track.html | 40 ++++++++++++++++----------------
js/panels/Timeline/Track.reel/Track.js | 2 +-
2 files changed, 21 insertions(+), 21 deletions(-)
(limited to 'js/panels/Timeline/Track.reel')
diff --git a/js/panels/Timeline/Track.reel/Track.html b/js/panels/Timeline/Track.reel/Track.html
index 6be86ef6..bc4a5301 100644
--- a/js/panels/Timeline/Track.reel/Track.html
+++ b/js/panels/Timeline/Track.reel/Track.html
@@ -29,10 +29,10 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
</copyright> -->
<html lang="en">
- <head>
- <meta http-equiv="content-type" content="text/html; charset=utf-8" />
- <link rel="stylesheet" type="text/css" href="css/Track.css">
- <script type="text/montage-serialization">
+ <head>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+ <link rel="stylesheet" type="text/css" href="css/Track.css">
+ <script type="text/montage-serialization">
{
"owner": {
"prototype": "js/panels/Timeline/Track.reel",
@@ -58,30 +58,30 @@ POSSIBILITY OF SUCH DAMAGE.
},
"spanRepetition": {
- "prototype": "montage/ui/repetition.reel",
- "properties": {
- "element": {"#": "track_lanes"},
- "isSelectionEnabled" : true
- },
- "bindings": {
- "objects": {
- "boundObject": {"@": "owner"},
- "boundObjectPropertyPath": "spans",
- "oneway": false
- }
- }
+ "prototype": "montage/ui/repetition.reel",
+ "properties": {
+ "element": {"#": "track_lanes"},
+ "isSelectionEnabled" : true
+ },
+ "bindings": {
+ "objects": {
+ "boundObject": {"@": "owner"},
+ "boundObjectPropertyPath": "spans",
+ "oneway": false
+ }
+ }
}
}
</script>
- </head>
- <body>
+ </head>
+ <body>
- <div data-montage-id="track">
+ <div data-montage-id="track">
<div data-montage-id="track_lanes">
<div data-montage-id="track_lane" class="tracklane"></div>
</div>
- </div>
+ </div>
</body>
</html>
diff --git a/js/panels/Timeline/Track.reel/Track.js b/js/panels/Timeline/Track.reel/Track.js
index e1b03525..57944652 100644
--- a/js/panels/Timeline/Track.reel/Track.js
+++ b/js/panels/Timeline/Track.reel/Track.js
@@ -105,7 +105,7 @@ var Track = exports.Track = Montage.create(Component, {
//TEMP
keyFrames:{
- serializable: true,
+ serializable: true,
value:[]
},
--
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/Track.reel/Track.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'js/panels/Timeline/Track.reel')
diff --git a/js/panels/Timeline/Track.reel/Track.js b/js/panels/Timeline/Track.reel/Track.js
index 57944652..2e761c4a 100644
--- a/js/panels/Timeline/Track.reel/Track.js
+++ b/js/panels/Timeline/Track.reel/Track.js
@@ -108,7 +108,7 @@ var Track = exports.Track = Montage.create(Component, {
serializable: true,
value:[]
},
-
+
prepareForDraw: {
value: function() {
this.keyFrames = new Array();
@@ -187,7 +187,7 @@ var Track = exports.Track = Montage.create(Component, {
updateKeyframePercents:{
value:function(){
-
+
}
},
--
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/Track.reel/Track.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'js/panels/Timeline/Track.reel')
diff --git a/js/panels/Timeline/Track.reel/Track.html b/js/panels/Timeline/Track.reel/Track.html
index bc4a5301..f8523a08 100644
--- a/js/panels/Timeline/Track.reel/Track.html
+++ b/js/panels/Timeline/Track.reel/Track.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
<!-- <copyright>
Copyright (c) 2012, Motorola Mobility, Inc
All Rights Reserved.
--
cgit v1.2.3
From 40c6eb2c06b34f65a74d59ef9687251952858bab Mon Sep 17 00:00:00 2001
From: Kris Kowal
Date: Fri, 6 Jul 2012 12:47:27 -0700
Subject: Normalize HTML doctype
---
js/panels/Timeline/Track.reel/Track.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'js/panels/Timeline/Track.reel')
diff --git a/js/panels/Timeline/Track.reel/Track.html b/js/panels/Timeline/Track.reel/Track.html
index f8523a08..6c977f1a 100644
--- a/js/panels/Timeline/Track.reel/Track.html
+++ b/js/panels/Timeline/Track.reel/Track.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
<!-- <copyright>
Copyright (c) 2012, Motorola Mobility, Inc
All Rights Reserved.
--
cgit v1.2.3