]> code.delx.au - comingnext/blobdiff - comingNext/index.html
delx.au / code / comingnext / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
show "loading..." text when adding homescreen widget and data is still being loaded
[comingnext] / comingNext / index.html
diff --git a/comingNext/index.html b/comingNext/index.html
index c0856466b68077abc5d606b64ef1c9ee9cb5cf05..3bc8f369ad7230488387562cd0a35b2978e40936 100644 (file)
--- a/comingNext/index.html
+++ b/comingNext/index.html
@@ -962,13 +962,16 @@ function showSettings()
                                config[key].Value = document.forms[0].elements["settings." + key].value;\r
                        else if (config[key].Type == 'Int') {\r
                                config[key].Value = parseInt(document.forms[0].elements["settings." + key].value);\r
-                               if (config[key].Value < 0)\r
+                               if (config[key].Value < 0 || isNaN(config[key].Value))
                                        config[key].Value = config[key].Default;\r
                        }\r
                        else if (config[key].Type == 'Bool')\r
                                config[key].Value = document.forms[0].elements["settings." + key].checked;\r
-                       else if (config[key].Type == 'UID')\r
+                       else if (config[key].Type == 'UID') {
                                config[key].Value = parseInt(document.forms[0].elements["settings." + key].value);\r
+                               if (isNaN(config[key].Value))
+                                       config[key].Value = config[key].Default;
+                       }
                        else if (config[key].Type == 'Enum') {\r
                                config[key].Value = document.forms[0].elements["settings." + key].value;\r
                                if (config[key].ValidValues.indexOf(config[key].Value) == -1)\r
@@ -1136,17 +1139,23 @@ function loadSettings()
                                var pair = stringlist[i].split('=');\r
                                var key = pair[0];\r
                                var value = pair[1];\r
-                               log('stringlist: ' + key + '=\'' + value + '\'');
-                               if (config[key].Type == 'Int')\r
+                               log('stringlist: ' + key + '=\'' + value + '\'');\r
+                               if (config[key].Type == 'Int') {
                                        config[key].Value = Number(value);\r
+                                       if (isNaN(config[key].Value))
+                                               config[key].Value = config[key].Default;
+                               }
                                else if (config[key].Type == 'String')\r
                                        config[key].Value = value;\r
                                else if (config[key].Type == 'Bool')\r
                                        config[key].Value = (value == 'true')\r
                                else if (config[key].Type == 'Enum')\r
                                        config[key].Value = value;\r
-                               else if (config[key].Type == 'UID')\r
+                               else if (config[key].Type == 'UID') {
                                        config[key].Value = Number(value);\r
+                                       if (isNaN(config[key].Value))
+                                               config[key].Value = config[key].Default;
+                               }
                                else if (config[key].Type == 'Array') {\r
                                        config[key].Value = value.split("^");\r
                                        if (config[key].Value.length == 1 && config[key].Value[0] == "") {\r
@@ -1384,6 +1393,10 @@ function hideViews()
 \r
 function listCalendars()\r
 {\r
+       if (errorOccured) {\r
+               return null;\r
+       }\r
+\r
        try {\r
                var criteria = {\r
                        Type:'Calendar', \r
@@ -1567,7 +1580,7 @@ hr { color:#ffffff; background-color:#ffffff; height:1px; text-align:left; borde
 \r
 <body onload="javascript:setTimeout('init()', 10)" onresize="javascript:updateScreen()" id="body" class="background">
 <div id="homescreenView">\r
-       <div id="calendarList"></div>\r
+       <div id="calendarList">loading...</div>\r
 </div>\r
 <div id="fullscreenView" style="display:none;">\r
        <img src="Icon.png" id="smallappicon">\r