Minor coding standards or small efficiencies

brettz9 · brettz9 · commit 4297f4879b96 · 2011-01-15T17:07:19.000+08:00
diff --git a/functions/xml/utf8_decode.js b/functions/xml/utf8_decode.js
@@ -20,13 +20,15 @@ function utf8_decode ( str_data ) {
         if (c1 < 128) {
             tmp_arr[ac++] = String.fromCharCode(c1);
             i++;
-        } else if ((c1 > 191) && (c1 < 224)) {
-            c2 = str_data.charCodeAt(i+1);
+        }
+        else if (c1 > 191 && c1 < 224) {
+            c2 = str_data.charCodeAt(i + 1);
             tmp_arr[ac++] = String.fromCharCode(((c1 & 31) << 6) | (c2 & 63));
             i += 2;
-        } else {
-            c2 = str_data.charCodeAt(i+1);
-            c3 = str_data.charCodeAt(i+2);
+        }
+        else {
+            c2 = str_data.charCodeAt(i + 1);
+            c3 = str_data.charCodeAt(i + 2);
             tmp_arr[ac++] = String.fromCharCode(((c1 & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63));
             i += 3;
         }
diff --git a/functions/xml/utf8_encode.js b/functions/xml/utf8_encode.js
@@ -13,9 +13,9 @@ function utf8_encode ( argString ) {
 
     var string = (argString+''); // .replace(/\r\n/g, "\n").replace(/\r/g, "\n");
 
-    var utftext = "";
-    var start, end;
-    var stringl = 0;
+    var utftext = "",
+        start, end,
+        stringl = 0;
 
     start = end = 0;
     stringl = string.length;
@@ -25,22 +25,24 @@ function utf8_encode ( argString ) {
 
         if (c1 < 128) {
             end++;
-        } else if (c1 > 127 && c1 < 2048) {
+        }
+        else if (c1 > 127 && c1 < 2048) {
             enc = String.fromCharCode((c1 >> 6) | 192) + String.fromCharCode((c1 & 63) | 128);
-        } else {
+        }
+        else {
             enc = String.fromCharCode((c1 >> 12) | 224) + String.fromCharCode(((c1 >> 6) & 63) | 128) + String.fromCharCode((c1 & 63) | 128);
         }
         if (enc !== null) {
             if (end > start) {
-                utftext += string.substring(start, end);
+                utftext += string.slice(start, end);
             }
             utftext += enc;
             start = end = n+1;
         }
     }
 
     if (end > start) {
-        utftext += string.substring(start, string.length);
+        utftext += string.slice(start, stringl);
     }
 
     return utftext;
