Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reduced the Now Playing screen AJAX on load from 9 to 2.

This commit is contained in:
Albert Santoni 2015-04-10 19:52:06 -04:00
parent 095ca86b34
commit b11e98ea24
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/controllers/ShowbuilderController.php
View File

@ -42,7 +42,7 @@ class ShowbuilderController extends Zend_Controller_Action
$this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.pluginAPI.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.pluginAPI.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.fnSetFilteringDelay.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.fnSetFilteringDelay.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.ColVis.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.ColVis.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.ColReorder.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); //$this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.ColReorder.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.FixedColumns.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.FixedColumns.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.columnFilter.js?'.$CC_CONFIG['airtime_version'], 'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.columnFilter.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');

2
airtime_mvc/public/js/airtime/library/library.js
View File

@ -530,12 +530,14 @@ var AIRTIME = (function(AIRTIME) {
}, },
"fnStateSave": function (oSettings, oData) { "fnStateSave": function (oSettings, oData) {
localStorage.setItem('datatables-library', JSON.stringify(oData)); localStorage.setItem('datatables-library', JSON.stringify(oData));
/*
$.ajax({ $.ajax({
url: baseUrl+"usersettings/set-library-datatable", url: baseUrl+"usersettings/set-library-datatable",
type: "POST", type: "POST",
data: {settings : oData, format: "json"}, data: {settings : oData, format: "json"},
dataType: "json" dataType: "json"
}); });
*/
colReorderMap = oData.ColReorder; colReorderMap = oData.ColReorder;
}, },

10
airtime_mvc/public/js/airtime/showbuilder/builder.js
View File

@ -439,13 +439,14 @@ var AIRTIME = (function(AIRTIME){
"fnStateSave": function fnStateSave(oSettings, oData) { "fnStateSave": function fnStateSave(oSettings, oData) {
localStorage.setItem('datatables-timeline', JSON.stringify(oData)); localStorage.setItem('datatables-timeline', JSON.stringify(oData));
/*
$.ajax({ $.ajax({
url: baseUrl+"usersettings/set-timeline-datatable", url: baseUrl+"usersettings/set-timeline-datatable",
type: "POST", type: "POST",
data: {settings : oData, format: "json"}, data: {settings : oData, format: "json"},
dataType: "json" dataType: "json"
}); });*/
}, },
"fnStateLoad": function fnBuilderStateLoad(oSettings) { "fnStateLoad": function fnBuilderStateLoad(oSettings) {
var settings = localStorage.getItem('datatables-timeline'); var settings = localStorage.getItem('datatables-timeline');
@ -466,13 +467,14 @@ var AIRTIME = (function(AIRTIME){
a[i] = (a[i] === "true") ? true : false; a[i] = (a[i] === "true") ? true : false;
} }
} }
/*
a = oData.ColReorder; a = oData.ColReorder;
for (i = 0, length = a.length; i < length; i++) { for (i = 0, length = a.length; i < length; i++) {
if (typeof(a[i]) === "string") { if (typeof(a[i]) === "string") {
a[i] = parseInt(a[i], 10); a[i] = parseInt(a[i], 10);
} }
} }*/
oData.iCreate = parseInt(oData.iCreate, 10); oData.iCreate = parseInt(oData.iCreate, 10);
}, },

6
airtime_mvc/public/js/airtime/showbuilder/main_builder.js
View File

@ -328,10 +328,10 @@ AIRTIME = (function(AIRTIME) {
setTimeout(checkScheduleUpdates, 5000); setTimeout(checkScheduleUpdates, 5000);
} }
}); });
}
//check if the timeline view needs updating. //check if the timeline view needs updating.
checkScheduleUpdates(); setTimeout(checkScheduleUpdates, 5000);
}
}; };
mod.onResize = function() { mod.onResize = function() {