Merge branch 'devel' into 2.3.x-saas

This commit is contained in:
Martin Konecny 2013-01-18 17:14:11 -05:00
commit 210336d20a
8 changed files with 100 additions and 92 deletions

View file

@ -116,7 +116,6 @@ var AIRTIME = (function(AIRTIME) {
alert($.i18n._("Please select a cursor position on timeline."));
return false;
}
console.log(aMediaIds);
AIRTIME.showbuilder.fnAdd(aMediaIds, aSchedIds);
};

View file

@ -1283,6 +1283,7 @@ $(document).ready(function() {
data = $("#edit-md-dialog form").serializeArray();
$.post(baseUrl+'library/edit-file-md', {format: "json", id: file_id, data: data}, function() {
$("#edit-md-dialog").dialog().remove();
oTable.fnStandingRedraw();
});
});

View file

@ -1,3 +1,3 @@
function redirectToLogin(){
window.location = "/Login"
window.location = baseUrl+"/Login"
}