Skip to content
This repository was archived by the owner on Nov 15, 2017. It is now read-only.

Commit de24d85

Browse files
gorhillgorhill
committed
setup can now load from assets cache
1 parent a529e8c commit de24d85

File tree

3 files changed

+29
-46
lines changed

3 files changed

+29
-46
lines changed

‎js/about.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ var restoreUserDataFromFile = function() {
8989
accept: 'text/plain'
9090
});
9191

92-
var restartCountdown = 2;
92+
var restartCountdown = 4;
9393
var doCountdown = function() {
9494
restartCountdown -= 1;
9595
if ( restartCountdown > 0 ) {
@@ -100,7 +100,7 @@ var restoreUserDataFromFile = function() {
100100

101101
var restoreBackup = function(data) {
102102
var httpsb = getHTTPSB();
103-
chrome.storage.local.set(data.userSettings);
103+
chrome.storage.local.set(data.userSettings, doCountdown);
104104
var store = {
105105
'version': data.version,
106106
'scopes': data.scopes
@@ -110,7 +110,7 @@ var restoreUserDataFromFile = function() {
110110
if ( data.remoteBlacklists !== undefined ) {
111111
store.remoteBlacklists = data.remoteBlacklists;
112112
}
113-
chrome.storage.local.set(store);
113+
chrome.storage.local.set(store, doCountdown);
114114
httpsb.assets.put(httpsb.userBlacklistPath, data.ubiquitousBlacklist, doCountdown);
115115
httpsb.assets.put(httpsb.userWhitelistPath, data.ubiquitousWhitelist, doCountdown);
116116
};

‎js/setup.js‎

Lines changed: 20 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,20 @@ var restoreUserDataFromFile = function() {
3737
if ( inputElem.length === 0 ) {
3838
return;
3939
}
40-
var setupUrl = chrome.runtime.getURL(inputElem.val());
40+
var setupUrl = inputElem.val();
41+
42+
var restartCountdown = 4;
43+
var doCountdown = function() {
44+
restartCountdown -= 1;
45+
if ( restartCountdown > 0 ) {
46+
return;
47+
}
48+
chrome.runtime.reload();
49+
};
4150

4251
var restoreBackup = function(data) {
4352
var httpsb = getHTTPSB();
44-
chrome.storage.local.set(data.userSettings);
53+
chrome.storage.local.set(data.userSettings, doCountdown);
4554
var store = {
4655
'version': data.version,
4756
'scopes': data.scopes
@@ -51,9 +60,9 @@ var restoreUserDataFromFile = function() {
5160
if ( data.remoteBlacklists !== undefined ) {
5261
store.remoteBlacklists = data.remoteBlacklists;
5362
}
54-
chrome.storage.local.set(store);
55-
httpsb.assets.put(httpsb.userBlacklistPath, data.ubiquitousBlacklist, 'restoreUserDataFromFileUserRestartCountdown');
56-
httpsb.assets.put(httpsb.userWhitelistPath, data.ubiquitousWhitelist, 'restoreUserDataFromFileUserRestartCountdown');
63+
chrome.storage.local.set(store, doCountdown);
64+
httpsb.assets.put(httpsb.userBlacklistPath, data.ubiquitousBlacklist, doCountdown);
65+
httpsb.assets.put(httpsb.userWhitelistPath, data.ubiquitousWhitelist, doCountdown);
5766
};
5867

5968
var validateBackup = function(s) {
@@ -76,8 +85,11 @@ var restoreUserDataFromFile = function() {
7685
return data;
7786
};
7887

79-
var onLoadHandler = function() {
80-
var data = validateBackup(this.responseText);
88+
var onLoadHandler = function(details) {
89+
if ( details.error ) {
90+
return;
91+
}
92+
var data = validateBackup(details.content);
8193
if ( !data ) {
8294
return;
8395
}
@@ -89,36 +101,7 @@ var restoreUserDataFromFile = function() {
89101
}
90102
};
91103

92-
var getSetupDataFromURL = function(url, onLoad, onError) {
93-
// console.log('HTTP Switchboard> getTextFileFromURL("%s"):', url);
94-
var xhr = new XMLHttpRequest();
95-
xhr.responseType = 'text';
96-
xhr.onload = onLoad;
97-
xhr.onerror = onError;
98-
xhr.ontimeout = onError;
99-
xhr.open('get', url, true);
100-
xhr.send();
101-
};
102-
103-
104-
var restartCountdown = 2;
105-
var onMessageHandler = function(request) {
106-
if ( !request || !request.what ) {
107-
return;
108-
}
109-
if ( request.what === 'restoreUserDataFromFileUserRestartCountdown' ) {
110-
restartCountdown -= 1;
111-
if ( restartCountdown > 0 ) {
112-
return;
113-
}
114-
}
115-
chrome.runtime.onMessage.removeListener(onMessageHandler);
116-
chrome.runtime.reload();
117-
};
118-
119-
chrome.runtime.onMessage.addListener(onMessageHandler);
120-
121-
getSetupDataFromURL(setupUrl, onLoadHandler, function(){});
104+
getHTTPSB().assets.get(setupUrl, onLoadHandler);
122105
};
123106

124107
$('.setup img').on('click', restoreUserDataFromFile);

‎setup.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ <h3 data-i18n="setupBlockAllAllowExceptionally"></h3>
4545
<br><span data-i18n="setupBreakage"></span> <span data-i18n="setupHigh"></span>
4646
</p>
4747
<img src="img/httpsb-block-all-allow-exceptionally.png" />
48-
<input type="hidden" value="/assets/httpsb/setup/httpsb-factory-setup.txt" />
48+
<input type="hidden" value="assets/httpsb/setup/httpsb-factory-setup.txt" />
4949
</div>
5050

5151
<div class="setup">
@@ -54,7 +54,7 @@ <h3 data-i18n="setupAllowAllBlockExceptionally"></h3>
5454
<br><span data-i18n="setupBreakage"></span> <span data-i18n="setupMediumLow"></span>
5555
</p>
5656
<img src="img/httpsb-allow-all-block-exceptionally.png" />
57-
<input type="hidden" value="/assets/httpsb/setup/httpsb-allow-all-block-exceptionally-setup.txt" />
57+
<input type="hidden" value="assets/httpsb/setup/httpsb-allow-all-block-exceptionally-setup.txt" />
5858
</div>
5959

6060
<div class="setup">
@@ -63,7 +63,7 @@ <h3 data-i18n="setupAdBlocker"></h3>
6363
<br><span data-i18n="setupBreakage"></span> <span data-i18n="setupLow"></span>
6464
</p>
6565
<img src="img/httpsb-as-abp.png" />
66-
<input type="hidden" value="/assets/httpsb/setup/httpsb-just-block-ads-setup.txt" />
66+
<input type="hidden" value="assets/httpsb/setup/httpsb-just-block-ads-setup.txt" />
6767
</div>
6868

6969
<div class="setup">
@@ -72,7 +72,7 @@ <h3 data-i18n="setupNoScript">NoScript-like</h3>
7272
<br><span data-i18n="setupBreakage"></span> <span data-i18n="setupHigh"></span>
7373
</p>
7474
<img src="img/httpsb-as-noscript.png" />
75-
<input type="hidden" value="/assets/httpsb/setup/httpsb-noscript-like-setup.txt" />
75+
<input type="hidden" value="assets/httpsb/setup/httpsb-noscript-like-setup.txt" />
7676
</div>
7777

7878
<div class="setup">
@@ -81,7 +81,7 @@ <h3 data-i18n="setupRequestPolicy"></h3>
8181
<br><span data-i18n="setupBreakage"></span> <span data-i18n="setupHigh"></span>
8282
</p>
8383
<img src="img/httpsb-as-requestpolicy.png" />
84-
<input type="hidden" value="/assets/httpsb/setup/httpsb-requestpolicy-like-setup.txt" />
84+
<input type="hidden" value="assets/httpsb/setup/httpsb-requestpolicy-like-setup.txt" />
8585
</div>
8686

8787
<div class="setup">
@@ -90,7 +90,7 @@ <h3 data-i18n="setupBlockNothingReportAll"></h3>
9090
<br><span data-i18n="setupBreakage"></span> <span data-i18n="setupNone"></span>
9191
</p>
9292
<img src="img/httpsb-allow-all-disclose-all.png" />
93-
<input type="hidden" value="/assets/httpsb/setup/httpsb-block-nothing-report-everything-setup.txt" />
93+
<input type="hidden" value="assets/httpsb/setup/httpsb-block-nothing-report-everything-setup.txt" />
9494
</div>
9595

9696
</div>

0 commit comments

Comments
 (0)