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

Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x

Browse source
This commit is contained in:
Naomi Aro 2013-06-20 14:03:56 -04:00
commit 157f66bb74
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -485,7 +485,7 @@ var AIRTIME = (function(AIRTIME){
$image, $image,
$div, $div,
headerIcon; headerIcon;
fnPrepareSeparatorRow = function fnPrepareSeparatorRow(sRowContent, sClass, iNodeIndex) { fnPrepareSeparatorRow = function fnPrepareSeparatorRow(sRowContent, sClass, iNodeIndex) {
$node = $(nRow.children[iNodeIndex]); $node = $(nRow.children[iNodeIndex]);
$node.html(sRowContent); $node.html(sRowContent);
@ -620,7 +620,7 @@ var AIRTIME = (function(AIRTIME){
} }
$node = $(nRow.children[0]); $node = $(nRow.children[0]);
if (aData.allowed === true && aData.scheduled >= 1) { if (aData.allowed === true && aData.scheduled >= 1 && aData.linked_allowed) {
$node.html('<input type="checkbox" name="'+aData.id+'"></input>'); $node.html('<input type="checkbox" name="'+aData.id+'"></input>');
} }
else { else {
@ -841,7 +841,7 @@ var AIRTIME = (function(AIRTIME){
}); });
$sbTable.find("tbody").on("click", "input:checkbox", function(ev) { $sbTable.find("tbody").on("click", "input:checkbox", function(ev) {
var $cb = $(this), var $cb = $(this),
$tr = $cb.parents("tr"), $tr = $cb.parents("tr"),
$prev; $prev;