Merge branch 'master' of github.com:Warpzone/marvin

75187ff4 · ands · c044ba55 · 8a1be9ab · 75187ff4 · 75187ff4
Commit 75187ff4 authored 14 years ago by ands
--- a/webroot/index.php
+++ b/webroot/index.php
@@ -2,6 +2,7 @@
 	<link rel="stylesheet" type="text/css" href="css/widget.css" />
 	<title>Warpzone's Marvin</title>
 	<script src="js/jquery-1.4.4.js" type="text/javascript"></script>
+  <script src="js/marvin.js" type="text/javascript"></script>
 </head>
 <body>
 	<img src="img/warpzone.png">

--- a/webroot/js/marvin.js
+++ b/webroot/js/marvin.js
+var minuteTimerFunctionArray = [];
+var minuteTimer;
+function addFunctionToMinuteTimer(addFunction)
+{
+  minuteTimerFunctionArray[minuteTimerFunctionArray.length] = addFunction;
+}
+function executeMinuteTimer()
+{
+  for (i = 0; i < minuteTimerFunctionArray.length; i++)
+  {
+    minuteTimerFunctionArray[i]();
+  }
+}
+$(document).ready(function()
+{
+  minuteTimer = setInterval(executeMinuteTimer, 60*1000);
+});
\ No newline at end of file
--- a/webroot/widgets/ZoneOffen/ZoneOffen.js
+++ b/webroot/widgets/ZoneOffen/ZoneOffen.js
@@ -21,7 +21,7 @@ function updateZoneOffen () {
 $(document).ready(function()
  {
    //Zuerst nur einmal laden
-    updateZoneOffen();
+    addFunctionToMinuteTimer(updateZoneOffen);
  }
 );