]> _ Git - tortuga-home.git/commitdiff
.
authorVincent <vincent@enhydra.fr>
Thu, 20 May 2021 07:06:26 +0000 (09:06 +0200)
committerVincent <vincent@enhydra.fr>
Thu, 20 May 2021 07:06:26 +0000 (09:06 +0200)
.idea/workspace.xml
js/home.js
scripts/state.php

index 29270027e18ea3c398f726a14b76c34a15530395..f547f7ece1210895b7a4ca046f9a2c0b26e1a263 100644 (file)
@@ -3,6 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/js/home.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/home.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/state.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/state.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
       <workItem from="1620391230238" duration="8835000" />
       <workItem from="1620565702683" duration="6590000" />
       <workItem from="1621059599606" duration="2419000" />
-      <workItem from="1621493540376" duration="86000" />
-    </task>
-    <task id="LOCAL-00436" summary=".">
-      <created>1611337927836</created>
-      <option name="number" value="00436" />
-      <option name="presentableId" value="LOCAL-00436" />
-      <option name="project" value="LOCAL" />
-      <updated>1611337927836</updated>
+      <workItem from="1621493540376" duration="724000" />
     </task>
     <task id="LOCAL-00437" summary=".">
       <created>1611585903595</created>
       <option name="project" value="LOCAL" />
       <updated>1621061259708</updated>
     </task>
-    <option name="localTasksCounter" value="485" />
+    <task id="LOCAL-00485" summary=".">
+      <created>1621493667425</created>
+      <option name="number" value="00485" />
+      <option name="presentableId" value="LOCAL-00485" />
+      <option name="project" value="LOCAL" />
+      <updated>1621493667425</updated>
+    </task>
+    <option name="localTasksCounter" value="486" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
index 4d1574ced23949cefc11e722626226b2913cf99e..330ababcc95af1c96f4e350c1347e3c3496377de 100644 (file)
@@ -414,8 +414,8 @@ $(function () {
 });
 
 function checkPower() {
-    $.ajax('scripts/state.php?key=' + CONFIG.ROOM + '_power&default=0', function (data) {
-        power = (data == 1);
+    $.get('scripts/state.php?key=' + CONFIG.ROOM + '_power&default=0', function (data) {
+        window.power = (data == '1');
     });
 }
 
@@ -649,7 +649,7 @@ function showScreenSaver() {
     if ($('main section:visible').data('section') === 'remote') {
         return;
     }
-    if (androidApp && !power) {
+    if (androidApp && !window.power) {
         return;
     }
 
index 21be43c7aab99261210f8194121eae544f72a7b1..df136478fe8cf12319d9059d44174c2e43e1ffb0 100644 (file)
@@ -1,3 +1,5 @@
 <?php
 include "import.php";
+header('Content-Type: text/plain');
+ob_end_clean();
 echo getState($_GET['key'], $_GET['default'] ?? null);
\ No newline at end of file