2 files changed, 19 insertions, 38 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 191228af..21ecdc39 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -538,33 +538,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },
 
-    updateTimeText:{
-        value:function (millisec) {
-            var timeText;
-            var sec = (Math.floor((millisec / 1000))) % 60;
-            var min = (Math.floor((millisec / 1000) / 60)) % 60;
-            var milliSec = String(Math.round(millisec / 10));
-            var returnMillisec = milliSec.slice(milliSec.length - 2, milliSec.length);
-            var returnSec;
-            var returnMin;
-            if (sec < 10) {
-                returnSec = "0" + sec;
-            } else {
-                returnSec = sec;
-            }
-            if (min < 10) {
-                returnMin = "0" + min;
-            } else {
-                returnMin = min;
-            }
-            if (millisec == 0) {
-                returnMillisec = "00";
-            }
-            timeText = returnMin + ":" + returnSec + ":" + returnMillisec;
-            this.timetext.innerHTML = timeText;
-        }
-    },
-
     deselectTweens:{
         value:function () {
             for (var i = 0; i < this.selectedTweens.length; i++) {
@@ -771,12 +744,24 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 
     calculateTimeMarkerValue:{
         value:function (currentMarker) {
-            var timeToReturn;
             var currentMilliseconds = currentMarker * this.millisecondsOffset;
-            var sec = (Math.floor((currentMilliseconds / 1000))) % 60;
-            var min = (Math.floor((currentMilliseconds / 1000) / 60)) % 60;
-            var milliSec = String(Math.round(currentMilliseconds / 10));
-            var returnMillisec = milliSec.slice(milliSec.length - 2, milliSec.length);
+            return this.convertMillisecondsToTime(currentMilliseconds);
+        }
+    },
+
+    updateTimeText:{
+        value:function (millisec) {
+            this.timetext.innerHTML = this.convertMillisecondsToTime(millisec);
+        }
+    },
+
+    convertMillisecondsToTime:{
+        value:function(millisec){
+            var timeToReturn;
+            var sec = (Math.floor((millisec / 1000))) % 60;
+            var min = (Math.floor((millisec / 1000) / 60)) % 60;
+            var milliSeconds = String(Math.round(millisec / 10));
+            var returnMillisec = milliSeconds.slice(milliSeconds.length - 2, milliSeconds.length);
             var returnSec;
             var returnMin;
             if (sec < 10) {
@@ -789,8 +774,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             } else {
                 returnMin = min;
             }
-            if (currentMarker == 0) {
-                returnMillisec = "00";
+            if (returnMillisec == "0") {
+                returnMillisec = "0" + returnMillisec;
             }
             timeToReturn = returnMin + ":" + returnSec + ":" + returnMillisec;
             return timeToReturn;
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 2096b3ce..601788ad 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -430,8 +430,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     draw:{
         value:function () {
             this.ninjaStylesContoller = this.application.ninja.stylesController;
-
-            // animatedElement going away - unneeded below
             var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
             if(this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList[0]){
                 this.animatedElement = this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList[0];
@@ -456,9 +454,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         value:function (ev) {
             // TEMP - if the SHIFT key is down, add a new keyframe or split an existing span
             // This needs to move to a keyboard shortcut that is TBD
-
             var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
-
             if (ev.shiftKey) {
                 if (this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList.length == 1) {
                     if (this.tweens.length < 1) {