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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
denise 2012-05-03 13:56:05 -04:00
commit fe83a57fc8
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
View file

@ -9,11 +9,11 @@ var AIRTIME = (function(AIRTIME){
mod.checkAddButton = function() { mod.checkAddButton = function() {
var selected = mod.getChosenItemsLength(), var selected = mod.getChosenItemsLength(),
cursor = $('tr.cursor-selected-row'), $cursor = $('tr.cursor-selected-row'),
check = false; check = false;
//make sure library items are selected and a cursor is selected. //make sure library items are selected and a cursor is selected.
if (selected !== 0 && cursor.length !== 0) { if (selected !== 0 && $cursor.length !== 0) {
check = true; check = true;
} }
@ -100,7 +100,8 @@ var AIRTIME = (function(AIRTIME){
length, length,
temp, temp,
aMediaIds = [], aMediaIds = [],
aSchedIds = []; aSchedIds = [],
aData = [];
//process selected files/playlists. //process selected files/playlists.
for (i = 0, length = selected.length; i < length; i++) { for (i = 0, length = selected.length; i < length; i++) {
@ -108,7 +109,6 @@ var AIRTIME = (function(AIRTIME){
aMediaIds.push({"id": data.id, "type": data.ftype}); aMediaIds.push({"id": data.id, "type": data.ftype});
} }
aData = [];
$("#show_builder_table tr.cursor-selected-row").each(function(i, el){ $("#show_builder_table tr.cursor-selected-row").each(function(i, el){
aData.push($(el).prev().data("aData")); aData.push($(el).prev().data("aData"));
}); });

10
airtime_mvc/public/js/airtime/showbuilder/builder.js
View file

@ -5,6 +5,7 @@ var AIRTIME = (function(AIRTIME){
$sbContent, $sbContent,
$sbTable, $sbTable,
$toolbar, $toolbar,
$ul,
$lib; $lib;
if (AIRTIME.showbuilder === undefined) { if (AIRTIME.showbuilder === undefined) {
@ -56,7 +57,7 @@ var AIRTIME = (function(AIRTIME){
}; };
mod.checkTrimButton = function() { mod.checkTrimButton = function() {
$over = $sbTable.find(".sb-over"); var $over = $sbTable.find(".sb-over");
if ($over.length !== 0) { if ($over.length !== 0) {
AIRTIME.button.enableButton("sb-button-trim"); AIRTIME.button.enableButton("sb-button-trim");
@ -67,7 +68,7 @@ var AIRTIME = (function(AIRTIME){
}; };
mod.checkDeleteButton = function() { mod.checkDeleteButton = function() {
$selected = $sbTable.find("tbody").find("input:checkbox").filter(":checked"); var $selected = $sbTable.find("tbody").find("input:checkbox").filter(":checked");
if ($selected.length !== 0) { if ($selected.length !== 0) {
AIRTIME.button.enableButton("sb-button-delete"); AIRTIME.button.enableButton("sb-button-delete");
@ -78,7 +79,7 @@ var AIRTIME = (function(AIRTIME){
}; };
mod.checkJumpToCurrentButton = function() { mod.checkJumpToCurrentButton = function() {
$current = $sbTable.find(".sb-now-playing"); var $current = $sbTable.find(".sb-now-playing");
if ($current.length !== 0) { if ($current.length !== 0) {
AIRTIME.button.enableButton("sb-button-current"); AIRTIME.button.enableButton("sb-button-current");
@ -89,7 +90,7 @@ var AIRTIME = (function(AIRTIME){
}; };
mod.checkCancelButton = function() { mod.checkCancelButton = function() {
$current = $sbTable.find(".sb-current-show"); var $current = $sbTable.find(".sb-current-show");
if ($current.length !== 0) { if ($current.length !== 0) {
AIRTIME.button.enableButton("sb-button-cancel"); AIRTIME.button.enableButton("sb-button-cancel");
@ -784,6 +785,7 @@ var AIRTIME = (function(AIRTIME){
$ul.append('<li class="ui-state-default ui-state-disabled sb-button-current" title="Jump to the currently playing track"><span class="ui-icon ui-icon-arrowstop-1-s"></span></li>') $ul.append('<li class="ui-state-default ui-state-disabled sb-button-current" title="Jump to the currently playing track"><span class="ui-icon ui-icon-arrowstop-1-s"></span></li>')
.append('<li class="ui-state-default ui-state-disabled sb-button-cancel" title="Cancel current show"><span class="ui-icon ui-icon-eject"></span></li>'); .append('<li class="ui-state-default ui-state-disabled sb-button-cancel" title="Cancel current show"><span class="ui-icon ui-icon-eject"></span></li>');
$toolbar.append($ul); $toolbar.append($ul);
$ul = undefined;
$.contextMenu({ $.contextMenu({
selector: '#show_builder .ui-icon-document-b', selector: '#show_builder .ui-icon-document-b',