Chrome compatibility

Author: Brawl345

README.md

@@ -1,10 +1,9 @@
 Image Reverse Search
 ================================
-Firefox WebExtension which adds an option to the context menu to search with an image on various services, such as Google, Bing, Yandex and TinEye. Also has options to open the search page in a background tab and left or right to the current tab or at the end of the tabstrip.
+WebExtension which adds an option to the context menu to search with an image on various services, such as Google, Bing, Yandex and TinEye. The user can also choose a custom search engine. Has options to open the search page in a background tab and left or right to the current tab or at the end of the tabstrip, too.
 
 * Available for Firefox on [addons.mozilla.org](https://addons.mozilla.org/firefox/addon/image-reverse-search/)
-* Available for Opera in the [Opera Add-Ons Store](https://addons.opera.com/extensions/details/image-reverse-search-with-google/) (legacy)
-
-For the older chrome version, see the ["chrome" branch](https://github.com/Brawl345/Image-Reverse-Search-with-Google/tree/chrome).
+* Available for Opera in the [Opera Add-Ons Store](https://addons.opera.com/extensions/details/image-reverse-search-with-google/)
+* Available for Chrome in the [Releases section](https://github.com/Brawl345/Image-Reverse-Search-with-Google/releases) (drag CRX into chrome://extensions)
 
 ![Screenshot](https://raw.githubusercontent.com/Brawl345/Image-Reverse-Search-with-Google/master/screenshot.png)

background.js

@@ -1,6 +1,6 @@
 // Set up context menu for images
-var title = browser.i18n.getMessage("contextMenuTitle");
-browser.contextMenus.create({
+var title = chrome.i18n.getMessage("contextMenuTitle");
+chrome.contextMenus.create({
   id: "343642_image-reverse-search",
   title: title,
   contexts: ["image"]
@@ -22,15 +22,13 @@ function onError(e) {
 If we don't, then store the default settings. */
 function checkStoredSettings(storedSettings) {
   if (!storedSettings.openInBackground || !storedSettings.openTabAt || !storedSettings.searchProvider) {
-    browser.storage.sync.set(defaultSettings);
+    chrome.storage.sync.set(defaultSettings);
   }
 }
 
-const gettingStoredSettings = browser.storage.sync.get();
-gettingStoredSettings.then(checkStoredSettings, onError);
+const gettingStoredSettings = chrome.storage.sync.get(null, checkStoredSettings);
 
 function reverseSearch(info, storedSettings) {
-  
   function getTabIndex(openTabAt, tabs) {
     if (openTabAt == 'right') {
       return tabs[0].index + 1;
@@ -62,19 +60,17 @@ function reverseSearch(info, storedSettings) {
 
   function openImageSearch(tabs) {
     tabIndex = getTabIndex(openTabAt, tabs);
-    browser.tabs.create({
+    chrome.tabs.create({
       url: searchProvider.replace('%s', encodeURIComponent(imageURL)),
       active: !openInBackground,
       index: tabIndex
     });
   }
 
-  var querying = browser.tabs.query({currentWindow: true, active: true});
-  querying.then(openImageSearch, onError);
+  chrome.tabs.query({currentWindow: true, active: true}, openImageSearch);
 }
 
 /* On click, fetch stored settings and reverse search. */
-browser.contextMenus.onClicked.addListener((info, tab) => {
-  const gettingStoredSettings = browser.storage.sync.get();
-  gettingStoredSettings.then(reverseSearch.bind(null, info), onError);
+chrome.contextMenus.onClicked.addListener((info, tab) => {
+  chrome.storage.sync.get(null, reverseSearch.bind(null, info));
 });

manifest.json

@@ -21,15 +21,7 @@
 
   "options_ui": {
     "page": "options/options.html",
-    "open_in_tab": true,
-    "browser_style": false
-  },
-  
-  "applications": {
-    "gecko": {
-      "id": "{0da2e603-21ba-4422-8049-b6d9e013ed84}",
-      "strict_min_version": "48.0"
-    }
+    "open_in_tab": true
   },
 
   "permissions": [

options/options.js

@@ -1,20 +1,20 @@
 /* Localization */
-document.title = browser.i18n.getMessage("extensionName") + " | " + browser.i18n.getMessage("optionsPageTitle");
-document.getElementById("navbarTitle").textContent = browser.i18n.getMessage("extensionName");
-document.getElementById("openTabAtLabel").textContent = browser.i18n.getMessage("openTabAtLabel");
-document.getElementById("right").textContent = browser.i18n.getMessage("openAtRight");
-document.getElementById("left").textContent = browser.i18n.getMessage("openAtLeft");
-document.getElementById("end").textContent = browser.i18n.getMessage("openAtEnd");
-document.getElementById("openInBackgroundLabel").textContent = browser.i18n.getMessage("openInBackground");
-document.getElementById("searchProviderLabel").textContent = browser.i18n.getMessage("searchProviderLabel");
-document.getElementById("otherCSE").textContent = browser.i18n.getMessage("other");
-document.getElementById("customSearchProviderLabel").textContent = browser.i18n.getMessage("customSearchProviderLabel");
-document.getElementById("customSearchProvider").placeholder = browser.i18n.getMessage("customSearchProviderPlaceholder");
-document.getElementById("cseError").textContent = browser.i18n.getMessage("cseError");
-document.getElementById("save-button").textContent = browser.i18n.getMessage("saveOptions");
-document.getElementById("status").textContent = browser.i18n.getMessage("saved");
+document.title = chrome.i18n.getMessage("extensionName") + " | " + chrome.i18n.getMessage("optionsPageTitle");
+document.getElementById("navbarTitle").textContent = chrome.i18n.getMessage("extensionName");
+document.getElementById("openTabAtLabel").textContent = chrome.i18n.getMessage("openTabAtLabel");
+document.getElementById("right").textContent = chrome.i18n.getMessage("openAtRight");
+document.getElementById("left").textContent = chrome.i18n.getMessage("openAtLeft");
+document.getElementById("end").textContent = chrome.i18n.getMessage("openAtEnd");
+document.getElementById("openInBackgroundLabel").textContent = chrome.i18n.getMessage("openInBackground");
+document.getElementById("searchProviderLabel").textContent = chrome.i18n.getMessage("searchProviderLabel");
+document.getElementById("otherCSE").textContent = chrome.i18n.getMessage("other");
+document.getElementById("customSearchProviderLabel").textContent = chrome.i18n.getMessage("customSearchProviderLabel");
+document.getElementById("customSearchProvider").placeholder = chrome.i18n.getMessage("customSearchProviderPlaceholder");
+document.getElementById("cseError").textContent = chrome.i18n.getMessage("cseError");
+document.getElementById("save-button").textContent = chrome.i18n.getMessage("saveOptions");
+document.getElementById("status").textContent = chrome.i18n.getMessage("saved");
 
-/* Store the currently selected settings using browser.storage.sync. */
+/* Store the currently selected settings using chrome.storage.sync. */
 function storeSettings() {
 
   function getOpenTabAt() {
@@ -64,7 +64,7 @@ function storeSettings() {
   const openInBackground = document.getElementById("openInBackground").checked;
   const openTabAt = getOpenTabAt();
 
-  browser.storage.sync.set({
+  chrome.storage.sync.set({
     openInBackground,
     openTabAt,
     searchProvider,
@@ -110,8 +110,7 @@ function showOtherField(name) {
 }
 
 /* On opening the options page, fetch stored settings and update the UI with them. */
-const gettingStoredSettings = browser.storage.sync.get();
-gettingStoredSettings.then(updateUI, onError);
+const gettingStoredSettings = chrome.storage.sync.get(null, updateUI);
 
 /* On changing the searchProvider to "other", show the text field */
 const searchProviderSelect = document.querySelector("#searchProvider");