Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local

Conflicts:
	js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
	Resolved by using both; both were needed.

4 files changed, 45 insertions, 2 deletions

diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index 9ee9b922..e5ff1e95 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -192,6 +192,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
             this.trackID = this.timelineTrack.trackID;
             this.animatedElement = this.timelineTrack.animatedElement;
             this.ninjaStylesContoller = this.application.ninja.stylesController;
+            this.eventManager.addEventListener("tlZoomSlider", this, false);
             
                         // Drag and Drop event handlers
             this.element.addEventListener("dragstart", this.handleKeyframeDragstart.bind(this), false);
@@ -286,6 +287,45 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
         }
     },
 
+    handleTlZoomSlider: {
+        value: function(event) {
+
+            var currentMilliSecPerPixel , currentMilliSec , clickPos,thingToPush;
+            var i = 0,
+                tweensLength = this.propTweens.length;
+
+            for (i = 0; i < tweensLength; i++) {
+
+                if (i === 0) {
+                    // Exception: 0th item does not depend on anything
+                    // If 0th tween is draggable, this will need to be fixed.
+                    this.propTweens[i].tweenData.spanWidth=0;
+                    this.propTweens[i].tweenData.spanPosition=0;
+                    this.propTweens[i].tweenData.keyFramePosition=0;
+                    this.propTweens[i].tweenData.keyFrameMillisec=0;
+
+                } else {
+                    var prevKeyFramePosition = this.propTweens[i - 1].tweenData.keyFramePosition,
+                        myObj = {},
+                        thing = {};
+
+                    currentMilliSecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80);
+                    currentMilliSec = this.propTweens[i].tweenData.keyFrameMillisec;
+                    clickPos = currentMilliSec / currentMilliSecPerPixel;
+
+                    for (thing in this.propTweens[i].tweenData) {
+                        myObj[thing] = this.propTweens[i].tweenData[thing];
+                    }
+                    myObj.spanWidth = clickPos - prevKeyFramePosition;
+                    myObj.keyFramePosition = clickPos;
+                    myObj.spanPosition = clickPos - (clickPos - prevKeyFramePosition);
+
+                    this.propTweens[i].tweenData = myObj;
+                }
+            }
+        }
+    },
+
     /* End: Event Handlers */
 
     /* Begin: Controllers */
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index c790466c..aafc3d1d 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -509,6 +509,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     },
         set:function (newVal) {
             if (newVal !== this._millisecondsOffset) {
+
+                var tempValue = (1/newVal) * 1000000;
+                newVal = tempValue;
+
                 this._millisecondsOffset= newVal;
                 this.drawTimeMarkers();
                 NJevent('tlZoomSlider',this);
diff --git a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
index f7e9234e..d8293d77 100644
--- a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
+++ b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
@@ -132,7 +132,7 @@ POSSIBILITY OF SUCH DAMAGE.
 .timeline-dnd-helper { -webkit-transform: scale(0.9, 0.9); }
 
 /* line 308, ../scss/TimelinePanel.scss */
-.tl_slider { width: 65px; height: 5px; background: none; float: left; margin-left: 5%; visibility: hidden; }
+.tl_slider { width: 65px; height: 5px; background: none; float: left; margin-left: 5%;}
 
 /* Configuration menu */
 /* line 318, ../scss/TimelinePanel.scss */
diff --git a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
index 460fe5e3..4fbcc400 100644
--- a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
+++ b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
@@ -335,7 +335,6 @@ POSSIBILITY OF SUCH DAMAGE.
     background: none;
     float:left;
     margin-left: 5%;
-    visibility: hidden;
 }
 
 /* Configuration menu */