Merge branch '1.3.0'

js/background/service/background.js

@@ -437,8 +437,12 @@ var background = (function () {
             var credential = local_credentials[i];
             for (var f = 0; f < searchFields.length; f++) {
                 var field = searchFields[f];
+                if(!credential[field]){
+                    continue;
+                }
+
                 var field_value = credential[field].toLowerCase();
-                if (field_value && field_value.indexOf(searchText) !== -1) {
+                if (field_value.indexOf(searchText) !== -1) {
                     results.push(credential);
                     break;
                 }

js/lib/parseTLD.js

@@ -0,0 +1,32 @@
+var parse_host = function(host){
+    /** global: tlds */
+    if(typeof tlds === "undefined"){
+        throw new Error('No TLDs!');
+    }
+
+    var parts = host.split(".");
+    var stack = "";
+    var tld_level = 1; //unknown tld are 1st level
+    for(var i=parts.length-1, part;i>=0;i--){
+        part = parts[i];
+        stack = stack ? part + "." + stack : part;
+        if(!tlds[stack]){
+            break;
+        }
+        tld_level = tlds[stack];
+    }
+    if(parts.length <= tld_level ) {
+        return {
+            tld: null,
+            domain: host
+        };
+    } else {
+        return  {
+            tld     : parts.slice(-tld_level).join('.'),
+            domain  : parts.slice(-tld_level-1).join('.'),
+            sub     : parts.slice(0, (-tld_level-1)).join('.'),
+        };
+    }
+
+
+};

js/lib/parseUrl.js

@@ -3,25 +3,6 @@ function processURL(URL, ignoreProtocol, ignoreSubdomain, ignorePath, ignorePort
         return URL;
     }
 
-    var URLobj = null;
-    try {
-        URLobj = new window.URL(URL);
-    }
-
-    catch (err) {
-        if (ignoreProtocol) {
-            try {
-                URLobj = new window.URL("http://" + URL);
-            }
-            catch (err2) {
-                return URL;
-            }
-        }
-        else {
-            return URL;
-        }
-    }
-
     var parser = document.createElement('a');
     parser.href = URL;
 
@@ -50,8 +31,10 @@ function processURL(URL, ignoreProtocol, ignoreSubdomain, ignorePath, ignorePort
         baseHost = host;
     }
     else {
-        var result = host.match(/[^./]+\.[^./]+$/); // catch the two last parts, it's de hostname and the tld
-        baseHost = result[0];
+        var tld = parse_host(host);
+        if(tld) {
+            baseHost = tld.domain;
+        }
     }
     var returnURL = "";
     if (!ignoreProtocol) {

js/ui/password_picker/password_picker.js

@@ -288,7 +288,7 @@ $(document).ready(function () {
             'method': 'searchCredential',
             args: searchText
         }).then(function (result) {
-            if (result.length === 0) {
+            if (result.length === 0 || !result) {
                 $('#searchResults').html(API.i18n.getMessage('no_credentials_found'));
             }
             for (var i = 0; i < result.length; i++) {

karma.conf.js

@@ -19,6 +19,8 @@ module.exports = function (config) {
 
         // list of files / patterns to load in the browser
         files: [
+            'js/lib/data/tlds.js',
+            'js/lib/parseTLD.js',
             'js/lib/parseUrl.js',
             { pattern: 'tests/**/*.js', included: true }
         ],

manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "__MSG_extName__",
   "short_name": "__MSG_extName__",
-  "version": "1.2.12",
+  "version": "1.3.0",
   "manifest_version": 2,
   "author": "Sander Brand",
   "default_locale": "en",
@@ -20,6 +20,8 @@
   "background": {
     "scripts": [
       "/js/vendor/jquery/jquery.js",
+      "/js/lib/data/tlds.js",
+      "/js/lib/parseTLD.js",
       "/js/lib/parseUrl.js",
       "/js/vendor/sjcl/sjcl.js",
       "/js/lib/promise.js",