From 332f9993c0890a52101bf9cecb8c0283b2325021 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Mon, 29 Oct 2012 15:20:16 -0400
Subject: [PATCH] CC-4640: Automatically jump to current song when loading the
 Now Playing page.

-done
---
 .../public/js/airtime/showbuilder/builder.js  | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js
index fc8463481..daf44a510 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js
@@ -339,11 +339,23 @@ var AIRTIME = (function(AIRTIME){
         });
     };
     
+    mod.jumpToCurrentTrack = function() {
+        var $scroll = $sbContent.find(".dataTables_scrolling");
+        var scrolled = $scroll.scrollTop();
+        var scrollingTop = $scroll.offset().top;
+        var oTable = $('#show_builder_table').dataTable();
+        var current = $sbTable.find("."+NOW_PLAYING_CLASS);
+        var currentTop = current.offset().top;
+
+        $scroll.scrollTop(currentTop - scrollingTop + scrolled);
+    }
+    
     mod.builderDataTable = function() {
         $sbContent = $('#show_builder');
         $lib = $("#library_content"),
         $sbTable = $sbContent.find('table');
-        
+        var isInitialized = false;
+
         oSchedTable = $sbTable.dataTable( {
             "aoColumns": [
             /* checkbox */ {"mDataProp": "allowed", "sTitle": "", "sWidth": "15px", "sClass": "sb-checkbox"},
@@ -636,6 +648,11 @@ var AIRTIME = (function(AIRTIME){
                 $("#draggingContainer").remove();
             },
             "fnDrawCallback": function fnBuilderDrawCallback(oSettings, json) {
+                if (!isInitialized) {
+                    mod.jumpToCurrentTrack();
+                }
+
+                isInitialized = true;
                 var wrapperDiv,
                     markerDiv,
                     $td,
@@ -1021,7 +1038,7 @@ var AIRTIME = (function(AIRTIME){
                 if (AIRTIME.button.isDisabled('icon-step-forward', true) === true) {
                     return;
                 }
-                
+                /*
                 var $scroll = $sbContent.find(".dataTables_scrolling"),
                     scrolled = $scroll.scrollTop(),
                     scrollingTop = $scroll.offset().top,
@@ -1029,6 +1046,8 @@ var AIRTIME = (function(AIRTIME){
                     currentTop = current.offset().top;
         
                 $scroll.scrollTop(currentTop - scrollingTop + scrolled);
+                */
+                mod.jumpToCurrentTrack();
             });
         
         //delete overbooked tracks.
@@ -1196,7 +1215,7 @@ var AIRTIME = (function(AIRTIME){
                 };
     
             }
-        }); 
+        });
     };
     
     return AIRTIME;