Merge pull request #9 from talis/ent_1377_double_click_bookmark_problems

ENT-1377 double click bookmark problems
techfromsage · Oct 7, 2019 · 12fa558 · 12fa558
2 parents 9206983 + 011d4f8
commit 12fa558
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 31 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-
+.idea
 bower_components/
 dist/
 node_modules/
diff --git a/js/background.js b/js/background.js
@@ -3,27 +3,21 @@
  *
  * This only does anything when the bookmarking button is clicked
  */
-chromeOrBrowser().browserAction.onClicked.addListener(function(tab) {
+chromeOrBrowser().browserAction.onClicked.addListener(function(currentTab) {
     // If no institution has been set, go to the options page to set one
     getActiveTenant(function (tenantCode) {
         if (!tenantCode) {
-            if (window.confirm(chromeOrBrowser().i18n.getMessage('noTenantAlert'))) {
-                // browser.runtime.openOptionsPage() not supported by ms-edge, so here's a workaround
-                chromeOrBrowser().tabs.create({
-                    url: chromeOrBrowser().extension.getURL("options.html")
-                  });
-            }
+            // browser.runtime.openOptionsPage() not supported by ms-edge, so here's a workaround
+            chromeOrBrowser().tabs.create({
+                url: chromeOrBrowser().extension.getURL("options.html")
+            });
+        } else {
+            chromeOrBrowser().tabs.executeScript(null, {
+                file: "/js/bookmarker.js",
+                runAt: 'document_end'
+            }, function () {
+                chromeOrBrowser().tabs.sendMessage(currentTab.id, {tenantCode: tenantCode});
+            });
         }
-
-        chromeOrBrowser().tabs.executeScript(null, {
-            file: "/js/bookmarker.js",
-            runAt: 'document_end'
-        });
-
-        chromeOrBrowser().tabs.query({active: true, currentWindow: true}, function(tabs) {
-            chromeOrBrowser().tabs.sendMessage(tabs[0].id, {tenantCode: tenantCode});
-            return true;
-        });
-        return true;
     });
 });
diff --git a/js/bookmarker.js b/js/bookmarker.js
@@ -1,30 +1,38 @@
 /*
  * Content script to inject the dynamic bookmarking JS directly into the page.
  */
-
 (function() {
   function chromeOrBrowser() {
     return this.browser || chrome;
   }
+
   /**
    * Injected into page to redirect to the dynamic page parser
    *
    * @param {String} tenantCode
    */
-  function bookmarkPage(tenantCode, cb) {
+  function bookmarkPage(tenantCode) {
+    var bookmarkingScriptId = '__talis_' + tenantCode + '_bookmarkingScript';
+
+    if (document.getElementById(bookmarkingScriptId)) {
+      document.getElementById(bookmarkingScriptId).remove();
+    }
+
     var bookmarker = document.createElement('script');
     bookmarker.setAttribute(
-      'src',
-      'https://bookmarking.talis.com/' + tenantCode + '/parser?bookmarkButtonVersion=1&uri=' +
+        'src',
+        'https://bookmarking.talis.com/' + tenantCode + '/parser?bookmarkButtonVersion=1&uri=' +
         encodeURIComponent(encodeURI(window.location.href)) + '&bookmarkVersion=1&title=' +
         encodeURIComponent(document.title) + '&hasJquery=no'
-      );
-    document.body.appendChild(bookmarker);
-    cb();
+    );
+    bookmarker.setAttribute('id', bookmarkingScriptId);
+
+    if (document.body) {
+      document.body.appendChild(bookmarker);
+    }
   }
-  chromeOrBrowser().runtime.onMessage.addListener(function(message, sender, sendResponse) {
-    bookmarkPage(message.tenantCode, function () {
-      sendResponse({status: 'ok'});
-    });
+
+  chromeOrBrowser().runtime.onMessage.addListener(function (message) {
+    bookmarkPage(message.tenantCode);
   });
 })();
diff --git a/js/options.js b/js/options.js
@@ -31,6 +31,9 @@ $(function() {
 
 function loadTenantList() {
     getActiveTenant(function(activeTenant) {
+        if (!activeTenant) {
+            $('#optionsHelp').html('<div class="alert alert-warning">' + chromeOrBrowser().i18n.getMessage('noTenantAlert') + '</div>');
+        }
         $('#tenantCode').val(activeTenant);
         getTenants(function(tenants) {
             var matched = false;

diff --git a/options.html b/options.html
@@ -16,6 +16,7 @@
         <div class="row" id="status">
 
         </div>
+        <div class="row" id="optionsHelp"></div>
         <div class="row">
             <div class="col-xs-2">
                 <span data-message="optionsInstitutionLabel">Institution:</span><br>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "talis-reading-lists-bookmarker",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "description": "A browser extension to bookmark resources to Talis Aspire Reading Lists",
   "devDependencies": {
     "grunt": "^1.0.1",