backup: filter out chrome-untrusted:// windows

[chrome-ext/tabs-backup.git] / popup.js

diff --git a/popup.js b/popup.js
index 313045e21555db2ba30232619664c27e046cd889..176e068473e2d61073613974cfd73df05e582b76 100644 (file)
--- a/popup.js
+++ b/popup.js
@@ -38,7 +38,7 @@ function menu_ShowOptions () {
 }
 
 function menu_ShowAdvancedView() {
-       chrome.tabs.create({url:chrome.extension.getURL("advanced.html")});
+       chrome.tabs.create({url: "/advanced.html"});
 }
 
 function menu_ShowOlderBackups () {
@@ -140,7 +140,10 @@ function insertBackupItem (backupName, backupObj, insertAtBeginning, doAnimation
                return function(event) {
                        bootbox.confirm("Open Windows & Tabs of backup '" + backupName + "'?", function(confirmed) {
                                if (confirmed) {
-                                       chrome.runtime.getBackgroundPage((bg) => bg.restoreNow(backupName));
+                                       chrome.runtime.sendMessage({
+                                               action: 'restoreNow',
+                                               args: [backupName],
+                                       });
                                }
                        });
 
@@ -157,9 +160,10 @@ function insertBackupItem (backupName, backupObj, insertAtBeginning, doAnimation
 
                        bootbox.confirm("Delete backup '" + backupName + "'?", function(confirmed) {
                                if (confirmed) {
-                                       chrome.runtime.getBackgroundPage((bg) => {
-                                               bg.deleteBackup(backupName, () => updateStorageInfo());
-                                       });
+                                       chrome.runtime.sendMessage({
+                                               action: 'deleteBackup',
+                                               args: [backupName],
+                                       }, () => updateStorageInfo());
 
                                        //if (elem.parentNode) {
                                        //  elem.parentNode.removeChild(elem);
@@ -321,7 +325,9 @@ function menu_backupNow() {
 
        lastTimeBackupNowClicked = new Date().getTime();
 
-       chrome.runtime.getBackgroundPage((bg) => bg.backupNowManual(function(success, backupName, backupObj) {
+       chrome.runtime.sendMessage({
+               action: 'backupNowManual',
+       }, function({success, backupName, backupObj}) {
                if (success) {
                        //updateBackupsList();
                        insertBackupItem (backupName, backupObj, true /*insertAtBeginning*/, true /*doAnimation*/);
@@ -331,10 +337,13 @@ function menu_backupNow() {
                } else {
                        alert('An error occured while creating the backup..');
                }
-       }));
+       });
 
 }
 
 function menu_restoreNow() {
-       chrome.runtime.getBackgroundPage((bg) => bg.restoreNow('full_backup'));
+       chrome.runtime.sendMessage({
+               action: 'restoreNow',
+               args: ['full_backup'],
+       });
 }