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

Merge branch '2.5.x' into 2.5.x-albertenhancements

Browse source
This commit is contained in:
Duncan Sommerville 2015-02-24 10:45:52 -05:00
commit 69d588d2f6
53 changed files with 393 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

11
airtime_mvc/public/js/airtime/library/library.js
View file

@ -316,15 +316,24 @@ var AIRTIME = (function(AIRTIME) {
};
mod.fnDeleteItems = function(aMedia) {
//Prevent the user from spamming the delete button while the AJAX request is in progress
AIRTIME.button.disableButton("btn-group #sb-trash", false);
//Hack to immediately show the "Processing" div in DataTables to give the user some sort of feedback.
$(".dataTables_processing").css('visibility','visible');
$.post(baseUrl+"library/delete",
{"format": "json", "media": aMedia},
function(json){
if (json.message !== undefined) {
alert(json.message);
}
chosenItems = {};
oTable.fnStandingRedraw();
//Re-enable the delete button
AIRTIME.button.enableButton("btn-group #sb-trash", false);
});
};

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

@ -1059,7 +1059,10 @@ var AIRTIME = (function(AIRTIME){
"<i class='icon-white icon-ban-circle'></i></button></div>");
}
$toolbar.append($menu);
if (localStorage.getItem('user-type') != 'G') {
$toolbar.append($menu);
}
$menu = undefined;
$('#timeline-sa').click(function(){mod.selectAll();});