projects
/
svn42.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
better javascript updates
[svn42.git]
/
raspberry-kiosk
/
kiosk.js
diff --git
a/raspberry-kiosk/kiosk.js
b/raspberry-kiosk/kiosk.js
index
4077087
..
d453cda
100644
(file)
--- a/
raspberry-kiosk/kiosk.js
+++ b/
raspberry-kiosk/kiosk.js
@@
-12,7
+12,11
@@
function writeGooglePlusEvents(data, elem)
{
for (var a=0; a<attach.length; a++)
{
{
for (var a=0; a<attach.length; a++)
{
- if ( attach[a].objectType == "photo")
+ if ( attach[a].objectType == "album")
+ {
+ noteimg = attach[a].thumbnails[0].image.url;
+ }
+ else if ( attach[a].objectType == "photo")
{
noteimg = attach[a].image.url;
}
{
noteimg = attach[a].image.url;
}
@@
-23,7
+27,7
@@
function writeGooglePlusEvents(data, elem)
}
}
ghtml += '<div class="gpluspost">'
}
}
ghtml += '<div class="gpluspost">'
- ghtml += '<img class="gplusactor" src="'+item.actor.image.url+'"/><p class="gplustimestamp">'+item.updated+'</p>';
+ ghtml += '<img class="gplusactor" src="'+item.actor.image.url+'"/><p class="gplustimestamp">'+item.updated.substring(0,16).replace("T"," ")+'</p>';
ghtml += '<p class="gplustxt">'+notetxt+'</p>';
if (noteimg)
{
ghtml += '<p class="gplustxt">'+notetxt+'</p>';
if (noteimg)
{
@@
-40,7
+44,6
@@
function loadGooglePlusEvents()
var gpak = "AIzaSyD9xBFM-KWwSYBgZ8VzftJ5wYYvurOxEHg";
var gplusuri = "https://www.googleapis.com/plus/v1/people/113737596421797426873/activities/public?maxResults=4&key="+gpak;
var gpluscontainer=document.getElementById("gplusevents");
var gpak = "AIzaSyD9xBFM-KWwSYBgZ8VzftJ5wYYvurOxEHg";
var gplusuri = "https://www.googleapis.com/plus/v1/people/113737596421797426873/activities/public?maxResults=4&key="+gpak;
var gpluscontainer=document.getElementById("gplusevents");
- gpluscontainer.innerHTML="Plus loading ...";
$.getJSON(gplusuri, function(data){
writeGooglePlusEvents(data, gpluscontainer);
});
$.getJSON(gplusuri, function(data){
writeGooglePlusEvents(data, gpluscontainer);
});
@@
-76,7
+79,6
@@
function loadCalendar()
{
//old URI: //grical.realraum.at/s/?query=!realraum&limit=9&view=json
var calcontainer=document.getElementById("grical_upcoming");
{
//old URI: //grical.realraum.at/s/?query=!realraum&limit=9&view=json
var calcontainer=document.getElementById("grical_upcoming");
- calcontainer.innerHTML="Calendar loading ...<br/>please wait a second or two";
$.getJSON('/shmcache/grical_realraum.json', function(data){
writeCalendar(data, calcontainer);
});
$.getJSON('/shmcache/grical_realraum.json', function(data){
writeCalendar(data, calcontainer);
});
@@
-106,7
+108,7
@@
function writeAnwesenheitStatus(data)
{
$.each( data.sensors[s], function(stype, std){
$.each( std, function(swhere, svalue){
{
$.each( data.sensors[s], function(stype, std){
$.each( std, function(swhere, svalue){
- sensorstd+='<td style="background-color:white; height:42px; text-align:center; vertical-align:middle; display:table-cell;"><b>'+stype+'</b><br/>'+swhere+': '+svalue+'</td>';
+ sensorstd+='<td class="sensorstatus"><b>'+stype+'</b><br/>'+swhere+': '+svalue+'</td>';
});
});
}
});
});
}
@@
-200,6
+202,16
@@
function showError(XMLHttpRequest, textStatus, errorThrown)
alert("Error: " + textStatus);
}
alert("Error: " + textStatus);
}
+function IsImageOk(img) {
+ if (!img.complete) {
+ return false;
+ }
+ if (typeof img.naturalWidth != "undefined" && img.naturalWidth == 0) {
+ return false;
+ }
+ return true;
+}
+
function reloadImg(element)
{
//var image = document.getElementById("theText");
function reloadImg(element)
{
//var image = document.getElementById("theText");
@@
-209,7
+221,10
@@
function reloadImg(element)
new_image.id = element.id;
new_image.className = element.className;
new_image.src = element.src;
new_image.id = element.id;
new_image.className = element.className;
new_image.src = element.src;
- element.parentNode.insertBefore(new_image,element);
- element.parentNode.removeChild(element);
+ if (IsImageOk(new_image))
+ {
+ element.parentNode.insertBefore(new_image,element);
+ element.parentNode.removeChild(element);
+ }
}
}
}
}