Updated to v! (Tuesday, December 12, 2017)
-
ScriptSafe is on Chrome, Opera, and now: Firefox!
My sincere thanks to all testers, translators, and users for your support over the past 6 years.
In this release you will find the following updates:
- - v1.0.9.3:
- - Added ability to temporarily disable ScriptSafe for a set time via the panel (useful if buying something online)
+ - v1.0.9.8:
- Added ability to selectively allow Browser Plugins Enumeration
- Added ability to randomize user agents: on every request or every x minutes
- Minor panel tweaks
- Minor user agent fix
+ - Minor language initialization fix
- Updated unwanted content providers list
@@ -62,16 +61,16 @@
-
Just as a note: ScriptSafe does not have any backdoors, nor does it contact any third-party server at any point in time. ScriptSafe was created by one ordinary guy (me), lovingly coded in my bedroom, without any intention other than to give you back control of the Internet. ScriptSafe is released under the GNU GPLv3 license for true open-source freedom.
You can go through the code on Github (https://github.com/andryou/scriptsafe) AND the actual instance installed on your computer by going to C:\Users\**your username**\AppData\Local\Google\Chrome\User Data\Default\Extensions\oiigbmnaadbkfbmpbfijlflahbdbdgdf (for non-Windows users, search for a folder named oiigbmnaadbkfbmpbfijlflahbdbdgdf)
+
Just as a note: ScriptSafe does not have any backdoors, nor does it contact any third-party server at any point in time. ScriptSafe was created by one ordinary guy (me), lovingly coded in my bedroom, without any intention other than to give you back control of the Internet. ScriptSafe is released under the GNU GPLv3 license for true open-source freedom.
You can go through the code on Github (https://github.com/andryou/scriptsafe/tree/firefox)
diff --git a/js/options.js b/js/options.js
index 006d694..65209be 100644
--- a/js/options.js
+++ b/js/options.js
@@ -2,11 +2,16 @@
// Distributed under the terms of the GNU General Public License
// The GNU General Public License can be found in the gpl.txt file. Alternatively, see
.
'use strict';
-var version = '1.0.9.3';
+var version = '1.0.9.8';
var bkg = chrome.extension.getBackgroundPage();
var settingnames = [];
var syncstatus;
document.addEventListener('DOMContentLoaded', function () {
+ var localStorageReady = bkg.checkLocalStorage();
+ if (!localStorageReady) {
+ setTimeout(function() { window.location.reload(1); }, 100);
+ return;
+ }
initTabs();
i18load();
loadOptions();
@@ -248,7 +253,7 @@ function viewToggle(commit) {
$("#sidebar, #sectionname").toggle();
if ($(".tab-content").hasClass('col-sm-9')) {
$("#viewtoggle").text(bkg.getLocale("groupallsettings")).removeClass('btn-info').addClass('btn-success');
- if (commit) localStorage['optionslist'] = 'true';
+ if (commit) bkg.saveSetting('optionslist', 'true');
$(".tab-content").removeClass('col-sm-9').addClass('col-sm-12');
$(".tab").each(function() {
$(this).prepend('
'+$("a[href='#"+$(this).attr('id')+"']").attr('rel')+'
').show();
@@ -261,7 +266,7 @@ function viewToggle(commit) {
$('#whitelistblacklist .sectionheading').stickyScroll({ topBoundary: $("#whitelistblacklist").offset().top, bottomBoundary: $("#whitelistblacklist").offset().top });
} else {
$("#viewtoggle").text(bkg.getLocale("listallsettings")).removeClass('btn-success').addClass('btn-info');
- if (commit) localStorage['optionslist'] = 'false';
+ if (commit) bkg.saveSetting('optionslist', 'false');
$(".tab-content").removeClass('col-sm-12').addClass('col-sm-9');
$(".tab").hide();
$(".tab.active").show();
@@ -326,10 +331,10 @@ function loadList(id) {
$("#"+id).val(JSON.parse(localStorage[id]).join("\n"));
}
function saveCheckbox(id) {
- localStorage[id] = document.getElementById(id).checked;
+ bkg.saveSetting(id, document.getElementById(id).checked);
}
function saveElement(id) {
- localStorage[id] = $("#"+id).val().replace(/[~|]/g, '');
+ bkg.saveSetting(id, $("#"+id).val().replace(/[~|]/g, ''));
}
function saveList(id) {
localStorage[id] = JSON.stringify($("#"+id).val().split("\n"));
@@ -508,7 +513,7 @@ function saveOptions() {
saveElement("referrerspoof");
$("#customreferrer").hide();
} else {
- if ($("#userref").val() != '') localStorage['referrerspoof'] = $("#userref").val();
+ if ($("#userref").val() != '') bkg.saveSetting('referrerspoof', $("#userref").val());
else {
$("#customreferrer").show();
$("#userref").focus;
@@ -576,11 +581,11 @@ function settingsImport() {
if (settingnames.indexOf($.trim(settingentry[0])) != -1 && ($.trim(settingentry[1]) != '' || $.trim(settingentry[0]) == 'useragent')) {
if ($.trim(settingentry[0]) == 'whiteList' || $.trim(settingentry[0]) == 'blackList' || $.trim(settingentry[0]) == 'useragent') {
var listarray = $.trim(settingentry[1]).replace(/(\[|\]|")/g,"").split(",");
- if ($.trim(settingentry[0]) == 'whiteList' && listarray.toString() != '') localStorage['whiteList'] = JSON.stringify(listarray);
- else if ($.trim(settingentry[0]) == 'blackList' && listarray.toString() != '') localStorage['blackList'] = JSON.stringify(listarray);
- else if ($.trim(settingentry[0]) == 'useragent' && listarray.toString() != '') localStorage['useragent'] = JSON.stringify(listarray);
+ if ($.trim(settingentry[0]) == 'whiteList' && listarray.toString() != '') bkg.saveSetting('whiteList', JSON.stringify(listarray));
+ else if ($.trim(settingentry[0]) == 'blackList' && listarray.toString() != '') bkg.saveSetting('blackList', JSON.stringify(listarray));
+ else if ($.trim(settingentry[0]) == 'useragent' && listarray.toString() != '') bkg.saveSetting('useragent', JSON.stringify(listarray));
} else
- localStorage[$.trim(settingentry[0])] = $.trim(settingentry[1]);
+ bkg.saveSetting($.trim(settingentry[0]), $.trim(settingentry[1]));
} else {
error += $.trim(settingentry[0])+", ";
}
@@ -872,7 +877,7 @@ function fpListProcess(fpType) {
}
function listclear(type) {
if (confirm(['Clear whitelist?','Clear blacklist?'][type])) {
- localStorage[['whiteList','blackList'][type]] = JSON.stringify([]);
+ bkg.saveSetting(['whiteList','blackList'][type], JSON.stringify([]));
listUpdate();
bkg.cacheLists();
if (bkg.freshSync(2)) {
diff --git a/js/popup.js b/js/popup.js
index 6ab72cc..fd62801 100644
--- a/js/popup.js
+++ b/js/popup.js
@@ -1,7 +1,7 @@
// ScriptSafe - Copyright (C) andryou
// Distributed under the terms of the GNU General Public License
// The GNU General Public License can be found in the gpl.txt file. Alternatively, see
.
-var version = '1.0.9.3';
+var version = '1.0.9.8';
var port = chrome.runtime.connect({name: "popuplifeline"});
var bkg = chrome.extension.getBackgroundPage();
var closepage, mode, taburl, tabid, tabdomain;
@@ -52,18 +52,26 @@ function truncate(str, len) {
return str;
}
document.addEventListener('DOMContentLoaded', function () {
- setTimeout(init, 150);
$("#pop_ay").mouseup(function(e) { if (e.which != 3) openTab('https://twitter.com/andryou'); });
$("#pop_docs").mouseup(function(e) { if (e.which != 3) openTab('https://www.andryou.com/scriptsafe/'); });
- $("#pop_project").mouseup(function(e) { if (e.which != 3) openTab('https://github.com/andryou/scriptsafe'); });
+ $("#pop_project").mouseup(function(e) { if (e.which != 3) openTab('https://github.com/andryou/scriptsafe/tree/firefox'); });
$("#pop_options").mouseup(function(e) { if (e.which != 3) openTab(chrome.extension.getURL('html/options.html')); });
$("#pop_log").mouseup(function(e) { if (e.which != 3) openTab(chrome.extension.getURL('html/recents.html')); });
- $("#pop_webstore").mouseup(function(e) { if (e.which != 3) openTab('https://chrome.google.com/webstore/detail/scriptsafe/oiigbmnaadbkfbmpbfijlflahbdbdgdf'); });
- $("#pop_close").mouseup(function(e) { if (e.which != 3) window.close(); }).attr('title', bkg.getLocale("close"));
+ $("#pop_webstore").mouseup(function(e) { if (e.which != 3) openTab('https://addons.mozilla.org/firefox/addon/script-safe/'); });
$("#pop_refresh").mouseup(function(e) { if (e.which != 3) chrome.tabs.reload(); window.close(); });
+ if (!bkg) {
+ $("#version").html(version);
+ $("#pop_close").mouseup(function(e) { if (e.which != 3) window.close(); }).attr('title', 'Close');
+ $("table").html('
Firefox does not yet fully provide incognito support for Web Extensions. Until then, please browse in a non-Private Window for ScriptSafe to use this panel. |
');
+ return;
+ } else {
+ var localStorageReady = bkg.checkLocalStorage();
+ setTimeout(init, 150);
+ }
});
function init() {
$("#version").html(version);
+ $("#pop_close").mouseup(function(e) { if (e.which != 3) window.close(); }).attr('title', bkg.getLocale("close"));
$("#pop_options").html(bkg.getLocale("options"));
chrome.tabs.query({active: true, currentWindow: true}, function(tab) {
tab = tab[0];
@@ -71,7 +79,7 @@ function init() {
tabdomain = bkg.extractDomainFromURL(taburl);
if (tabdomain.substr(0,4) == 'www.') tabdomain = tabdomain.substr(4);
tabid = tab.id;
- if (tabdomain == 'chrome.google.com' || taburl.indexOf('chrome-extension://') == 0) {
+ if (tabdomain == 'addons.mozilla.org' || taburl.indexOf('moz-extension://') == 0) {
$("#currentdomain").html(bkg.getLocale("notfiltered"));
$(".thirds").html('
'+bkg.getLocale("noexternal")+'');
} else {
@@ -99,8 +107,7 @@ function init() {
if ((responseBlockedCount == 0 && responseAllowedCount == 0) || response.status == 'false' || (response.mode == 'block' && (response.enable == '1' || response.enable == '4'))) {
if (response.status == 'false') {
$("#currentdomain").hide();
- $("html").css('width', '410px');
- $("body").css('width', '400px');
+ $("body").css('min-width', '400px');
$(".thirds").css('text-align', 'center').html('
'+bkg.getLocale("ssdisabled")+'');
$("#parent").css('text-align', 'center').append('
'+bkg.getLocale("enabless")+'
');
$(".snstatus").bind("click", statuschanger);
diff --git a/js/recents.js b/js/recents.js
index 914d73d..3c6d2f1 100644
--- a/js/recents.js
+++ b/js/recents.js
@@ -2,7 +2,7 @@
// Distributed under the terms of the GNU General Public License
// The GNU General Public License can be found in the gpl.txt file. Alternatively, see
.
'use strict';
-var version = '1.0.9.3';
+var version = '1.0.9.8';
var bkg = chrome.extension.getBackgroundPage();
var syncstatus;
document.addEventListener('DOMContentLoaded', function () {
diff --git a/js/scriptsafe.js b/js/scriptsafe.js
index 0681ecc..12c380b 100644
--- a/js/scriptsafe.js
+++ b/js/scriptsafe.js
@@ -3,7 +3,7 @@
// The GNU General Public License can be found in the gpl.txt file. Alternatively, see
.
// Credits and ideas: NotScripts, AdBlock Plus for Chrome, Ghostery, KB SSL Enforcer
'use strict';
-var version = '1.0.9.3';
+var version = '1.0.9.8';
var requestTypes, synctimer, recentstimer, reenabletimer, useragentinterval, blackList, whiteList, distrustList, trustList, sessionBlackList, sessionWhiteList, locale;
var langs = {
'en_US': 'English (US)',
@@ -254,6 +254,7 @@ function inlineblock(req) {
}
var headers = req.responseHeaders;
if (req.type == 'main_frame') {
+ checkLocalStorage();
var domainCheckStatus = domainCheck(req.url, 1);
if (experimental == '1' && localStorage['preservesamedomain'] == 'false' && localStorage['script'] == 'true' && enabled(req.url) == 'true') {
headers.push({
@@ -383,7 +384,7 @@ function hashTrackingClean(url) {
}
function enabled(url) {
var domainCheckStatus = domainCheck(url);
- if (localStorage["enable"] == "true" && domainCheckStatus != '0' && (domainCheckStatus == '1' || (localStorage["mode"] == "block" && domainCheckStatus == '-1')) && url.indexOf('https://chrome.google.com/webstore') == -1 && (url.substring(0,4) == 'http' || url == 'chrome://newtab/'))
+ if (localStorage["enable"] == "true" && domainCheckStatus != '0' && (domainCheckStatus == '1' || (localStorage["mode"] == "block" && domainCheckStatus == '-1')) && url.indexOf('https://addons.mozilla.org/') == -1 && url.substring(0,4) == 'http')
return 'true';
return 'false';
}
@@ -467,8 +468,8 @@ function domainHandler(domain,action,listtype) {
action = parseInt(action);
// Initialize local storage
if (listtype == 0) {
- if (typeof(localStorage['whiteList'])==='undefined') localStorage['whiteList'] = JSON.stringify([]);
- if (typeof(localStorage['blackList'])==='undefined') localStorage['blackList'] = JSON.stringify([]);
+ if (typeof(localStorage['whiteList'])==='undefined') saveSetting('whiteList', JSON.stringify([]));
+ if (typeof(localStorage['blackList'])==='undefined') saveSetting('blackList', JSON.stringify([]));
var tempWhitelist = JSON.parse(localStorage['whiteList']);
var tempBlacklist = JSON.parse(localStorage['blackList']);
} else if (listtype == 1) {
@@ -498,22 +499,14 @@ function domainHandler(domain,action,listtype) {
var whiteInstancesCount = whiteInstances.length;
var blackInstancesCount = blackInstances.length;
if (whiteInstancesCount || blackInstancesCount) {
- var lingo = '';
- if (action == 1) lingo = 'dis';
- if (confirm('ScriptSafe detected '+(whiteInstancesCount+blackInstancesCount)+' existing rule(s) for '+tempDomain+' ('+whiteInstancesCount+' whitelist and '+blackInstancesCount+' blacklist).\r\nDo you want to delete them before '+lingo+'trusting the entire '+tempDomain+' domain in order to avoid conflicts?\r\nNote: this might not necessarily remove all conflicting entries, particularly if they use regex (e.g. d?main.com).')) {
- if (whiteInstancesCount) {
- for (var x=0; x
0) {
- segment = jsonstr.substr(0, limit);
- settingssync["zw" + i] = segment;
- jsonstr = jsonstr.substr(limit);
- i++;
- }
- settingssync['whiteListCount'] = i;
- // legacy syncing method - end
- // new syncing method - start
- /*
- jsonstr = ssCompress(JSON.parse(localStorage['whiteList']).toString());
- i = 0;
- while (jsonstr.length > 0) {
- segment = jsonstr.substr(0, newlimit);
- settingssync["sw" + i] = milliseconds+segment;
- jsonstr = jsonstr.substr(newlimit);
- i++;
- }
- settingssync['whiteListCount2'] = i;
- if (zarr['zb'].length) {
- for (var x = 0, forcount=zarr['zb'].length; x < forcount; x++) delete localStorage[zarr['zb'][x]];
- }
- if (zarr['sb'].length) {
- for (var x = 0, forcount=zarr['sb'].length; x < forcount; x++) delete localStorage[zarr['sb'][x]];
- }
- */
- // new syncing method - end
- // legacy syncing method - start
- i = 0;
- jsonstr = JSON.parse(localStorage['blackList']).toString();
- limit = (chrome.storage.sync.QUOTA_BYTES_PER_ITEM - Math.ceil(jsonstr.length/(chrome.storage.sync.QUOTA_BYTES_PER_ITEM - 4)) - 4);
- while (jsonstr.length > 0) {
- segment = jsonstr.substr(0, limit);
- settingssync["zb" + i] = segment;
- jsonstr = jsonstr.substr(limit);
- i++;
- }
- settingssync['blackListCount'] = i;
- // legacy syncing method - end
- // new syncing method - start
- /*
- jsonstr = ssCompress(JSON.parse(localStorage['blackList']).toString());
- i = 0;
- while (jsonstr.length > 0) {
- segment = jsonstr.substr(0, newlimit);
- settingssync["sb" + i] = milliseconds+segment;
- jsonstr = jsonstr.substr(newlimit);
- i++;
- }
- settingssync['blackListCount2'] = i;
- if (zarr['sf'].length) {
- for (var x = 0, forcount=zarr['sf'].length; x < forcount; x++) delete localStorage[zarr['sf'][x]];
- }
- i = 0;
- jsonstr = ssCompress(fpsettings.slice(0,-1));
- while (jsonstr.length > 0) {
- segment = jsonstr.substr(0, newlimit);
- settingssync["sf" + i] = milliseconds+segment;
- jsonstr = jsonstr.substr(newlimit);
- i++;
- }
- settingssync['fpCount'] = i;
- */
- // new syncing method - end
+ jsonstr = ssCompress(JSON.parse(localStorage['whiteList']).toString());
+ i = 0;
+ while (jsonstr.length > 0) {
+ segment = jsonstr.substr(0, newlimit);
+ settingssync["sw" + i] = milliseconds+segment;
+ jsonstr = jsonstr.substr(newlimit);
+ i++;
+ }
+ settingssync['whiteListCount2'] = i;
+ if (zarr['zb'].length) {
+ for (var x = 0, forcount=zarr['zb'].length; x < forcount; x++) deleteSetting(zarr['zb'][x]);
+ }
+ if (zarr['sb'].length) {
+ for (var x = 0, forcount=zarr['sb'].length; x < forcount; x++) deleteSetting(zarr['sb'][x]);
+ }
+ jsonstr = ssCompress(JSON.parse(localStorage['blackList']).toString());
+ i = 0;
+ while (jsonstr.length > 0) {
+ segment = jsonstr.substr(0, newlimit);
+ settingssync["sb" + i] = milliseconds+segment;
+ jsonstr = jsonstr.substr(newlimit);
+ i++;
+ }
+ settingssync['blackListCount2'] = i;
+ if (zarr['sf'].length) {
+ for (var x = 0, forcount=zarr['sf'].length; x < forcount; x++) deleteSetting(zarr['sf'][x]);
+ }
+ i = 0;
+ jsonstr = ssCompress(fpsettings.slice(0,-1));
+ while (jsonstr.length > 0) {
+ segment = jsonstr.substr(0, newlimit);
+ settingssync["sf" + i] = milliseconds+segment;
+ jsonstr = jsonstr.substr(newlimit);
+ i++;
+ }
+ settingssync['fpCount'] = i;
jsonstr = ssCompress(JSON.parse(localStorage['useragent']).toString());
if (zarr['su'].length) {
for (var x = 0, forcount=zarr['su'].length; x < forcount; x++) delete localStorage[zarr['su'][x]];
@@ -1253,19 +1221,21 @@ function freshSync(force) {
}
settingssync['useragentCount2'] = i;
settingssync['lastSync'] = milliseconds;
- localStorage['lastSync'] = milliseconds;
- if (chrome.storage.sync.QUOTA_BYTES < JSON.stringify(settingssync).length) {
+ saveSetting('lastSync', milliseconds);
+ if (102400 < JSON.stringify(settingssync).length) { // 102400 = chrome.storage.sync.QUOTA_BYTES
alert('ScriptSafe cannot sync your settings as it is greater than the total limit.\r\nHowever, you can manually export and import your settings by going to the Options page.');
} else {
- chrome.storage.sync.clear(function() {
- chrome.storage.sync.set(settingssync, function() {
+ var clearStorage = browser.storage.sync.clear();
+ clearStorage.then(function() {
+ var syncStatus = browser.storage.sync.set(settingssync);
+ syncStatus.then(function() {
if (chrome.extension.lastError){
alert(chrome.extension.lastError.message);
} else {
if (localStorage['syncnotify'] == 'true') chrome.notifications.create('syncnotify', {'type': 'basic', 'iconUrl': '../img/icon48.png', 'title': 'ScriptSafe - '+getLocale("exportsuccesstitle"), 'message': getLocale("exportsuccess")}, function(callback) { return true; } );
}
- });
- });
+ }, null);
+ }, null);
}
} else {
synctimer = window.setTimeout(function() { syncQueue() }, 10000);
@@ -1282,43 +1252,35 @@ function importSyncHandle(mode) {
if (storageapi) {
if (mode == '1' || localStorage['syncenable'] == 'true' || localStorage['sync'] == 'false') {
window.clearTimeout(synctimer);
- chrome.storage.sync.get(null, function(changes) {
+ var syncData = browser.storage.sync.get();
+ syncData.then(function(changes) {
if (typeof changes['lastSync'] !== 'undefined') {
if ((mode == '0' && changes['lastSync'] > localStorage['lastSync']) || (mode == '1' && changes['lastSync'] >= localStorage['lastSync'])) {
- if (confirm(getLocale("syncdetect"))) {
- localStorage['syncenable'] = 'true';
- localStorage['sync'] = 'true';
- importSync(changes);
- if (mode == '1') window.setTimeout(function() { window.clearTimeout(synctimer); }, 5000);
- if (localStorage['syncfromnotify'] == 'true') chrome.notifications.create('syncnotify', {'type': 'basic', 'iconUrl': '../img/icon48.png', 'title': 'ScriptSafe - '+getLocale("importsuccesstitle"), 'message': getLocale("importsuccess")}, function(callback) { updated = true; return true; });
- return true;
- } else {
- if (mode != '1') {
- localStorage['syncenable'] = 'false';
- alert(getLocale("syncdisabled"));
- localStorage['sync'] = 'true';
- }
- return false;
- }
+ saveSetting('syncenable', 'true');
+ saveSetting('sync', 'true');
+ importSync(changes);
+ if (mode == '1') window.setTimeout(function() { window.clearTimeout(synctimer); }, 5000);
+ if (localStorage['syncfromnotify'] == 'true') chrome.notifications.create('syncnotify', {'type': 'basic', 'iconUrl': '../img/icon48.png', 'title': 'ScriptSafe - '+getLocale("importsuccesstitle"), 'message': getLocale("importsuccess")}, function(callback) { updated = true; return true; });
+ return true;
}
}
- if (mode == '1' || (localStorage['sync'] == 'false' && mode == '0')) {
- localStorage['syncenable'] = 'false';
- localStorage['sync'] = 'true';
+ if (localStorage['sync'] == 'false' && mode == '0') {
+ saveSetting('syncenable', 'false');
+ saveSetting('sync', 'true');
return false;
}
- });
+ }, null);
}
} else {
alert(getLocale("syncnotsupported"));
- localStorage['sync'] = 'true';
+ saveSetting('sync', 'true');
return false;
}
}
function importSync(changes) {
for (var key in changes) {
if (key != 'scriptsafe_settings') {
- localStorage[key] = changes[key];
+ saveSetting(key, changes[key]);
} else if (key == 'scriptsafe_settings') {
var settings = changes[key].split("~");
if (settings.length > 0) {
@@ -1326,7 +1288,7 @@ function importSync(changes) {
if ($.trim(v) != "") {
var settingentry = $.trim(v).split("|");
if ($.trim(settingentry[1]) != '') {
- localStorage[$.trim(settingentry[0])] = $.trim(settingentry[1]);
+ saveSetting($.trim(settingentry[0]), $.trim(settingentry[1]));
}
}
});
@@ -1347,7 +1309,7 @@ function listsSync() {
if (localStorage['sf'+i]) {
if (localStorage['sf'+i].substr(0, 13) == localStorage['lastSync']) concatlist += localStorage['sf'+i].substr(13);
else listerror = true;
- delete localStorage['sf'+i];
+ deleteSetting('sf'+i);
}
}
if (!listerror) {
@@ -1359,7 +1321,7 @@ function listsSync() {
if ($.trim(v) != "") {
var settingentry = $.trim(v).split("|");
if ($.trim(settingentry[1]) != '') {
- localStorage[$.trim(settingentry[0])] = $.trim(settingentry[1]);
+ saveSetting($.trim(settingentry[0]), $.trim(settingentry[1]));
}
}
});
@@ -1367,9 +1329,9 @@ function listsSync() {
}
} else {
alert('Incomplete fingerprint whitelist data was detected. Very large lists are known to cause issues with syncing.\r\nAs a safety precaution, your fingerprint whitelist has not been updated and syncing has been disabled on this device to prevent overwriting data on other devices.\r\nPlease consider manually exporting your latest settings and importing it into your other devices from the Options page.');
- localStorage['syncenable'] = 'false';
+ saveSetting('syncenable', 'false');
}
- delete localStorage['fpCount'];
+ deleteSetting('fpCount');
}
cacheLists();
cacheFpLists();
@@ -1392,14 +1354,14 @@ function listsSyncParse(type) {
else {
listerror = true;
}
- delete localStorage['s'+lsName+i];
+ deleteSetting('s'+lsName+i);
} else {
listerror = true;
}
} else if (counttype == type+'Count') {
if (localStorage['z'+lsName+i]) {
concatlist += localStorage['z'+lsName+i];
- delete localStorage['z'+lsName+i];
+ deleteSetting('z'+lsName+i);
} else {
listerror = true;
}
@@ -1411,14 +1373,14 @@ function listsSyncParse(type) {
}
}
if (!listerror) {
- if (concatlist == '' || concatlistarr.length == 0) localStorage[type+''] = JSON.stringify([]);
- else localStorage[type+''] = JSON.stringify(concatlistarr);
+ if (concatlist == '' || concatlistarr.length == 0) saveSetting(type+'', JSON.stringify([]));
+ else saveSetting(type+'', JSON.stringify(concatlistarr));
} else {
alert('Incomplete '+type.toLowerCase()+' data was detected. Very large lists are known to cause issues with syncing.\r\nAs a safety precaution, your '+type.toLowerCase()+' has not been updated and syncing has been disabled on this device to prevent overwriting data on other devices.\r\nPlease consider manually exporting your latest settings and importing it into your other devices from the Options page.');
- localStorage['syncenable'] = 'false';
+ saveSetting('syncenable', 'false');
}
- if (optionExists(type+'Count2')) delete localStorage[type+'Count2'];
- if (optionExists(type+'Count')) delete localStorage[type+'Count'];
+ if (optionExists(type+'Count2')) deleteSetting(type+'Count2');
+ if (optionExists(type+'Count')) deleteSetting(type+'Count');
}
}
function getUpdated() {
@@ -1502,53 +1464,25 @@ function getLocale(str) {
function getLangs() {
return langs;
}
-var uiLang = chrome.i18n.getUILanguage().replace(/-/g, '_');
-if (!optionExists("locale")) {
- localStorage['locale'] = 'en_US';
- if (uiLang != 'en' && uiLang != 'en_GB' && uiLang != 'en_US') {
- if (typeof langs[uiLang] !== 'undefined') {
- if (confirm('ScriptSafe detected that your browser is currently set to '+langs[uiLang]+'.\r\nWould you like to use ScriptSafe in '+langs[uiLang]+'?\r\nIf you click on "Cancel", English (US) will be set.')) {
- localStorage['locale'] = uiLang;
- }
+loadSettingsFromStorage();
+var storageData = browser.storage.local.get('locale');
+storageData.then(function(data) {
+ if (data && data.locale) {
+ var uiLang = chrome.i18n.getUILanguage().replace(/-/g, '_');
+ if (typeof langs[uiLang] === 'undefined') {
+ saveSetting('locale', 'en_US');
}
+ } else {
+ saveSetting('locale', 'en_US');
}
-} else {
- if (typeof langs[uiLang] === 'undefined') {
- localStorage['locale'] = 'en_US';
- }
-}
-initLang(localStorage['locale'], 1);
+ initLang(data.locale, 1);
+}, null);
function postLangLoad() {
if (!optionExists("version") || localStorage["version"] != version) {
- // One-time update existing whitelist/blacklist for new regex support introduced in v1.0.7.0
- if (!optionExists("tempregexflag")) {
- if (optionExists("version")) {
- var tempList = JSON.parse(localStorage['blackList']);
- var tempNewList = [];
- if (tempList.length) {
- tempList.map(function(domain) {
- if (domain.substr(0,2) == '*.') tempNewList.push('*'+domain);
- else tempNewList.push(domain);
- });
- localStorage['blackList'] = JSON.stringify(tempNewList);
- }
- tempList = JSON.parse(localStorage['whiteList']);
- if (tempList.length) {
- tempNewList = [];
- tempList.map(function(domain) {
- if (domain.substr(0,2) == '*.') tempNewList.push('*'+domain);
- else tempNewList.push(domain);
- });
- localStorage['whiteList'] = JSON.stringify(tempNewList);
- }
- }
- localStorage['tempregexflag'] = "true";
- syncQueue();
- }
if (localStorage["updatenotify"] == "true") {
chrome.tabs.create({ url: chrome.extension.getURL('html/updated.html')});
}
- localStorage["version"] = version;
+ saveSetting('version', version);
}
setDefaultOptions();
if (typeof chrome.storage !== 'undefined') {
@@ -1565,19 +1499,33 @@ function postLangLoad() {
}
}
if (storageapi) {
- chrome.storage.onChanged.addListener(function(changes, namespace) {
- if (namespace == 'sync' && localStorage['syncenable'] == 'true') {
- if (typeof changes['lastSync'] !== 'undefined') {
- if (changes['lastSync'].newValue && changes['lastSync'].newValue > localStorage['lastSync']) {
- chrome.storage.sync.get(null, function(changes) {
- importSync(changes);
- if (localStorage['syncfromnotify'] == 'true') chrome.notifications.create('syncnotify', {'type': 'basic', 'iconUrl': '../img/icon48.png', 'title': 'ScriptSafe - '+getLocale("importsuccesstitle"), 'message': getLocale("importsuccess")}, function(callback) { updated = true; return true; });
- });
- }
- }
+ browser.storage.onChanged.addListener(function(changes, namespace) {
+ if (namespace == 'sync') {
+ if (!optionExists('version')) {
+ let getSettings = browser.storage.local.get();
+ getSettings.then(function(setting) {
+ for (var i in setting) {
+ localStorage[i] = setting[i];
+ }
+ handleSyncUpdate(changes, namespace);
+ }, null);
+ } else handleSyncUpdate(changes, namespace);
}
});
importSyncHandle(0);
}
init();
+}
+function handleSyncUpdate(changes, namespace) {
+ if (localStorage['syncenable'] == 'true') {
+ if (typeof changes['lastSync'] !== 'undefined') {
+ if (changes['lastSync'].newValue && changes['lastSync'].newValue > localStorage['lastSync']) {
+ var syncData = browser.storage.sync.get();
+ syncData.then(function(changes) {
+ importSync(changes);
+ if (localStorage['syncfromnotify'] == 'true') chrome.notifications.create('syncnotify', {'type': 'basic', 'iconUrl': '../img/icon48.png', 'title': 'ScriptSafe - '+getLocale("importsuccesstitle"), 'message': getLocale("importsuccess")}, function(callback) { updated = true; return true; });
+ }, null);
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/js/updated.js b/js/updated.js
index efdb01d..a0b86a8 100644
--- a/js/updated.js
+++ b/js/updated.js
@@ -3,7 +3,7 @@
// The GNU General Public License can be found in the gpl.txt file. Alternatively, see .
var bkg = chrome.extension.getBackgroundPage();
document.addEventListener('DOMContentLoaded', function () {
- var version = '1.0.9.3';
+ var version = '1.0.9.8';
$("#title").html("ScriptSafe v"+version);
$('#versionno').html(version);
$("#loadoptionspage").click(function() { location.href='options.html'; });
@@ -17,7 +17,7 @@ document.addEventListener('DOMContentLoaded', function () {
});
function disableNotification() {
if (confirm(bkg.getLocale("updatedisable"))) {
- localStorage['updatenotify'] = 'false';
+ bkg.saveSetting('updatenotify', 'false');
$('#message').html(bkg.getLocale("updatedisablemessage")).stop().fadeIn("slow").delay(2000).fadeOut("slow");
}
}
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 7a801b3..6929ebb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -41,11 +41,17 @@
"32": "img/icon32.png",
"48": "img/icon48.png"
},
+ "applications": {
+ "gecko": {
+ "id": "scriptsafe@protonmail.com",
+ "strict_min_version": "57.0"
+ }
+ },
"default_locale": "en",
"manifest_version": 2,
"minimum_chrome_version": "6",
"name": "ScriptSafe",
- "options_page": "html/options.html",
+ "options_ui": { "page": "html/options.html", "open_in_tab": true },
"permissions": [ "http://*/*", "https://*/*", "tabs", "unlimitedStorage", "webRequest", "webRequestBlocking", "storage", "notifications", "privacy", "contextMenus" ],
- "version": "1.0.9.3"
+ "version": "1.0.9.8"
}