Fix issues with view-image / search-by-image buttons.

bijij · Aug 3, 2021 · fe5d524 · fe5d524
1 parent 7434fda
commit fe5d524
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/js/content-script.js b/js/content-script.js
@@ -167,7 +167,7 @@ function addViewImageButton(container, imageURL, version) {
             viewImageButtonText = viewImageButton.querySelector('.irc_ho');
             break;
         case VERSIONS.OCT19:
-            viewImageButtonText = viewImageButton.querySelector('.pM4Snf');
+            viewImageButtonText = viewImageButton.querySelector('.pM4Snf, .KSvtLc');
             break;
     }
 
@@ -210,7 +210,7 @@ function addSearchImageButton(container, imageURL, version) {
             link = container.querySelector('.irc_ft > a.irc_help');
             break;
         case VERSIONS.OCT19:
-            link = container.querySelector('.PvkmDc, .qnLx5b');
+            link = container.querySelector('.PvkmDc, .qnLx5b, .zSA7pe');
             break;
     }
 
@@ -304,23 +304,24 @@ function parseDataSource(array) {
 }
 
 function parseDataSource1() {
-    const start_search = 'AF_initDataCallback({key: \'ds:1\', isError:  false , hash: \'2\', data:';
+    const start_search = /AF_initDataCallback\({key: \'ds:1\', isError:  false , hash: \'\d+\', data:/;
     const end_search = ', sideChannel: {}});</script>';
 
-    var start_index = document.documentElement.innerHTML.indexOf(start_search) + start_search.length;
-    var end_index = start_index + document.documentElement.innerHTML.slice(start_index).indexOf(end_search);
+    var match = document.documentElement.innerHTML.match(start_search);
 
-    if (DEBUG)
-        console.log(start_index, end_index);
+    var start_index = match.index + match[0].length;
+    var end_index = start_index + document.documentElement.innerHTML.slice(start_index).indexOf(end_search);
 
     parseDataSource(JSON.parse(document.documentElement.innerHTML.slice(start_index, end_index)));
 }
 
 function parseDataSource2() {
-    const start_search = 'AF_initDataCallback({key: \'ds:2\', isError:  false , hash: \'3\', data:function(){return ';
+    const start_search = /AF_initDataCallback\({key: \'ds:2\', isError:  false , hash: \'\d+\', data:function(){return /;
     const end_search = '}});</script>';
 
-    var start_index = document.documentElement.innerHTML.indexOf(start_search) + start_search.length;
+    var match = document.documentElement.innerHTML.match(start_search);
+
+    var start_index = match.index + match[0].length;
     var end_index = start_index + document.documentElement.innerHTML.slice(start_index).indexOf(end_search);
     parseDataSource(JSON.parse(document.documentElement.innerHTML.slice(start_index, end_index)));
 }
@@ -415,6 +416,10 @@ customStyle.innerText = `
     flex-grow:0!important
 }
 
+.zSA7pe[href^="/searchbyimage"] {
+    margin-left: 4px;
+}
+
 .ZsbmCf.vi_ext_addon{
     flex-grow:0
 }`;

diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "__MSG_appName__",
-    "version": "3.4.3",
+    "version": "3.5.0",
     "description": "__MSG_appDesc__",
     "default_locale": "en",
     "icons": {