Commits

Jon Nylander committed 9ee73ff

Continuing work on integrating both IP and geolocation API - questions remain. Should geolocation take precedence over javascript results. IP results should definitely not.

Comments (0)

Files changed (1)

detect_timezone.js

         },
         
         tz_lookup_callback = function (ip_timezone_data) {
-            if (ip_timezone_data.timezone !== preliminary_result.name()) {
-                preliminary_result.compare_with(ip_timezone_data);
-                config.callback(preliminary_result);
-                return;
+            if (ip_timezone_data) {
+                if (ip_timezone_data.timezone !== preliminary_result.name()) {
+                    preliminary_result.compare_with(ip_timezone_data);
+                }
             }
             config.callback(preliminary_result);
         },
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.