Merge branch 'master' of dev.sourcefabric.org:airtime
This commit is contained in:
commit
6cf4310c24
11 changed files with 44 additions and 23 deletions
|
@ -340,10 +340,6 @@ function createPlaylistMetaForm(json) {
|
|||
data = $("#side_playlist form").serialize();
|
||||
|
||||
$.post(url, data, function(json){
|
||||
if(json.form){
|
||||
|
||||
}
|
||||
|
||||
openDiffSPL(json);
|
||||
})
|
||||
});
|
||||
|
|
|
@ -25,15 +25,12 @@ function endDpSelect(dateText, inst) {
|
|||
|
||||
function createDateInput(el, onSelect) {
|
||||
var date;
|
||||
|
||||
|
||||
el.datepicker({
|
||||
minDate: new Date(),
|
||||
onSelect: onSelect,
|
||||
dateFormat: 'yy-mm-dd'
|
||||
});
|
||||
|
||||
date = $.datepicker.formatDate("yy-mm-dd", new Date());
|
||||
el.val(date);
|
||||
}
|
||||
|
||||
function autoSelect(event, ui) {
|
||||
|
|
|
@ -124,7 +124,7 @@ function viewDisplay( view ) {
|
|||
opt.defaultView = view.name;
|
||||
$(calendarEl).fullCalendar('destroy');
|
||||
$(calendarEl).fullCalendar(opt);
|
||||
$(calendarEl).fullCalendar( 'gotoDate', d )
|
||||
$(calendarEl).fullCalendar( 'gotoDate', d );
|
||||
});
|
||||
|
||||
var x = $(view.element).find(".fc-agenda-head th:first");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue