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

crlf fix

This commit is contained in:
Naomi Aro 2013-09-24 12:24:13 +02:00
parent 7e96828cdd
commit 24861545ce
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,23 +126,23 @@ class ShowbuilderController extends Zend_Controller_Action
//only include library things on the page if the user can see it. //only include library things on the page if the user can see it.
if (!$disableLib) { if (!$disableLib) {
$this->view->headScript()->appendFile($baseUrl.'js/airtime/library/library.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/airtime/library/library.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/airtime/library/events/library_showbuilder.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/airtime/library/events/library_showbuilder.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$data = Application_Model_Preference::getCurrentLibraryTableSetting(); $data = Application_Model_Preference::getCurrentLibraryTableSetting();
if (!is_null($data)) { if (!is_null($data)) {
$libraryTable = json_encode($data); $libraryTable = json_encode($data);
$this->view->headScript()->appendScript("localStorage.setItem( 'datatables-library', JSON.stringify($libraryTable) );"); $this->view->headScript()->appendScript("localStorage.setItem( 'datatables-library', JSON.stringify($libraryTable) );");
} else { } else {
$this->view->headScript()->appendScript("localStorage.setItem( 'datatables-library', '' );"); $this->view->headScript()->appendScript("localStorage.setItem( 'datatables-library', '' );");
} }
} }
$data = Application_Model_Preference::getTimelineDatatableSetting(); $data = Application_Model_Preference::getTimelineDatatableSetting();
if (!is_null($data)) { if (!is_null($data)) {
$timelineTable = json_encode($data); $timelineTable = json_encode($data);
$this->view->headScript()->appendScript("localStorage.setItem( 'datatables-timeline', JSON.stringify($timelineTable) );"); $this->view->headScript()->appendScript("localStorage.setItem( 'datatables-timeline', JSON.stringify($timelineTable) );");
} else { } else {
$this->view->headScript()->appendScript("localStorage.setItem( 'datatables-timeline', '' );"); $this->view->headScript()->appendScript("localStorage.setItem( 'datatables-timeline', '' );");
} }
//populate date range form for show builder. //populate date range form for show builder.