Changeset 19591

Timestamp:

09/19/08 13:00:07 (2 months ago)

Author:

drry

Message:

• fixed regexes.
  
• fixed missing vars.
  

Location:

platform/firefox/FireMobileSimulator/trunk/src

Files:

• chrome/content/common/util.js (modified) (1 diff)
• components/msimStreamConverter.js (modified) (1 diff)

platform/firefox/FireMobileSimulator/trunk/src/chrome/content/common/util.js

@@ -131 +131 @@
  */
 function dms2degree(dms){
-        dms.match(/[+-]?(\d+)\.(\d+)\.(\d+\.\d+)/);
-        dms1 = parseInt(RegExp.$1);
-        dms2 = parseInt(RegExp.$2);
-        dms3 = parseFloat(RegExp.$3);
+        if (!/[-+]?(\d+)\.(\d+)\.(\d+\.\d+)/.test(dms)) {
+                return null;
+        var dms1 = parseInt(RegExp.$1);
+        var dms2 = parseInt(RegExp.$2);
+        var dms3 = parseFloat(RegExp.$3);
         var degree = dms1+dms2/60+dms3/3600;
         return degree;

platform/firefox/FireMobileSimulator/trunk/src/components/msimStreamConverter.js

@@ -136 +136 @@
         var data = si.read(aCount);
 
-        if ((this.charset == undefined || this.charset == '')
-                        && data
-                                        .match(/^<\?xml(?:\s[^>]*?)?\sencoding\s*=\s*["']([^"']*)["']|<meta(?:\s[^>]*?)?\s(?:http-equiv\s*=\s*["']content-type['"](?:\s[^>]*?)?\scontent\s*=\s*["']([^"']*)["']|content\s*=\s*["']([^"']*)["'](?:\s[^>]*?)?(?:\shttp-equiv\s*=\s*["']content-type['"]))/i)) {
-                var m = RegExp.$1 || RegExp.$2 || RegExp.$3;
-                dump("[msim]data match regexp:" + m + "\n");
-                if (m.match(/;\s*charset=([^\s;]+)/i)) {
-                        var charset = RegExp.$1;
-                        this.charset = charset;
-                        dump("[msim]guessed charset is " + charset + "\n");
-                } else {
+        var m;
+        if (this.charset == undefined || this.charset == '') {
+                if (/^<\?xml(?:\s[^>]*?)?\sencoding\s*=\s*["']([^"']*)["']|<meta(?:\s[^>]*?)?\s(?:http-equiv\s*=\s*(["']?)content-type\2(?:\s[^>]*?)?\scontent\s*=\s*["']?[^;]+(?:;[^;=]+(?:=\s*[^\s;]*)?)*?;\s*charset\s*=\s*([^"'\s;<>]+)|content\s*=\s*(["']?)[^;]+(?:;[^;=]+(?:=\s*[^\s;]*)?)*?;\s*charset\s*=\s*([^"'\s;<>]+)[^"']*?\4(?:\s[^>]*?)?\shttp-equiv\s*=\s*(["']?)content-type\6)/i.test(data)) {
+                        m = RegExp.$1 || RegExp.$3 || RegExp.$5;
                         this.charset = m;
                         dump("[msim]guessed charset is " + m + "\n");
+                } else {
+                        dump("[msim]No encoding match found");
                 }
         } else {
-                dump("[msim]No encoding match found (or already got charset: " + this.charset
+                dump("[msim]Already got charset: " + this.charset
                                 + ")\n");
         }