Fix submission to IA and View Memento UI

mink-plugin/js/displayMinkUI.js

@@ -39,12 +39,15 @@ function appendHTMLToShadowDOM () {
         }
         let mCount = mementos.length
         const minkuiRoot = document.querySelector('#minkuiX')
+        const viewingMemento = items.timemaps && items.timemaps[document.URL] &&
+          items.timemaps[document.URL].mementos && items.timemaps[document.URL].datetime
 
-        if (items.timemaps && items.timemaps[document.URL] && items.timemaps[document.URL].mementos && items.timemaps[document.URL].datetime) {
+        if (viewingMemento) {
           mCount = items.timemaps[document.URL].mementos.length
 
           // Hide initially irrelevant UI items
-          const selectorsToHide = ['.dropdown', '#drildownBox', '#steps', '#title_dropdown', '#archiveNow']
+          const selectorsToHide = ['.dropdown', '#drilldownBox', '#steps', '#title_dropdown', '#archiveNow']
+
           selectorsToHide.forEach(selector => {
             minkuiRoot.querySelector(selector).classList.add('hidden')
           })
@@ -107,20 +110,23 @@ function appendHTMLToShadowDOM () {
         }
 
         // Append CSS1
-        let mementoPlurality = 'mementos'
-        minkuiRoot.querySelector('#mementosAvailable span#mementoCount').innerHTML = mCount.toLocaleString()
-        if (mCount === 1) {
-          mementoPlurality = 'memento'
+        if (!viewingMemento) {
+          let mementoPlurality = 'mementos'
+          minkuiRoot.querySelector('#mementosAvailable span#mementoCount').innerHTML = mCount.toLocaleString()
+          if (mCount === 1) {
+            mementoPlurality = 'memento'
+          }
+          minkuiRoot.querySelector('#mementosAvailable span#mementoPlurality').innerHTML = mementoPlurality
         }
-        minkuiRoot.querySelector('#mementosAvailable span#mementoPlurality').innerHTML = mementoPlurality
 
         // Append CSS2
         appendCSSToShadowDOM(cb)
       })
     })
 }
 
-const addZ = (n) => {
+// In some places, getting addZ has already been declared, thus var for now
+var addZ = (n) => {
   return n < 10 ? '0' + n : '' + n
 }
 
@@ -657,7 +663,7 @@ chrome.runtime.onMessage.addListener(
   }
 )
 
-function showSuccessfullyArchivedURI (uri, openInNewTab) {
+function showSuccessfullyArchivedURI (archiveURI, openInNewTab) {
   chrome.runtime.sendMessage({
     method: 'notify',
     title: 'Mink',
@@ -666,8 +672,6 @@ function showSuccessfullyArchivedURI (uri, openInNewTab) {
 
   const shadow = document.getElementById('minkWrapper').shadowRoot
   shadow.getElementById('archivelogo_ia').classList.add('archiveNowSuccess')
-
-  const archiveURI = 'https://web.archive.org' + uri
   shadow.getElementById('archivelogo_ia').setAttribute('title', archiveURI)
   shadow.getElementById('archivelogo_ia').onclick = function () {
     if (!openInNewTab) {

mink-plugin/manifest.json

@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Mink - Integrate Live & Archived Web +Memento",
   "short_name": "Mink",
-  "version": "2.5.1.1",
+  "version": "2.5.2",
   "description": "Integrating the Live and Archived Web Viewing Experience Using Memento",
   "homepage_url": "https://matkelly.com/mink",
   "author": "Mat Kelly <mink@matkelly.com>",

mink-plugin/mink.js

@@ -220,40 +220,42 @@ chrome.runtime.onMessage.addListener(
       let data = {}
       let method = 'GET'
       if (request.archive === 'ia') {
-        submissionURI = 'http://web.archive.org/save/' + request.urir
+        submissionURI = `http://web.archive.org/save/${request.urir}`
         method = 'GET'
       } else if (request.archive === 'ais') {
         // TODO: get value of submitid from AIS interface
         submissionURI = 'archive.is/submit/'
         method = 'POST'
         data = { coo: '', url: request.urir }
       }
-
-      $.ajax({
-        method: 'GET',
-        url: submissionURI,
-        data: data
-      }).done(function (data, textStatus, xhr) {
-        chrome.tabs.query({
-          active: true,
-          currentWindow: true
-        }, function (tabs) {
-          chrome.tabs.sendMessage(tabs[0].id, {
-            method: 'archiveDone',
-            data: xhr.getResponseHeader('Content-Location'),
-            imgId: request.imgId,
-            imgURI: request.imgURI,
-            callback: request.cb,
-            newTab: request.newTab
-          })
-        })
-      })
+      window.fetch(submissionURI).then(
+        response => {
+          changeArchiveIcon(request, response)
+        }
+      )
     } else {
       log(`Message sent using chrome.runtime not caught: ${request.method}`)
     }
   }
 )
 
+function changeArchiveIcon (request, response) {
+  chrome.tabs.query({
+    active: true,
+    currentWindow: true
+  }, function (tabs) {
+    chrome.tabs.sendMessage(tabs[0].id, {
+      method: 'archiveDone',
+      data: response.url,
+      imgId: request.imgId,
+      imgURI: request.imgURI,
+      callback: request.cb,
+      newTab: request.newTab
+    })
+  })
+
+}
+
 function fetchTimeMap (uri, tabid) {
   log(`Fetching TimeMap for ${uri} in tab ${tabid}`)