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

Merge branch 'saas-dev' into saas-dev-publishing

Browse source 
Conflicts:
	airtime_mvc/public/js/airtime/library/spl.js
This commit is contained in:
Albert Santoni 2015-09-21 18:12:27 -04:00
commit 5bd8a508b1
8 changed files with 43 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -387,7 +387,7 @@ var AIRTIME = (function(AIRTIME){
redrawLib();
}
function setFadeIcon(){
mod.setFadeIcon = function() {
var contents = $pl.find(".spl_sortable");
var show = contents.is(":visible");
var empty = $pl.find(".spl_empty");
@ -899,7 +899,7 @@ var AIRTIME = (function(AIRTIME){
dt.fnStandingRedraw();
}
}
setFadeIcon();
mod.setFadeIcon();
disableLoadingIcon();
}
);
@ -1142,7 +1142,7 @@ var AIRTIME = (function(AIRTIME){
}
else {
setPlaylistContent(json);
setFadeIcon();
mod.setFadeIcon();
$pl.find('.errors').hide();
}
@ -1445,7 +1445,7 @@ var AIRTIME = (function(AIRTIME){
setPlaylistEntryEvents();
setCueEvents();
setFadeEvents();
setFadeIcon();
mod.setFadeIcon();
initialEvents();
setUpPlaylist();