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

-fixed UI freeze on some very special occasions 

-fixed some php errors related to php shipped with debian
-playlist.js no longer active on login page
This commit is contained in:
martin 2011-02-13 13:29:16 -05:00
parent b9e1078e10
commit a5fd68c252
6 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/layouts/scripts/layout.phtml
View File

@ -11,7 +11,7 @@
<div id="Panel"> <div id="Panel">
<div class="logo"></div> <div class="logo"></div>
<?= $this->partial('partialviews/header.phtml', array("user" => $this->loggedInAs())) ?> <?php echo $this->partial('partialviews/header.phtml', array("user" => $this->loggedInAs())) ?>
<?php $partial = array('menu.phtml', 'default'); <?php $partial = array('menu.phtml', 'default');
$this->navigation()->menu()->setPartial($partial); ?> $this->navigation()->menu()->setPartial($partial); ?>

2
application/layouts/scripts/library.phtml
View File

@ -11,7 +11,7 @@
<div id="Panel"> <div id="Panel">
<div class="logo"></div> <div class="logo"></div>
<?= $this->partial('partialviews/header.phtml', array("user" => $this->loggedInAs())) ?> <?php echo $this->partial('partialviews/header.phtml', array("user" => $this->loggedInAs())) ?>
<?php $partial = array('menu.phtml', 'default'); <?php $partial = array('menu.phtml', 'default');
$this->navigation()->menu()->setPartial($partial); ?> $this->navigation()->menu()->setPartial($partial); ?>

2
application/layouts/scripts/search.phtml
View File

@ -8,7 +8,7 @@
<?php echo $this->headLink() ?> <?php echo $this->headLink() ?>
</head> </head>
<body> <body>
<div id="nowplayingbar"><?= $this->partial('partialviews/header.phtml', array("user" => $this->loggedInAs())) ?></div> <div id="nowplayingbar"><?php echo $this->partial('partialviews/header.phtml', array("user" => $this->loggedInAs())) ?></div>
<div id="nav"><?php echo $this->navigation()->menu()->setRenderInvisible(true) ?></div> <div id="nav"><?php echo $this->navigation()->menu()->setRenderInvisible(true) ?></div>
<div class="wrapper"> <div class="wrapper">

4
application/models/Schedule.php
View File

