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-09-13 17:11:10 -04:00
commit c35c76351b
4 changed files with 29 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
airtime_mvc/application/models/Block.php
View file

@ -1297,6 +1297,9 @@ SQL;
$i++;
}
}
// check if file exists
$qry->add("file_exists", "true", Criteria::EQUAL);
$qry->addAscendingOrderByColumn('random()');
}
// construct limit restriction

4
airtime_mvc/public/js/airtime/library/spl.js
View file

@ -307,6 +307,7 @@ var AIRTIME = (function(AIRTIME){
setCueEvents();
setFadeEvents();
setModified(json.modified);
AIRTIME.playlist.validatePlaylistElements();
redrawLib();
}
@ -409,8 +410,6 @@ var AIRTIME = (function(AIRTIME){
$pl.delegate(".spl_cue",
{"click": openCueEditor});
mod.validatePlaylistElements();
$pl.delegate(".spl_block_expand",
{"click": function(ev){
@ -773,6 +772,7 @@ var AIRTIME = (function(AIRTIME){
}());
$pl.find("#spl_sortable").sortable(sortableConf);
AIRTIME.playlist.validatePlaylistElements();
}
mod.fnNew = function() {