Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CC-6135 - fix playlist bugs

This commit is contained in:
Duncan Sommerville 2015-09-04 16:11:41 -04:00
parent ba26adc904
commit 3dc8a5f98d
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
airtime_mvc/public/js/airtime/library/library.js
View File

@ -226,10 +226,11 @@ var AIRTIME = (function(AIRTIME) {
cItem, cItem,
$trs; $trs;
$.fn.reverse = [].reverse; //$.fn.reverse = [].reverse;
//$trs = $libTable.find("tr").reverse();
// Get visible items and check if any chosenItems are visible // Get visible items and check if any chosenItems are visible
$trs = $libTable.find("tr").reverse(); $trs = $libTable.find("tr");
$trs.each(function(i){ $trs.each(function(i){
for (cItem in chosenItems) { for (cItem in chosenItems) {
if (cItem === $(this).attr("id")) { if (cItem === $(this).attr("id")) {

8
airtime_mvc/public/js/airtime/library/spl.js
View File

@ -439,6 +439,10 @@ var AIRTIME = (function(AIRTIME){
$pl.find(".title_obj_name").text(title); $pl.find(".title_obj_name").text(title);
} }
function setTabName(name) {
var id = $pl.data("tab-id");
$("#show_builder").find("[data-tab-id='" + id + "']").find(".tab-name").text(name);
}
/* /*
* Should all be moved to builder.js eventually * Should all be moved to builder.js eventually
@ -980,7 +984,7 @@ var AIRTIME = (function(AIRTIME){
// We also need to run the draw callback to update how dragged items are drawn // We also need to run the draw callback to update how dragged items are drawn
AIRTIME.library.fnDrawCallback(); AIRTIME.library.fnDrawCallback();
var playlistNameElem = $pl.find('.playlist_name_display'); var playlistNameElem = $pl.siblings("[data-tab-id='" + tabId + "']").find('.playlist_name_display');
var name = ""; var name = "";
if (playlistNameElem.val() !== undefined) { if (playlistNameElem.val() !== undefined) {
name = playlistNameElem.val().trim(); name = playlistNameElem.val().trim();
@ -1028,6 +1032,7 @@ var AIRTIME = (function(AIRTIME){
} else { } else {
setTitleLabel(json.name); setTitleLabel(json.name);
setTabName(json.name);
mod.setModified(json.modified); mod.setModified(json.modified);
if (obj_type == "block") { if (obj_type == "block") {
@ -1080,6 +1085,7 @@ var AIRTIME = (function(AIRTIME){
aSelected = AIRTIME.library.getSelectedData(); aSelected = AIRTIME.library.getSelectedData();
for (i = 0, length = aSelected.length; i < length; i++) { for (i = 0, length = aSelected.length; i < length; i++) {
console.log(aSelected[i]);
aItems.push(new Array(aSelected[i].id, aSelected[i].ftype)); aItems.push(new Array(aSelected[i].id, aSelected[i].ftype));
} }