Changeset 379

Timestamp:

2015-03-12 01:56:41 (10 years ago)

Author:

amg0

Message:

Fixes for window covering icon on UI7.0.5

Location:

trunk/AltUI

Files:

• J_ALTUI_uimgr.js (modified) (2 diffs)
• J_ALTUI_utils.js (modified) (1 diff)
• J_ALTUI_verabox.js (modified) (2 diffs)

trunk/AltUI/J_ALTUI_uimgr.js ¶

@@ -725 +725 @@
                 if (str == "icons/generic_sensor.png")
                     str = "../generic_default.png";
-                if (str.substr(0,6) == "icons/")
+                else if (str == "icons/Window_Covering.png")
+                    str = (_ui7Check==true) ? "../../icons/Window_Covering.png" : "../../../icons/Window_Covering.png";
+                else if (str.substr(0,6) == "icons/")
                     str = "../../../"+str;
             }   
@@ -1010 +1012 @@
                     var val = VeraBox.getStatus( devid, control.Display.Service, control.Display.Variable ) || 0;
                     var uniqid = devid+"-"+idx;
-                    var symbol = control.LabelSymbol.text;
+                    var symbol = control.LabelSymbol ? control.LabelSymbol.text : '';
                     $("<div id='altui-slider-horizontal-value-"+uniqid+"' class=''></div>")
                         .text( val+symbol )

trunk/AltUI/J_ALTUI_utils.js ¶

@@ -30 +30 @@
        for (var i=0; i < arguments.length; i++)
        {
-            var replacement = new RegExp('\\{' + i + '\\}', 'g');   // regex requires \ and assignment into string requires \\
+            var replacement = new RegExp('\\{' + i + '\\}', 'g');   // regex requires \ and assignment into string requires \\,
+            // if ($.type(arguments[i]) === "string")
+                // arguments[i] = arguments[i].replace(/\$/g,'$');
             content = content.replace(replacement, arguments[i]);  
        }

trunk/AltUI/J_ALTUI_verabox.js ¶

@@ -986 +986 @@
         })
         .done(function(data) {
+            UIManager.pageMessage("Save Pages was successful", "success");
             if ( $.isFunction( cbfunc ) )  {
                 cbfunc(data);           
@@ -991 +992 @@
         })
         .fail(function(jqXHR, textStatus) {
+            UIManager.pageMessage( "Save Pages did not succeed: " + textStatus , "danger");
             if ( $.isFunction( cbfunc ) )  {
                 cbfunc("");