aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
diff options
context:
space:
mode:
authorKruti Shah2012-07-16 16:27:58 -0700
committerKruti Shah2012-07-16 16:27:58 -0700
commitcdcc677c827b65e3c689d4207c0117f94e4d6d57 (patch)
treeb5bdfe71a60840a351bafff699ba819e40525a23 /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
parentec15c5ed111f8d2608941c2ce86fb4b6f68117a0 (diff)
downloadninja-cdcc677c827b65e3c689d4207c0117f94e4d6d57.tar.gz
Styling of Zoom Slider + Grid Cut off limit taken care of + Hot text Bug (left,top,width,height) changing it now changes the element on stage
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js18
1 files changed, 18 insertions, 0 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 88b37563..0bf025ab 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -505,11 +505,13 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
505 }, 505 },
506 millisecondsOffset:{ 506 millisecondsOffset:{
507 get:function () { 507 get:function () {
508
508 return this._millisecondsOffset; 509 return this._millisecondsOffset;
509 }, 510 },
510 set:function (newVal) { 511 set:function (newVal) {
511 if (newVal !== this._millisecondsOffset) { 512 if (newVal !== this._millisecondsOffset) {
512 513
514 this.tempValue = newVal;
513 var tempValue = (1/newVal) * 1000000; 515 var tempValue = (1/newVal) * 1000000;
514 newVal = tempValue; 516 newVal = tempValue;
515 517
@@ -1704,6 +1706,22 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1704 } 1706 }
1705 }, 1707 },
1706 1708
1709 zoomTrackContainerWidthChange:{
1710 value:function () {
1711
1712 this.tempValue = this.tempValue/1000;
1713 this.tempValue *= 30;
1714
1715 this.container_tracks.style.width = (this.tempValue * 80) + "px";
1716 this.master_track.style.width = (this.tempValue * 80) + "px";
1717 this.time_markers.style.width = (this.tempValue * 80) + "px";
1718 if (this.timeMarkerHolder) {
1719 this.time_markers.removeChild(this.timeMarkerHolder);
1720 }
1721 this.drawTimeMarkers();
1722 }
1723 },
1724
1707 handleLayerScroll: { 1725 handleLayerScroll: {
1708 value:function () { 1726 value:function () {
1709 this._areTracksScrolling = true; 1727 this._areTracksScrolling = true;