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

CC-3503 : Preserve the state of "Now Playing" screen - whether Library section is open or not

This commit is contained in:
Naomi Aro 2012-03-28 17:29:34 +02:00
parent fe21abf16d
commit aca6e995dd
2 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,6 +92,15 @@ class ShowbuilderController extends Zend_Controller_Action
} }
} }
$data = Application_Model_Preference::GetValue("nowplaying_screen", true);
if ($data != "") {
$settings = unserialize($data);
if ($settings["library"] == "true") {
$this->view->headScript()->appendScript("AIRTIME.showLib = true;");
}
}
$this->_helper->actionStack('library', 'library'); $this->_helper->actionStack('library', 'library');
$this->_helper->actionStack('builder', 'showbuilder'); $this->_helper->actionStack('builder', 'showbuilder');
} }

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

@ -55,30 +55,16 @@ $(document).ready(function(){
oRange = AIRTIME.utilities.fnGetScheduleRange(dateStartId, timeStartId, dateEndId, timeEndId); oRange = AIRTIME.utilities.fnGetScheduleRange(dateStartId, timeStartId, dateEndId, timeEndId);
AIRTIME.showbuilder.fnServerData.start = oRange.start; AIRTIME.showbuilder.fnServerData.start = oRange.start;
AIRTIME.showbuilder.fnServerData.end = oRange.end; AIRTIME.showbuilder.fnServerData.end = oRange.end;
if (AIRTIME.showLib === true) {
$lib.show()
.width(Math.floor(screenWidth * 0.5));
$.ajax({ $builder.width(Math.floor(screenWidth * 0.5))
url: "/usersettings/get-now-playing-screen-settings", .find("#sb_edit")
type: "GET", .remove()
data: {format: "json"}, .end();
dataType: "json", }
success: function(json){
var o = json.settings;
if (o === undefined) {
return;
}
if (o.library === "true") {
$lib.show()
.width(Math.floor(screenWidth * 0.5));
$builder.width(Math.floor(screenWidth * 0.5))
.find("#sb_edit")
.remove()
.end();
}
}
});
AIRTIME.library.libraryInit(); AIRTIME.library.libraryInit();
AIRTIME.showbuilder.builderDataTable(); AIRTIME.showbuilder.builderDataTable();