lint

Revert "convert entire words as urls or do nothing"

src/js/filters.js

@@ -68,30 +68,20 @@ weechat.filter('conditionalLinkify', ['$filter', function($filter) {
             return text;
         }
 
-
+        return linkifyStr(text, {
-        return text.replaceAll(/\S+/g, function (match, p2) {
+            className: '',
-            const result = linkifyStr(match, {
+            attributes: {
-                className: '',
+                rel: 'noopener noreferrer'
-                attributes: {
+            },
-                    rel: 'noopener noreferrer'
+            target: {
-                },
+                url: '_blank'
-                target: {
+            },
-                    url: '_blank'
+            validate: {
-                },
+                email: function () {
-                validate: {
+                    return false; //Do not linkify emails
-                    email: function () {
-                        return false; //Do not linkify emails
-                    }
                 }
-            });
-
-            if (result.endsWith("</a>")) {
-                return result;
-            } else {
-                return match
             }
-
+          });
-        });
     };
 }]);
 

src/js/misc.js

@@ -2,4 +2,4 @@
 
 export const sortBy = (key) => {
     return (a, b) => (a[key] > b[key]) ? 1 : ((b[key] > a[key]) ? -1 : 0);
-}
+};

test/unit/filters.js

@@ -30,14 +30,6 @@ describe('Filters', function() {
                 result = $filter('conditionalLinkify')(url);
             expect(result).toEqual(link);        
         }));
-
-        it('convert the entire words to links', angular.mock.inject(function($filter) {
-            var text = 'weechat.network.connection_timeout',
-                link = 'weechat.network.connection_timeout',
-                result = $filter('conditionalLinkify')(text);
-            expect(result).toEqual(link);
-        }));
-
     });
 
     describe('irclinky', function() {