Changeset 86

Timestamp:

2014-10-02 19:31:01 (11 years ago)

Author:

nlrb

Message:

Fixes for latest UI7 release

Location:

branches/1.2

Files:

• J_Powermax.js (modified) (3 diffs)
• L_Powermax.lua (modified) (1 diff)

branches/1.2/J_Powermax.js ¶

@@ -1 +1 @@
 var browserIE = false;
 var pmjsButtons = new Array();
+var pmjsUi = 5;
 
 // Configuration items of the panel: text, item, #items, can edit
@@ -270 +271 @@
 function pmjsSettingsButtons(deviceID) {
    var dataLen = pmjsButtons.length;
+   if (pmjsUi == 5) {
+      sel = 'selected';
+   } else {
+      sel = 'highlighted';
+   }
    for (var i = 0; i < dataLen; i++) {
       var state = get_device_state(deviceID, "urn:micasaverde-com:serviceId:PowermaxAlarmPanel1", pmjsButtons[i], 0)
       if (state == "1") {
-         document.getElementById(pmjsButtons[i] + 'On').className = document.getElementById(pmjsButtons[i] + 'On').className.replace("button", "button selected");
-         document.getElementById(pmjsButtons[i] + 'Off').className = document.getElementById(pmjsButtons[i] + 'Off').className.replace("button selected", "button");
+         document.getElementById(pmjsButtons[i] + 'On').className = document.getElementById(pmjsButtons[i] + 'On').className.replace("button", "button "+sel);
+         document.getElementById(pmjsButtons[i] + 'Off').className = document.getElementById(pmjsButtons[i] + 'Off').className.replace("button "+sel, "button");
       } else {
-         document.getElementById(pmjsButtons[i] + 'Off').className = document.getElementById(pmjsButtons[i] + 'Off').className.replace("button", "button selected");
-         document.getElementById(pmjsButtons[i] + 'On').className = document.getElementById(pmjsButtons[i] + 'On').className.replace("button selected", "button");
+         document.getElementById(pmjsButtons[i] + 'Off').className = document.getElementById(pmjsButtons[i] + 'Off').className.replace("button", "button "+sel);
+         document.getElementById(pmjsButtons[i] + 'On').className = document.getElementById(pmjsButtons[i] + 'On').className.replace("button "+sel, "button");
       }
    }
@@ -412 +418 @@
       html = html.replace(/class="label/g, 'class="cpanel_device_control_label');
       html = html.replace(/class="variable/g, 'class="cpanel_device_control_variable');
+      pmjsUi = 7;
    }
    set_panel_html(html);

branches/1.2/L_Powermax.lua ¶

@@ -903 +903 @@
    
    luup.call_timer("pmIntervalCheck", 1, "20s", "", "")
+   luup.set_failure(false)
 end