@ -482,10 +482,10 @@ class Schedule {
." ORDER BY st.starts DESC" ." ORDER BY st.starts DESC"
." LIMIT $count"; ." LIMIT $count";
} else if ($timePeriod == 0){ } else if ($timePeriod == 0){
$sql .= " AND st.starts < TIMESTAMP '$timeNow'" $sql .= " AND st.starts <= TIMESTAMP '$timeNow'"
." AND st.ends > TIMESTAMP '$timeNow'"; ." AND st.ends > TIMESTAMP '$timeNow'";
} else if ($timePeriod > 0){ } else if ($timePeriod > 0){
$sql .= " AND st.starts > TIMESTAMP '$timeNow'" $sql .= " AND st.starts >= TIMESTAMP '$timeNow'"
." AND st.starts < (TIMESTAMP '$timeNow' + INTERVAL '$interval')" ." AND st.starts < (TIMESTAMP '$timeNow' + INTERVAL '$interval')"
." ORDER BY st.starts" ." ORDER BY st.starts"
." LIMIT $count"; ." LIMIT $count";

2
application/models/Shows.php
View File

@ -749,7 +749,7 @@ class Show_DAL{
$sql = "SELECT *, si.starts as start_timestamp, si.ends as end_timestamp FROM " $sql = "SELECT *, si.starts as start_timestamp, si.ends as end_timestamp FROM "
." $CC_CONFIG[showInstances] si, $CC_CONFIG[showTable] s" ." $CC_CONFIG[showInstances] si, $CC_CONFIG[showTable] s"
." WHERE si.show_id = s.id" ." WHERE si.show_id = s.id"
." AND si.starts > TIMESTAMP '$timeNow'" ." AND si.starts >= TIMESTAMP '$timeNow'"
." AND si.starts < TIMESTAMP '$timeNow' + INTERVAL '48 hours'" ." AND si.starts < TIMESTAMP '$timeNow' + INTERVAL '48 hours'"
." ORDER BY si.starts" ." ORDER BY si.starts"
." LIMIT 1"; ." LIMIT 1";

51
public/js/playlist/playlist.js
View File

@ -33,7 +33,7 @@ function registerSongEndListener(func){
function notifySongEndListener(){ function notifySongEndListener(){
if (typeof songEndFunc == "function"){ if (typeof songEndFunc == "function"){
//create a slight pause in execution to allow the browser //create a slight delay in execution to allow the browser
//to update the display. //to update the display.
setTimeout(songEndFunc, 50); setTimeout(songEndFunc, 50);
} }
@ -57,6 +57,7 @@ function secondsTimer(){
var date = new Date(); var date = new Date();
estimatedSchedulePosixTime = date.getTime() - localRemoteTimeOffset; estimatedSchedulePosixTime = date.getTime() - localRemoteTimeOffset;
updateProgressBarValue(); updateProgressBarValue();
updatePlaybar();
} }
setTimeout(secondsTimer, uiUpdateInterval); setTimeout(secondsTimer, uiUpdateInterval);
} }
@ -64,7 +65,6 @@ function secondsTimer(){
function newSongStart(){ function newSongStart(){
nextSongPrepare = true; nextSongPrepare = true;
currentSong[0] = nextSongs.shift(); currentSong[0] = nextSongs.shift();
updatePlaybar();
notifySongEndListener(); notifySongEndListener();
} }
@ -72,7 +72,6 @@ function newSongStart(){
function nextShowStart(){ function nextShowStart(){
nextShowPrepare = true; nextShowPrepare = true;
currentShow[0] = nextShow.shift(); currentShow[0] = nextShow.shift();
updatePlaybar();
} }
/* Called every "uiUpdateInterval" mseconds. */ /* Called every "uiUpdateInterval" mseconds. */
@ -129,8 +128,6 @@ function updateProgressBarValue(){
setTimeout(nextShowStart, diff); setTimeout(nextShowStart, diff);
} }
} }
updatePlaybar();
} }
function updatePlaybar(){ function updatePlaybar(){
@ -230,7 +227,7 @@ function parseItems(obj){
function getScheduleFromServer(){ function getScheduleFromServer(){
$.ajax({ url: "/Schedule/get-current-playlist/format/json", dataType:"json", success:function(data){ $.ajax({ url: "/Schedule/get-current-playlist/format/json", dataType:"json", success:function(data){
parseItems(data.entries); parseItems(data.entries);
}}); }, error:function(jqXHR, textStatus, errorThrown){}});
setTimeout(getScheduleFromServer, serverUpdateInterval); setTimeout(getScheduleFromServer, serverUpdateInterval);
} }
@ -241,27 +238,31 @@ function init() {
//begin consumer "thread" //begin consumer "thread"
secondsTimer(); secondsTimer();
$('#about-link').qtip({ var qtipElem = $('#about-link');
content: $('#about-txt').html(),
show: 'mouseover', if (qtipElem.length > 0)
hide: { when: 'mouseout', fixed: true }, qtipElem.qtip({
position: { content: $('#about-txt').html(),
corner: { show: 'mouseover',
target: 'center', hide: { when: 'mouseout', fixed: true },
tooltip: 'topRight' position: {
} corner: {
}, target: 'center',
style: { tooltip: 'topRight'
border: { }
width: 0,
radius: 4
}, },
name: 'light', // Use the default light style style: {
} border: {
}); width: 0,
radius: 4
},
name: 'light', // Use the default light style
}
});
} }
$(document).ready(function() { $(document).ready(function() {
init(); if ($('#master-panel').length > 0)
init();
}); });