From 648ee61ae84216d0236e0dbc211addc13b2cfa3a Mon Sep 17 00:00:00 2001
From: Kris Kowal
Date: Fri, 6 Jul 2012 11:52:06 -0700
Subject: Expand tabs
---
.../Timeline/PropertyTrack.reel/PropertyTrack.html | 28 +++++++++++-----------
.../Timeline/PropertyTrack.reel/PropertyTrack.js | 28 +++++++++++-----------
.../PropertyTrack.reel/scss/PropertyTrack.scss | 10 ++++----
3 files changed, 33 insertions(+), 33 deletions(-)
(limited to 'js/panels/Timeline/PropertyTrack.reel')
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html
index 3f646e81..fb91b6a1 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.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/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index 6c68fa63..85ceeb4b 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -212,10 +212,10 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
// check if there is an editor property assigned yet
// get this property track's editor prop name from layer data arrays
var selectIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID),
- currentSelectedStyleIndex = this.getCurrentSelectedStyleIndex(selectIndex);
+ currentSelectedStyleIndex = this.getCurrentSelectedStyleIndex(selectIndex);
if (this.trackType == "style") {
- //console.log("PropertyTrack.handleClick; selectIndex = ", selectIndex, "; styleIndex = ", currentSelectedStyleIndex)
+ //console.log("PropertyTrack.handleClick; selectIndex = ", selectIndex, "; styleIndex = ", currentSelectedStyleIndex)
if (this.application.ninja.timeline.arrLayers[selectIndex].layerData.arrLayerStyles[currentSelectedStyleIndex].editorProperty == null) {
console.log("Please enter a style property for this track before adding keyframes.");
return;
@@ -240,18 +240,18 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
},
getCurrentSelectedStyleIndex: {
- value: function(layerIndex) {
- var returnVal = false,
- i = 0,
- arrLayerStylesLength = this.application.ninja.timeline.arrLayers[layerIndex].layerData.arrLayerStyles.length;
- for (i = 0; i < arrLayerStylesLength; i++) {
- var currItem = this.application.ninja.timeline.arrLayers[layerIndex].layerData.arrLayerStyles[i];
- if (currItem.isSelected === true) {
- returnVal = i;
- }
- }
- return returnVal;
- }
+ value: function(layerIndex) {
+ var returnVal = false,
+ i = 0,
+ arrLayerStylesLength = this.application.ninja.timeline.arrLayers[layerIndex].layerData.arrLayerStyles.length;
+ for (i = 0; i < arrLayerStylesLength; i++) {
+ var currItem = this.application.ninja.timeline.arrLayers[layerIndex].layerData.arrLayerStyles[i];
+ if (currItem.isSelected === true) {
+ returnVal = i;
+ }
+ }
+ return returnVal;
+ }
},
handleNewPropTween:{
diff --git a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
index 38a16622..5fc35595 100644
--- a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
+++ b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
@@ -41,18 +41,18 @@ POSSIBILITY OF SUCH DAMAGE.
.content-main .collapsible-content .timeline-track {
- height: 18px;
+ height: 18px;
padding-top: 2px;
- border-bottom: 1px solid $color-menu-divider;
+ border-bottom: 1px solid $color-menu-divider;
background-image: url("../images/gridline.jpg");
}
.timeline-track .content-main {
- background-color: $color-menu-bg;
+ background-color: $color-menu-bg;
}
.prop-track .collapsible-content.collapsible-collapsed {
- overflow: hidden;
- height: 0px;
+ overflow: hidden;
+ height: 0px;
}
--
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/PropertyTrack.reel/PropertyTrack.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'js/panels/Timeline/PropertyTrack.reel')
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index 85ceeb4b..43ff34f9 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -238,7 +238,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
}
}
},
-
+
getCurrentSelectedStyleIndex: {
value: function(layerIndex) {
var returnVal = false,
--
cgit v1.2.3
From 6803c0abd279fcb640c38b3881b751bab982cbe0 Mon Sep 17 00:00:00 2001
From: Kris Kowal
Date: Fri, 6 Jul 2012 12:42:16 -0700
Subject: Remove trailing spaces
---
js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'js/panels/Timeline/PropertyTrack.reel')
diff --git a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
index 5fc35595..2127b92d 100644
--- a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
+++ b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
/* PropertyTrack.scss
* Main SCSS file for PropertyTrack component, compiled by SASS into the file css/PropertyTrack.css.
*/
-
+
// Import theme settings
@import "../../../../../scss/imports/themes/default/colors";
@import "../../../../../scss/imports/themes/default/mixins";
--
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/PropertyTrack.reel/PropertyTrack.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'js/panels/Timeline/PropertyTrack.reel')
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html
index fb91b6a1..568955ac 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html
@@ -1,4 +1,4 @@
-
+