Fix: custom rules is broken

eight04 · Jun 17, 2019 · c3e7051 · c3e7051
1 parent e8bf6ba
commit c3e7051
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/dist/linkify-plus-plus.user.js b/dist/linkify-plus-plus.user.js
@@ -315,11 +315,11 @@ function createOptions(pref) {
     if (changes.includeElement != null || changes.excludeElement != null) {
       options.validator = createValidator(options);
     }
-    options.matcher = new linkifyPlusPlusCore.UrlMatcher(options);
-    options.onlink = options.embedImageExcludeElement ? onlink : null;
     if (typeof options.customRules === "string") {
       options.customRules = stringToList(options.customRules);
     }
+    options.matcher = new linkifyPlusPlusCore.UrlMatcher(options);
+    options.onlink = options.embedImageExcludeElement ? onlink : null;
   }
 
   function onlink({link, range, content}) {

diff --git a/extension/js/content.js b/extension/js/content.js
@@ -2031,11 +2031,11 @@ function createOptions(_local_pref) {
     if (changes.includeElement != null || changes.excludeElement != null) {
       options.validator = createValidator(options);
     }
-    options.matcher = new UrlMatcher(options);
-    options.onlink = options.embedImageExcludeElement ? onlink : null;
     if (typeof options.customRules === "string") {
       options.customRules = stringToList(options.customRules);
     }
+    options.matcher = new UrlMatcher(options);
+    options.onlink = options.embedImageExcludeElement ? onlink : null;
   }
 
   function onlink({link, range, content}) {

diff --git a/src/lib/main.js b/src/lib/main.js
@@ -173,11 +173,11 @@ function createOptions(pref) {
     if (changes.includeElement != null || changes.excludeElement != null) {
       options.validator = createValidator(options);
     }
-    options.matcher = new UrlMatcher(options);
-    options.onlink = options.embedImageExcludeElement ? onlink : null;
     if (typeof options.customRules === "string") {
       options.customRules = stringToList(options.customRules);
     }
+    options.matcher = new UrlMatcher(options);
+    options.onlink = options.embedImageExcludeElement ? onlink : null;
   }
 
   function onlink({link, range, content}) {