Fix manifest requests

annndruha · Jul 21, 2023 · 9be8e49 · 9be8e49
1 parent 01a92ab
commit 9be8e49
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 29 deletions.
diff --git a/default-icons.json b/default-icons.json
@@ -92,5 +92,5 @@
 	"show-clock": true,
 	"show-header": true,
 	"show-quick": false,
-	"version": "1.0.9"
+	"version": "1.0.10"
 }
diff --git a/js/saveopen.js b/js/saveopen.js
@@ -3,6 +3,7 @@ function getPureJSON(json){
     try{
         delete json['datetime']
         delete json['background']
+        delete json["version"]
         for (let r = 0; r < json['rows']; r++) {
             for (let c = 0; c < json['cols']; c++) {
                 let id = r.toString() + c.toString()
@@ -21,9 +22,6 @@ function getPureJSON(json){
                 delete json[id]
             }
         }
-        $.getJSON('manifest.json', function (res) {
-            json['version'] = res['version']
-        })
     }
     // TODO: Validate json
     catch (e) {
@@ -57,13 +55,16 @@ function saveToFile() {
     chrome.storage.local.get(null, (res) => {
         let now_str = new Date().toISOString()
         let json = getPureJSON(res)
-        $('<a></a>', {
-            'download': 'Pulchra-' + now_str.split('T')[0] + '.json',
-            'href': 'data:application/json,' + encodeURIComponent(JSON.stringify(json, null, '\t'))
-        }).appendTo('body').click(() => {
-            $(this).remove()
-        })[0].click()
-        console.log('Save bookmarks to file')
+        $.getJSON('manifest.json', function (r) {
+            json['version'] = r['version']
+            $('<a></a>', {
+                'download': 'Pulchra-' + now_str.split('T')[0] + '.json',
+                'href': 'data:application/json,' + encodeURIComponent(JSON.stringify(json, null, '\t'))
+            }).appendTo('body').click(() => {
+                $(this).remove()
+            })[0].click()
+            console.log('Save bookmarks to file')
+        })
     })
 }
 
@@ -143,23 +144,26 @@ function saveToCloud() {
     chrome.storage.local.get(null, (res) => {
         let json = getPureJSON(res)
         json['datetime'] = new Date().toISOString()
-        chrome.storage.sync.get(null, (res_cloud_backup) => {
-            chrome.storage.sync.clear(() => {
-                chrome.storage.sync.set(json, () => {
-                    if (chrome.runtime.lastError){
-                        chrome.storage.sync.set(res_cloud_backup, () => {
-                            console.log('Runtime error while cloud save. Cloud restored to state before saving.')})
-                            alert(chrome.runtime.lastError.message + '\n\nProbably icon-link (or base64) in some bookmark too big')
-                    }
-                    else{
-                        console.log('Bookmarks saved in cloud')
-                    }
-                    let save_icon = document.getElementById('icon-cloud-save')
-                    save_icon.setAttribute('src', 'images/icons/cloud_done.svg')
-                    setTimeout(function () {
-                        let load_icon = document.getElementById('icon-cloud-save')
-                        load_icon.setAttribute('src', 'images/icons/backup.svg')
-                    }, 1500)
+        $.getJSON('manifest.json', function (r) {
+            json['version'] = r['version']
+            chrome.storage.sync.get(null, (res_cloud_backup) => {
+                chrome.storage.sync.clear(() => {
+                    chrome.storage.sync.set(json, () => {
+                        if (chrome.runtime.lastError){
+                            chrome.storage.sync.set(res_cloud_backup, () => {
+                                console.log('Runtime error while cloud save. Cloud restored to state before saving.')})
+                                alert(chrome.runtime.lastError.message + '\n\nProbably icon-link (or base64) in some bookmark too big')
+                        }
+                        else{
+                            console.log('Bookmarks saved in cloud')
+                        }
+                        let save_icon = document.getElementById('icon-cloud-save')
+                        save_icon.setAttribute('src', 'images/icons/cloud_done.svg')
+                        setTimeout(function () {
+                            let load_icon = document.getElementById('icon-cloud-save')
+                            load_icon.setAttribute('src', 'images/icons/backup.svg')
+                        }, 1500)
+                    })
                 })
             })
         })

diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "Pulchra Bookmarks",
   "description": "Pulchra Bookmarks extension",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "manifest_version": 3,
   "minimum_chrome_version": "96",
   "chrome_url_overrides": {