-
-
-
-
-
+
+
+
+
+
diff --git a/src/js/1p-filters.js b/src/js/1p-filters.js
index 6182e9c44..358f0238b 100644
--- a/src/js/1p-filters.js
+++ b/src/js/1p-filters.js
@@ -19,7 +19,7 @@
Home: https://github.com/gorhill/uBlock
*/
-/* global vAPI, uDom */
+/* global vAPI, uDom, uBlockDashboard */
/******************************************************************************/
@@ -40,8 +40,9 @@ var messager = vAPI.messaging.channel('1p-filters.js');
// This is to give a visual hint that the content of user blacklist has changed.
function userFiltersChanged() {
- uDom.nodeFromId('userFiltersApply').disabled =
- uDom('#userFilters').val().trim() === cachedUserFilters;
+ var changed = uDom.nodeFromId('userFilters').value.trim() !== cachedUserFilters;
+ uDom.nodeFromId('userFiltersApply').disabled = !changed;
+ uDom.nodeFromId('userFiltersRevert').disabled = !changed;
}
/******************************************************************************/
@@ -53,6 +54,7 @@ function renderUserFilters() {
}
cachedUserFilters = details.content.trim();
uDom.nodeFromId('userFilters').value = details.content;
+ userFiltersChanged();
};
messager.send({ what: 'readUserFilters' }, onRead);
}
@@ -133,14 +135,14 @@ var exportUserFiltersToFile = function() {
.replace('{{datetime}}', now.toLocaleString())
.replace(/ +/g, '_');
vAPI.download({
- 'url': 'data:text/plain;charset=utf-8,' + encodeURIComponent(val),
+ 'url': 'data:text/plain;charset=utf-8,' + encodeURIComponent(val + '\n'),
'filename': filename
});
};
/******************************************************************************/
-var userFiltersApplyHandler = function() {
+var applyChanges = function() {
var onWritten = function(details) {
if ( details.error ) {
return;
@@ -156,17 +158,26 @@ var userFiltersApplyHandler = function() {
messager.send(request, onWritten);
};
+var revertChanges = function() {
+ uDom.nodeFromId('userFilters').value = cachedUserFilters + '\n';
+ userFiltersChanged();
+};
+
/******************************************************************************/
var getCloudData = function() {
return uDom.nodeFromId('userFilters').value;
};
-var setCloudData = function(data) {
+var setCloudData = function(data, append) {
if ( typeof data !== 'string' ) {
return;
}
- uDom.nodeFromId('userFilters').value = data;
+ var textarea = uDom.nodeFromId('userFilters');
+ if ( append ) {
+ data = uBlockDashboard.mergeNewLines(textarea.value, data);
+ }
+ textarea.value = data;
userFiltersChanged();
};
@@ -180,7 +191,8 @@ uDom('#importUserFiltersFromFile').on('click', startImportFilePicker);
uDom('#importFilePicker').on('change', handleImportFilePicker);
uDom('#exportUserFiltersToFile').on('click', exportUserFiltersToFile);
uDom('#userFilters').on('input', userFiltersChanged);
-uDom('#userFiltersApply').on('click', userFiltersApplyHandler);
+uDom('#userFiltersApply').on('click', applyChanges);
+uDom('#userFiltersRevert').on('click', revertChanges);
renderUserFilters();
diff --git a/src/js/cloud-ui.js b/src/js/cloud-ui.js
index 9bca1fbcf..f129dc750 100644
--- a/src/js/cloud-ui.js
+++ b/src/js/cloud-ui.js
@@ -110,9 +110,9 @@ var pushData = function() {
/******************************************************************************/
-var pullData = function() {
+var pullData = function(ev) {
if ( typeof self.cloud.onPull === 'function' ) {
- self.cloud.onPull(self.cloud.data);
+ self.cloud.onPull(self.cloud.data, ev.shiftKey);
}
};
@@ -196,4 +196,6 @@ messager.send({ what: 'cloudGetOptions' }, onInitialize);
/******************************************************************************/
+// https://www.youtube.com/watch?v=aQFp67VoiDA
+
})();
diff --git a/src/js/dashboard-common.js b/src/js/dashboard-common.js
index ef2445724..e34e18ac1 100644
--- a/src/js/dashboard-common.js
+++ b/src/js/dashboard-common.js
@@ -24,7 +24,86 @@
/******************************************************************************/
-uDom.onLoad(function() {
+self.uBlockDashboard = self.uBlockDashboard || {};
+
+/******************************************************************************/
+
+// Helper for client panes:
+// Remove literal duplicate lines from a set based on another set.
+
+self.uBlock.mergeNewLines = function(text, newText) {
+ var lineBeg, textEnd, lineEnd;
+ var line, hash, bucket;
+
+ // Step 1: build dictionary for existing lines.
+ var fromDict = Object.create(null);
+ lineBeg = 0;
+ textEnd = text.length;
+ while ( lineBeg < textEnd ) {
+ lineEnd = text.indexOf('\n', lineBeg);
+ if ( lineEnd === -1 ) {
+ lineEnd = text.indexOf('\r', lineBeg);
+ if ( lineEnd === -1 ) {
+ lineEnd = textEnd;
+ }
+ }
+ line = text.slice(lineBeg, lineEnd).trim();
+ lineBeg = lineEnd + 1;
+ if ( line.length === 0 ) {
+ continue;
+ }
+ hash = line.slice(0, 8);
+ bucket = fromDict[hash];
+ if ( bucket === undefined ) {
+ fromDict[hash] = line;
+ } else if ( typeof bucket === 'string' ) {
+ fromDict[hash] = [bucket, line];
+ } else /* if ( Array.isArray(bucket) ) */ {
+ bucket.push(line);
+ }
+ }
+
+ // Step 2: use above dictionary to filter out duplicate lines.
+ var out = [ '' ];
+ lineBeg = 0;
+ textEnd = newText.length;
+ while ( lineBeg < textEnd ) {
+ lineEnd = newText.indexOf('\n', lineBeg);
+ if ( lineEnd === -1 ) {
+ lineEnd = newText.indexOf('\r', lineBeg);
+ if ( lineEnd === -1 ) {
+ lineEnd = textEnd;
+ }
+ }
+ line = newText.slice(lineBeg, lineEnd).trim();
+ lineBeg = lineEnd + 1;
+ if ( line.length === 0 ) {
+ if ( out[out.length - 1] !== '' ) {
+ out.push('');
+ }
+ continue;
+ }
+ bucket = fromDict[line.slice(0, 8)];
+ if ( bucket === undefined ) {
+ out.push(line);
+ continue;
+ }
+ if ( typeof bucket === 'string' && line !== bucket ) {
+ out.push(line);
+ continue;
+ }
+ if ( bucket.indexOf(line) === -1 ) {
+ out.push(line);
+ /* continue; */
+ }
+ }
+
+ return text.trim() + '\n' + out.join('\n');
+};
+
+/******************************************************************************/
+
+(function() {
// Open links in the proper window
uDom('a').attr('target', '_blank');
uDom('a[href*="dashboard.html"]').attr('target', '_parent');
@@ -34,4 +113,4 @@ uDom.onLoad(function() {
.descendants('.whatisthis-expandable')
.toggleClass('whatisthis-expanded');
});
-});
+})();
diff --git a/src/js/dyna-rules.js b/src/js/dyna-rules.js
index fa880f93d..c01765203 100644
--- a/src/js/dyna-rules.js
+++ b/src/js/dyna-rules.js
@@ -158,7 +158,7 @@ function exportUserRulesToFile() {
.replace('{{datetime}}', now.toLocaleString())
.replace(/ +/g, '_');
vAPI.download({
- 'url': 'data:text/plain,' + encodeURIComponent(rulesFromHTML('#diff .left li')),
+ 'url': 'data:text/plain,' + encodeURIComponent(rulesFromHTML('#diff .left li') + '\n'),
'filename': filename,
'saveAs': true
});
@@ -238,10 +238,13 @@ var getCloudData = function() {
return rulesFromHTML('#diff .left li');
};
-var setCloudData = function(data) {
+var setCloudData = function(data, append) {
if ( typeof data !== 'string' ) {
return;
}
+ if ( append ) {
+ data = rulesFromHTML('#diff .right li') + '\n' + data;
+ }
var request = {
'what': 'setSessionRules',
'rules': data
diff --git a/src/js/whitelist.js b/src/js/whitelist.js
index 0c7329e14..96a733d5e 100644
--- a/src/js/whitelist.js
+++ b/src/js/whitelist.js
@@ -19,7 +19,7 @@
Home: https://github.com/gorhill/uBlock
*/
-/* global vAPI, uDom */
+/* global vAPI, uDom, uBlockDashboard */
/******************************************************************************/
@@ -41,24 +41,24 @@ var reUnwantedChars = /[\x00-\x09\x0b\x0c\x0e-\x1f!"$'()<>{}|\\^\[\]`~]/;
/******************************************************************************/
var whitelistChanged = function() {
- var s = uDom.nodeFromId('whitelist').value.trim();
+ var textarea = uDom.nodeFromId('whitelist');
+ var s = textarea.value.trim();
+ var changed = s === cachedWhitelist;
var bad = reUnwantedChars.test(s);
- uDom('#whitelistApply').prop(
- 'disabled',
- s === cachedWhitelist || bad
- );
- uDom('#whitelist').toggleClass('bad', bad);
+ uDom.nodeFromId('whitelistApply').disabled = changed || bad;
+ uDom.nodeFromId('whitelistRevert').disabled = changed;
+ textarea.classList.toggle('bad', bad);
};
/******************************************************************************/
var renderWhitelist = function() {
var onRead = function(whitelist) {
- cachedWhitelist = whitelist;
- uDom.nodeFromId('whitelist').value = whitelist;
+ cachedWhitelist = whitelist.trim();
+ uDom.nodeFromId('whitelist').value = cachedWhitelist + '\n';
+ whitelistChanged();
};
messager.send({ what: 'getWhitelist' }, onRead);
- whitelistChanged();
};
/******************************************************************************/
@@ -104,15 +104,15 @@ var exportWhitelistToFile = function() {
.replace('{{datetime}}', now.toLocaleString())
.replace(/ +/g, '_');
vAPI.download({
- 'url': 'data:text/plain;charset=utf-8,' + encodeURIComponent(val),
+ 'url': 'data:text/plain;charset=utf-8,' + encodeURIComponent(val + '\n'),
'filename': filename
});
};
/******************************************************************************/
-var whitelistApplyHandler = function() {
- cachedWhitelist = uDom('#whitelist').val().trim();
+var applyChanges = function() {
+ cachedWhitelist = uDom.nodeFromId('whitelist').value.trim();
var request = {
what: 'setWhitelist',
whitelist: cachedWhitelist
@@ -120,17 +120,26 @@ var whitelistApplyHandler = function() {
messager.send(request, renderWhitelist);
};
+var revertChanges = function() {
+ uDom.nodeFromId('whitelist').value = cachedWhitelist + '\n';
+ whitelistChanged();
+};
+
/******************************************************************************/
var getCloudData = function() {
return uDom.nodeFromId('whitelist').value;
};
-var setCloudData = function(data) {
+var setCloudData = function(data, append) {
if ( typeof data !== 'string' ) {
return;
}
- uDom.nodeFromId('whitelist').value = data;
+ var textarea = uDom.nodeFromId('whitelist');
+ if ( append ) {
+ data = uBlockDashboard.mergeNewLines(textarea.value.trim(), data);
+ }
+ textarea.value = data.trim() + '\n';
whitelistChanged();
};
@@ -143,7 +152,8 @@ uDom('#importWhitelistFromFile').on('click', startImportFilePicker);
uDom('#importFilePicker').on('change', handleImportFilePicker);
uDom('#exportWhitelistToFile').on('click', exportWhitelistToFile);
uDom('#whitelist').on('input', whitelistChanged);
-uDom('#whitelistApply').on('click', whitelistApplyHandler);
+uDom('#whitelistApply').on('click', applyChanges);
+uDom('#whitelistRevert').on('click', revertChanges);
renderWhitelist();
diff --git a/src/settings.html b/src/settings.html
index e5188135d..25bd7d6d2 100644
--- a/src/settings.html
+++ b/src/settings.html
@@ -39,11 +39,11 @@
diff --git a/src/whitelist.html b/src/whitelist.html
index 8d4555aa2..1be089354 100644
--- a/src/whitelist.html
+++ b/src/whitelist.html
@@ -14,11 +14,16 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+