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

Merge branch 'saas-dev' into saas-showbuilder

Browse source 
Conflicts:
	airtime_mvc/public/css/styles.css
This commit is contained in:
Duncan Sommerville 2015-07-20 12:23:11 -04:00
commit ba90b1f1eb
27 changed files with 454 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -283,6 +283,8 @@ var AIRTIME = (function(AIRTIME){
mod.enableUI();
//Unneccessary reload of the library pane after moving tracks in the showbuilder pane.
//$("#library_content").find("#library_display").dataTable().fnStandingRedraw();
getUsabilityHint();
};
mod.getSelectedCursors = function() {
@ -316,7 +318,7 @@ var AIRTIME = (function(AIRTIME){
mod.disableUI();
$.post(baseUrl+"showbuilder/schedule-add",
{"format": "json", "mediaIds": aMediaIds, "schedIds": aSchedIds},
{"format": "json", "mediaIds": aMediaIds, "schedIds": aSchedIds},
mod.fnItemCallback
);
};