Merge branch 'Timeline-latest-change' of github.com:ntfx47/ninja-internal into TimelineUber

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css

Signed-off-by: Jonathan Duran <jduran@motorola.com>

4 files changed, 139 insertions, 1 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 3833a891..9eb126e0 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -119,6 +119,24 @@
                         
                         }
                     },
+
+                "timelineZoomSlider":{
+                    "module":"js/components/slider.reel",
+                    "name":"Slider",
+                    "properties":{
+                        "element":{"#":"tl_slider"},
+                        "maxValue" : 10000,
+                        "minValue" : 1000
+                    },
+                    "bindings": {
+                        "value": {
+                            "boundObject": {"@": "owner"},
+                            "boundObjectPropertyPath": "millisecondsOffset",
+                            "oneway": false
+                        }
+                    }
+                },
+
                 "endHottext" : {
                     "module": "js/components/hottextunit.reel",
                     "name": "HotTextUnit",
@@ -168,6 +186,7 @@
                         </div>
 
                         <div id="timeline_gutter" class="timelinegutter">
+                            <div id="tl_slider" class="tl_slider"></div>
                             <input id="end_hottext" class="endhottext">
                         </div>
                     </div>
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 5e64c066..cb133f58 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -137,10 +137,33 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },
 
-    millisecondsOffset:{
+    _millisecondsOffset:{
         value:1000
     },
 
+    millisecondsOffset:{
+        get:function () {
+            return this._millisecondsOffset;
+    },
+        set:function (newVal) {
+            if (newVal !== this._millisecondsOffset) {
+                this._millisecondsOffset= newVal;
+                this.drawTimeMarkers();
+                NJevent('tlZoomSlider',this);
+            }
+        }
+    },
+
+    tweenarray:{
+            value:[],
+            writable:true
+    },
+
+    tempArray:{
+        value:[],
+        writable:true
+    },
+
     _masterDuration:{
         serializable:true,
         value:0
@@ -487,6 +510,14 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                     }
                     // Feed the new array of objects into the repetitions.
                     this.arrLayers = this.temparrLayers;
+                }else if(this.application.ninja.breadCrumbClick){
+                    var parentNode = this.application.ninja.currentSelectedContainer;
+                    for (myIndex = 0; parentNode.children[myIndex]; myIndex++) {
+                        this._openDoc = true;
+                        this.restoreLayer(parentNode.children[myIndex]);
+                    }
+                    this.arrLayers = this.temparrLayers;
+
                 }
 
                 // After recreating the tracks and layers, store the result in the currentDocument.
@@ -770,6 +801,11 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     drawTimeMarkers:{
         value:function () {
             this.timeMarkerHolder = document.createElement("div");
+
+            if(this.time_markers.children[0]){
+               this.time_markers.removeChild(this.time_markers.children[0]);
+            }
+
             this.time_markers.appendChild(this.timeMarkerHolder);
             var i;
             var totalMarkers = Math.floor(this.time_markers.offsetWidth / 80);
diff --git a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
index b9d45979..7dddaba7 100644
--- a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
+++ b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
@@ -272,6 +272,7 @@
     font-size: 12px;
     text-shadow: 1px 1px 1px black;
     color: white;
+    margin-top: 0%;
 }
 .timeline-disabled {
         position: absolute;
@@ -287,3 +288,10 @@
 .timeline-dnd-helper {
         -webkit-transform: scale(.9, .9);
 }
+.tl_slider{
+    width: 65px;
+    height: 5px;
+    background: none;
+    float:left;
+    margin-left: 5%;
+}
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index 77aeb4a7..28c9a585 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -44,6 +44,7 @@ var Tween = exports.Tween = Montage.create(Component, {
         },
         set: function(value){
             this._spanWidth = value;
+            this.needsDraw=true;
         }
     },
 
@@ -58,6 +59,7 @@ var Tween = exports.Tween = Montage.create(Component, {
         },
         set:function (value) {
             this._spanPosition = value;
+            this.needsDraw=true;
         }
     },
 
@@ -72,6 +74,7 @@ var Tween = exports.Tween = Montage.create(Component, {
         },
         set:function (value) {
             this._keyFramePosition = value;
+            this.needsDraw=true;
         }
     },
 
@@ -133,6 +136,12 @@ var Tween = exports.Tween = Montage.create(Component, {
         }
     },
 
+    prepareForDraw:{
+        value:function(){
+            this.eventManager.addEventListener("tlZoomSlider", this, false);
+        }
+    },
+
     draw:{
         value:function () {
             this.element.style.left = this.spanPosition + "px";
@@ -218,5 +227,71 @@ var Tween = exports.Tween = Montage.create(Component, {
             // deselect the keyframe for this tween
             this.keyframe.deselectKeyframe();
         }
+    },
+
+    handleTlZoomSlider:{
+        value:function(event){
+            var currentMilliSecPerPixel , currentMilliSec , clickPos,i=0;
+
+            length = this.application.ninja.timeline.tempArray.length;
+            if(length > 0 && this.application.ninja.timeline.tempArray[length-1]!== this.parentComponent.parentComponent.trackID){
+                this.application.ninja.timeline.tempArray.push(this.parentComponent.parentComponent.trackID);
+                var i = this.application.ninja.timeline.tweenarray.length-1;
+                for(;this.currentTween = this.application.ninja.timeline.tweenarray[i];i--){
+                    if(this.application.ninja.timeline.tweenarray[i].tweenID===0){
+                        this.currentTween.spanWidth=0;
+                        this.currentTween.spanPosition=0;
+                        this.currentTween.keyFramePosition=0;
+                        this.currentTween.keyFrameMillisec=0;
+                        this.needsDraw=true;
+                    }else{
+                        currentMilliSecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80);
+                        currentMilliSec = this.currentTween.keyFrameMillisec;