CC-4640: Automatically jump to current song when loading the Now Playing page.
-done
This commit is contained in:
parent
fdd889d7a8
commit
332f9993c0
|
@ -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() {
|
mod.builderDataTable = function() {
|
||||||
$sbContent = $('#show_builder');
|
$sbContent = $('#show_builder');
|
||||||
$lib = $("#library_content"),
|
$lib = $("#library_content"),
|
||||||
$sbTable = $sbContent.find('table');
|
$sbTable = $sbContent.find('table');
|
||||||
|
var isInitialized = false;
|
||||||
|
|
||||||
oSchedTable = $sbTable.dataTable( {
|
oSchedTable = $sbTable.dataTable( {
|
||||||
"aoColumns": [
|
"aoColumns": [
|
||||||
/* checkbox */ {"mDataProp": "allowed", "sTitle": "", "sWidth": "15px", "sClass": "sb-checkbox"},
|
/* checkbox */ {"mDataProp": "allowed", "sTitle": "", "sWidth": "15px", "sClass": "sb-checkbox"},
|
||||||
|
@ -636,6 +648,11 @@ var AIRTIME = (function(AIRTIME){
|
||||||
$("#draggingContainer").remove();
|
$("#draggingContainer").remove();
|
||||||
},
|
},
|
||||||
"fnDrawCallback": function fnBuilderDrawCallback(oSettings, json) {
|
"fnDrawCallback": function fnBuilderDrawCallback(oSettings, json) {
|
||||||
|
if (!isInitialized) {
|
||||||
|
mod.jumpToCurrentTrack();
|
||||||
|
}
|
||||||
|
|
||||||
|
isInitialized = true;
|
||||||
var wrapperDiv,
|
var wrapperDiv,
|
||||||
markerDiv,
|
markerDiv,
|
||||||
$td,
|
$td,
|
||||||
|
@ -1021,7 +1038,7 @@ var AIRTIME = (function(AIRTIME){
|
||||||
if (AIRTIME.button.isDisabled('icon-step-forward', true) === true) {
|
if (AIRTIME.button.isDisabled('icon-step-forward', true) === true) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
var $scroll = $sbContent.find(".dataTables_scrolling"),
|
var $scroll = $sbContent.find(".dataTables_scrolling"),
|
||||||
scrolled = $scroll.scrollTop(),
|
scrolled = $scroll.scrollTop(),
|
||||||
scrollingTop = $scroll.offset().top,
|
scrollingTop = $scroll.offset().top,
|
||||||
|
@ -1029,6 +1046,8 @@ var AIRTIME = (function(AIRTIME){
|
||||||
currentTop = current.offset().top;
|
currentTop = current.offset().top;
|
||||||
|
|
||||||
$scroll.scrollTop(currentTop - scrollingTop + scrolled);
|
$scroll.scrollTop(currentTop - scrollingTop + scrolled);
|
||||||
|
*/
|
||||||
|
mod.jumpToCurrentTrack();
|
||||||
});
|
});
|
||||||
|
|
||||||
//delete overbooked tracks.
|
//delete overbooked tracks.
|
||||||
|
@ -1196,7 +1215,7 @@ var AIRTIME = (function(AIRTIME){
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
return AIRTIME;
|
return AIRTIME;
|
||||||
|
|
Loading…
Reference in New Issue