2014-12-31 23:26:17 +01:00
|
|
|
/*******************************************************************************
|
|
|
|
|
2016-03-06 16:51:06 +01:00
|
|
|
uBlock Origin - a browser extension to block requests.
|
2018-09-03 20:06:49 +02:00
|
|
|
Copyright (C) 2014-present Raymond Hill
|
2014-12-31 23:26:17 +01:00
|
|
|
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program. If not, see {http://www.gnu.org/licenses/}.
|
|
|
|
|
|
|
|
Home: https://github.com/gorhill/uMatrix
|
|
|
|
*/
|
|
|
|
|
2018-03-11 15:59:39 +01:00
|
|
|
/* global diff_match_patch, CodeMirror, uDom, uBlockDashboard */
|
|
|
|
|
|
|
|
'use strict';
|
2014-12-31 23:26:17 +01:00
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
|
|
(function() {
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
2018-12-22 17:55:13 +01:00
|
|
|
const messaging = vAPI.messaging;
|
2014-12-31 23:26:17 +01:00
|
|
|
|
2018-12-22 17:55:13 +01:00
|
|
|
const mergeView = new CodeMirror.MergeView(
|
2018-03-11 15:59:39 +01:00
|
|
|
document.querySelector('.codeMirrorMergeContainer'),
|
|
|
|
{
|
|
|
|
allowEditingOriginals: true,
|
2018-03-16 12:49:56 +01:00
|
|
|
connect: 'align',
|
2018-03-21 12:24:52 +01:00
|
|
|
inputStyle: 'contenteditable',
|
2018-03-11 15:59:39 +01:00
|
|
|
lineNumbers: true,
|
|
|
|
lineWrapping: false,
|
|
|
|
origLeft: '',
|
|
|
|
revertButtons: true,
|
|
|
|
value: ''
|
2015-04-09 17:19:31 +02:00
|
|
|
}
|
2018-03-11 15:59:39 +01:00
|
|
|
);
|
|
|
|
mergeView.editor().setOption('styleActiveLine', true);
|
|
|
|
mergeView.editor().setOption('lineNumbers', false);
|
|
|
|
mergeView.leftOriginal().setOption('readOnly', 'nocursor');
|
2015-04-09 17:19:31 +02:00
|
|
|
|
2018-03-28 01:10:31 +02:00
|
|
|
uBlockDashboard.patchCodeMirrorEditor(mergeView.editor());
|
|
|
|
|
2018-12-22 17:55:13 +01:00
|
|
|
const unfilteredRules = {
|
2018-03-21 12:24:52 +01:00
|
|
|
orig: { doc: mergeView.leftOriginal(), rules: [] },
|
|
|
|
edit: { doc: mergeView.editor(), rules: [] }
|
|
|
|
};
|
|
|
|
|
2018-12-22 17:55:13 +01:00
|
|
|
let cleanEditToken = 0;
|
|
|
|
let cleanEditText = '';
|
2015-02-11 17:34:51 +01:00
|
|
|
|
2018-12-22 17:55:13 +01:00
|
|
|
let differ;
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
|
|
// The following code is to take care of properly internationalizing
|
|
|
|
// the tooltips of the arrows used by the CodeMirror merge view. These
|
|
|
|
// are hard-coded by CodeMirror ("Push to left", "Push to right"). An
|
|
|
|
// observer is necessary because there is no hook for uBO to overwrite
|
|
|
|
// reliably the default title attribute assigned by CodeMirror.
|
|
|
|
|
|
|
|
(function() {
|
|
|
|
const i18nCommitStr = vAPI.i18n('rulesCommit');
|
|
|
|
const i18nRevertStr = vAPI.i18n('rulesRevert');
|
|
|
|
const commitArrowSelector = '.CodeMirror-merge-copybuttons-left .CodeMirror-merge-copy-reverse:not([title="' + i18nCommitStr + '"])';
|
|
|
|
const revertArrowSelector = '.CodeMirror-merge-copybuttons-left .CodeMirror-merge-copy:not([title="' + i18nRevertStr + '"])';
|
|
|
|
|
|
|
|
uDom.nodeFromSelector('.CodeMirror-merge-scrolllock')
|
|
|
|
.setAttribute('title', vAPI.i18n('genericMergeViewScrollLock'));
|
|
|
|
|
|
|
|
const translate = function() {
|
|
|
|
let elems = document.querySelectorAll(commitArrowSelector);
|
|
|
|
for ( const elem of elems ) {
|
|
|
|
elem.setAttribute('title', i18nCommitStr);
|
|
|
|
}
|
|
|
|
elems = document.querySelectorAll(revertArrowSelector);
|
|
|
|
for ( const elem of elems ) {
|
|
|
|
elem.setAttribute('title', i18nRevertStr);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
const mergeGapObserver = new MutationObserver(translate);
|
|
|
|
|
|
|
|
mergeGapObserver.observe(
|
|
|
|
uDom.nodeFromSelector('.CodeMirror-merge-copybuttons-left'),
|
|
|
|
{ attributes: true, attributeFilter: [ 'title' ], subtree: true }
|
|
|
|
);
|
|
|
|
|
|
|
|
})();
|
2018-03-11 15:59:39 +01:00
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
2018-03-21 12:24:52 +01:00
|
|
|
// Borrowed from...
|
|
|
|
// https://github.com/codemirror/CodeMirror/blob/3e1bb5fff682f8f6cbfaef0e56c61d62403d4798/addon/search/search.js#L22
|
|
|
|
// ... and modified as needed.
|
|
|
|
|
2018-12-22 17:55:13 +01:00
|
|
|
const updateOverlay = (function() {
|
2018-09-03 20:06:49 +02:00
|
|
|
let reFilter;
|
|
|
|
let mode = {
|
2018-03-21 12:24:52 +01:00
|
|
|
token: function(stream) {
|
|
|
|
if ( reFilter !== undefined ) {
|
|
|
|
reFilter.lastIndex = stream.pos;
|
2018-09-03 20:06:49 +02:00
|
|
|
let match = reFilter.exec(stream.string);
|
2018-03-21 12:24:52 +01:00
|
|
|
if ( match !== null ) {
|
|
|
|
if ( match.index === stream.pos ) {
|
|
|
|
stream.pos += match[0].length || 1;
|
|
|
|
return 'searching';
|
|
|
|
}
|
|
|
|
stream.pos = match.index;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
stream.skipToEnd();
|
|
|
|
}
|
|
|
|
};
|
|
|
|
return function(filter) {
|
|
|
|
reFilter = typeof filter === 'string' && filter !== '' ?
|
|
|
|
new RegExp(filter.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'gi') :
|
|
|
|
undefined;
|
|
|
|
return mode;
|
|
|
|
};
|
|
|
|
})();
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
2018-03-11 15:59:39 +01:00
|
|
|
// Incrementally update text in a CodeMirror editor for best user experience:
|
|
|
|
// - Scroll position preserved
|
|
|
|
// - Minimum amount of text updated
|
|
|
|
|
2018-12-22 17:55:13 +01:00
|
|
|
const rulesToDoc = function(clearHistory) {
|
2018-09-03 20:06:49 +02:00
|
|
|
for ( let key in unfilteredRules ) {
|
2018-03-21 12:24:52 +01:00
|
|
|
if ( unfilteredRules.hasOwnProperty(key) === false ) { continue; }
|
2018-09-03 20:06:49 +02:00
|
|
|
let doc = unfilteredRules[key].doc;
|
|
|
|
let rules = filterRules(key);
|
|
|
|
if (
|
|
|
|
doc.lineCount() === 1 && doc.getValue() === '' ||
|
|
|
|
rules.length === 0
|
|
|
|
) {
|
2018-03-21 12:24:52 +01:00
|
|
|
doc.setValue(rules.length !== 0 ? rules.join('\n') : '');
|
2015-02-11 17:49:08 +01:00
|
|
|
continue;
|
|
|
|
}
|
2018-03-21 12:24:52 +01:00
|
|
|
if ( differ === undefined ) { differ = new diff_match_patch(); }
|
2018-09-03 20:06:49 +02:00
|
|
|
let beforeText = doc.getValue();
|
|
|
|
let afterText = rules.join('\n');
|
|
|
|
let diffs = differ.diff_main(beforeText, afterText);
|
2018-03-21 12:24:52 +01:00
|
|
|
doc.startOperation();
|
2018-09-03 20:06:49 +02:00
|
|
|
let i = diffs.length,
|
2018-03-21 12:24:52 +01:00
|
|
|
iedit = beforeText.length;
|
|
|
|
while ( i-- ) {
|
2018-09-03 20:06:49 +02:00
|
|
|
let diff = diffs[i];
|
2018-03-21 12:24:52 +01:00
|
|
|
if ( diff[0] === 0 ) {
|
|
|
|
iedit -= diff[1].length;
|
|
|
|
continue;
|
|
|
|
}
|
2018-09-03 20:06:49 +02:00
|
|
|
let end = doc.posFromIndex(iedit);
|
2018-03-21 12:24:52 +01:00
|
|
|
if ( diff[0] === 1 ) {
|
|
|
|
doc.replaceRange(diff[1], end, end);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
/* diff[0] === -1 */
|
|
|
|
iedit -= diff[1].length;
|
2018-09-03 20:06:49 +02:00
|
|
|
let beg = doc.posFromIndex(iedit);
|
2018-03-21 12:24:52 +01:00
|
|
|
doc.replaceRange('', beg, end);
|
2015-02-11 17:49:08 +01:00
|
|
|
}
|
2018-03-21 12:24:52 +01:00
|
|
|
doc.endOperation();
|
2015-02-11 17:34:51 +01:00
|
|
|
}
|
2018-03-21 12:24:52 +01:00
|
|
|
cleanEditText = mergeView.editor().getValue().trim();
|
|
|
|
cleanEditToken = mergeView.editor().changeGeneration();
|
|
|
|
if ( clearHistory ) {
|
|
|
|
mergeView.editor().clearHistory();
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
2018-12-22 17:55:13 +01:00
|
|
|
const filterRules = function(key) {
|
2018-09-03 20:06:49 +02:00
|
|
|
let rules = unfilteredRules[key].rules;
|
|
|
|
let filter = uDom.nodeFromSelector('#ruleFilter input').value;
|
2018-03-21 12:24:52 +01:00
|
|
|
if ( filter !== '' ) {
|
|
|
|
rules = rules.slice();
|
2018-09-03 20:06:49 +02:00
|
|
|
let i = rules.length;
|
2018-03-21 12:24:52 +01:00
|
|
|
while ( i-- ) {
|
|
|
|
if ( rules[i].indexOf(filter) === -1 ) {
|
|
|
|
rules.splice(i, 1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return rules;
|
2018-03-11 15:59:39 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
2018-12-22 17:55:13 +01:00
|
|
|
const renderRules = (function() {
|
2018-09-03 20:06:49 +02:00
|
|
|
let firstVisit = true;
|
|
|
|
let reIsSwitchRule = /^[a-z-]+: /;
|
|
|
|
|
|
|
|
// Switches always listed at the top.
|
|
|
|
let customSort = (a, b) => {
|
|
|
|
let aIsSwitch = reIsSwitchRule.test(a);
|
|
|
|
if ( reIsSwitchRule.test(b) === aIsSwitch ) {
|
|
|
|
return a.localeCompare(b);
|
|
|
|
}
|
|
|
|
return aIsSwitch ? -1 : 1;
|
|
|
|
};
|
2018-03-11 15:59:39 +01:00
|
|
|
|
|
|
|
return function(details) {
|
2018-09-03 20:06:49 +02:00
|
|
|
details.permanentRules.sort(customSort);
|
|
|
|
details.sessionRules.sort(customSort);
|
|
|
|
unfilteredRules.orig.rules = details.permanentRules;
|
|
|
|
unfilteredRules.edit.rules = details.sessionRules;
|
2018-03-21 12:24:52 +01:00
|
|
|
rulesToDoc(firstVisit);
|
2018-03-11 15:59:39 +01:00
|
|
|
if ( firstVisit ) {
|
|
|
|
firstVisit = false;
|
|
|
|
mergeView.editor().execCommand('goNextDiff');
|
2015-02-11 17:34:51 +01:00
|
|
|
}
|
2018-03-21 12:24:52 +01:00
|
|
|
onTextChanged(true);
|
2018-03-11 15:59:39 +01:00
|
|
|
};
|
|
|
|
})();
|
2014-12-31 23:26:17 +01:00
|
|
|
|
2018-03-11 15:59:39 +01:00
|
|
|
/******************************************************************************/
|
|
|
|
|
2018-12-22 17:55:13 +01:00
|
|
|
const applyDiff = function(permanent, toAdd, toRemove) {
|
2018-03-11 15:59:39 +01:00
|
|
|
messaging.send(
|
|
|
|
'dashboard',
|
|
|
|
{
|
|
|
|
what: 'modifyRuleset',
|
|
|
|
permanent: permanent,
|
|
|
|
toAdd: toAdd,
|
|
|
|
toRemove: toRemove
|
|
|
|
},
|
2018-03-23 20:05:35 +01:00
|
|
|
renderRules
|
2018-03-11 15:59:39 +01:00
|
|
|
);
|
|
|
|
};
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
|
|
// CodeMirror quirk: sometimes fromStart.ch and/or toStart.ch is undefined.
|
|
|
|
// When this happens, use 0.
|
|
|
|
|
|
|
|
mergeView.options.revertChunk = function(
|
|
|
|
mv,
|
|
|
|
from, fromStart, fromEnd,
|
|
|
|
to, toStart, toEnd
|
|
|
|
) {
|
2018-03-16 23:33:50 +01:00
|
|
|
// https://github.com/gorhill/uBlock/issues/3611
|
|
|
|
if ( document.body.getAttribute('dir') === 'rtl' ) {
|
2018-09-03 20:06:49 +02:00
|
|
|
let tmp = from; from = to; to = tmp;
|
2018-03-16 23:33:50 +01:00
|
|
|
tmp = fromStart; fromStart = toStart; toStart = tmp;
|
|
|
|
tmp = fromEnd; fromEnd = toEnd; toEnd = tmp;
|
|
|
|
}
|
2018-03-11 15:59:39 +01:00
|
|
|
if ( typeof fromStart.ch !== 'number' ) { fromStart.ch = 0; }
|
|
|
|
if ( fromEnd.ch !== 0 ) { fromEnd.line += 1; }
|
2018-09-03 20:06:49 +02:00
|
|
|
let toAdd = from.getRange(
|
2018-03-11 15:59:39 +01:00
|
|
|
{ line: fromStart.line, ch: 0 },
|
|
|
|
{ line: fromEnd.line, ch: 0 }
|
|
|
|
);
|
|
|
|
if ( typeof toStart.ch !== 'number' ) { toStart.ch = 0; }
|
|
|
|
if ( toEnd.ch !== 0 ) { toEnd.line += 1; }
|
2018-09-03 20:06:49 +02:00
|
|
|
let toRemove = to.getRange(
|
2018-03-11 15:59:39 +01:00
|
|
|
{ line: toStart.line, ch: 0 },
|
|
|
|
{ line: toEnd.line, ch: 0 }
|
|
|
|
);
|
2018-03-23 20:05:35 +01:00
|
|
|
applyDiff(from === mv.editor(), toAdd, toRemove);
|
2014-12-31 23:26:17 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
|
|
function handleImportFilePicker() {
|
2018-09-03 20:06:49 +02:00
|
|
|
let fileReaderOnLoadHandler = function() {
|
2018-03-21 12:24:52 +01:00
|
|
|
if ( typeof this.result !== 'string' || this.result === '' ) { return; }
|
2015-04-07 03:26:05 +02:00
|
|
|
// https://github.com/chrisaljoudi/uBlock/issues/757
|
2015-02-10 02:12:37 +01:00
|
|
|
// Support RequestPolicy rule syntax
|
2018-09-03 20:06:49 +02:00
|
|
|
let result = this.result;
|
|
|
|
let matches = /\[origins-to-destinations\]([^\[]+)/.exec(result);
|
2015-02-10 02:12:37 +01:00
|
|
|
if ( matches && matches.length === 2 ) {
|
|
|
|
result = matches[1].trim()
|
|
|
|
.replace(/\|/g, ' ')
|
|
|
|
.replace(/\n/g, ' * noop\n');
|
|
|
|
}
|
2018-03-23 20:05:35 +01:00
|
|
|
applyDiff(false, result, '');
|
2014-12-31 23:26:17 +01:00
|
|
|
};
|
2018-09-03 20:06:49 +02:00
|
|
|
let file = this.files[0];
|
2018-03-11 15:59:39 +01:00
|
|
|
if ( file === undefined || file.name === '' ) { return; }
|
|
|
|
if ( file.type.indexOf('text') !== 0 ) { return; }
|
2018-09-03 20:06:49 +02:00
|
|
|
let fr = new FileReader();
|
2014-12-31 23:26:17 +01:00
|
|
|
fr.onload = fileReaderOnLoadHandler;
|
|
|
|
fr.readAsText(file);
|
|
|
|
}
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
2018-12-22 17:55:13 +01:00
|
|
|
const startImportFilePicker = function() {
|
2018-09-03 20:06:49 +02:00
|
|
|
let input = document.getElementById('importFilePicker');
|
2014-12-31 23:26:17 +01:00
|
|
|
// Reset to empty string, this will ensure an change event is properly
|
|
|
|
// triggered if the user pick a file, even if it is the same as the last
|
|
|
|
// one picked.
|
|
|
|
input.value = '';
|
|
|
|
input.click();
|
|
|
|
};
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
|
|
function exportUserRulesToFile() {
|
2018-09-03 20:06:49 +02:00
|
|
|
let filename = vAPI.i18n('rulesDefaultFileName')
|
2016-10-13 19:25:57 +02:00
|
|
|
.replace('{{datetime}}', uBlockDashboard.dateNowToSensibleString())
|
2015-01-06 18:14:37 +01:00
|
|
|
.replace(/ +/g, '_');
|
|
|
|
vAPI.download({
|
2018-03-11 15:59:39 +01:00
|
|
|
url: 'data:text/plain,' + encodeURIComponent(
|
|
|
|
mergeView.leftOriginal().getValue().trim() + '\n'
|
|
|
|
),
|
|
|
|
filename: filename,
|
|
|
|
saveAs: true
|
2014-12-31 23:26:17 +01:00
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
2018-12-22 17:55:13 +01:00
|
|
|
const onFilterChanged = (function() {
|
2018-09-03 20:06:49 +02:00
|
|
|
let timer,
|
2018-03-21 12:24:52 +01:00
|
|
|
overlay = null,
|
|
|
|
last = '';
|
2015-02-11 17:34:51 +01:00
|
|
|
|
2018-09-03 20:06:49 +02:00
|
|
|
let process = function() {
|
2018-03-11 15:59:39 +01:00
|
|
|
timer = undefined;
|
2018-03-21 12:24:52 +01:00
|
|
|
if ( mergeView.editor().isClean(cleanEditToken) === false ) { return; }
|
2018-09-03 20:06:49 +02:00
|
|
|
let filter = uDom.nodeFromSelector('#ruleFilter input').value;
|
2018-03-21 13:42:21 +01:00
|
|
|
if ( filter === last ) { return; }
|
|
|
|
last = filter;
|
2018-03-21 12:24:52 +01:00
|
|
|
if ( overlay !== null ) {
|
|
|
|
mergeView.leftOriginal().removeOverlay(overlay);
|
|
|
|
mergeView.editor().removeOverlay(overlay);
|
|
|
|
overlay = null;
|
|
|
|
}
|
|
|
|
if ( filter !== '' ) {
|
|
|
|
overlay = updateOverlay(filter);
|
|
|
|
mergeView.leftOriginal().addOverlay(overlay);
|
|
|
|
mergeView.editor().addOverlay(overlay);
|
|
|
|
}
|
|
|
|
rulesToDoc(true);
|
2018-03-11 15:59:39 +01:00
|
|
|
};
|
2015-02-11 17:34:51 +01:00
|
|
|
|
2018-03-11 15:59:39 +01:00
|
|
|
return function() {
|
|
|
|
if ( timer !== undefined ) { clearTimeout(timer); }
|
2018-03-21 12:24:52 +01:00
|
|
|
timer = vAPI.setTimeout(process, 773);
|
2015-02-11 17:34:51 +01:00
|
|
|
};
|
2018-03-11 15:59:39 +01:00
|
|
|
})();
|
2015-02-11 17:34:51 +01:00
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
2018-12-22 17:55:13 +01:00
|
|
|
const onTextChanged = (function() {
|
2018-09-03 20:06:49 +02:00
|
|
|
let timer;
|
2018-03-11 15:59:39 +01:00
|
|
|
|
2018-09-03 20:06:49 +02:00
|
|
|
let process = function(now) {
|
2018-03-11 15:59:39 +01:00
|
|
|
timer = undefined;
|
2018-12-22 17:55:13 +01:00
|
|
|
const diff = document.getElementById('diff');
|
2018-09-03 20:06:49 +02:00
|
|
|
let isClean = mergeView.editor().isClean(cleanEditToken);
|
2018-03-11 15:59:39 +01:00
|
|
|
if (
|
|
|
|
now &&
|
|
|
|
isClean === false &&
|
|
|
|
mergeView.editor().getValue().trim() === cleanEditText
|
|
|
|
) {
|
2018-03-21 12:24:52 +01:00
|
|
|
cleanEditToken = mergeView.editor().changeGeneration();
|
2018-03-11 15:59:39 +01:00
|
|
|
isClean = true;
|
|
|
|
}
|
|
|
|
diff.classList.toggle('editing', isClean === false);
|
|
|
|
diff.classList.toggle('dirty', mergeView.leftChunks().length !== 0);
|
2018-03-28 22:15:50 +02:00
|
|
|
document.getElementById('editSaveButton').classList.toggle(
|
|
|
|
'disabled',
|
|
|
|
isClean
|
|
|
|
);
|
2018-12-22 17:55:13 +01:00
|
|
|
const input = document.querySelector('#ruleFilter input');
|
2018-03-21 12:24:52 +01:00
|
|
|
if ( isClean ) {
|
|
|
|
input.removeAttribute('disabled');
|
|
|
|
CodeMirror.commands.save = undefined;
|
|
|
|
} else {
|
|
|
|
input.setAttribute('disabled', '');
|
|
|
|
CodeMirror.commands.save = editSaveHandler;
|
|
|
|
}
|
2015-02-11 17:34:51 +01:00
|
|
|
};
|
2018-03-11 15:59:39 +01:00
|
|
|
|
|
|
|
return function(now) {
|
|
|
|
if ( timer !== undefined ) { clearTimeout(timer); }
|
|
|
|
timer = now ? process(now) : vAPI.setTimeout(process, 57);
|
|
|
|
};
|
|
|
|
})();
|
2015-02-11 17:34:51 +01:00
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
2018-12-22 17:55:13 +01:00
|
|
|
const revertAllHandler = function() {
|
2018-09-03 20:06:49 +02:00
|
|
|
let toAdd = [], toRemove = [];
|
|
|
|
let left = mergeView.leftOriginal(),
|
2018-03-11 15:59:39 +01:00
|
|
|
edit = mergeView.editor();
|
2018-09-03 20:06:49 +02:00
|
|
|
for ( let chunk of mergeView.leftChunks() ) {
|
|
|
|
let addedLines = left.getRange(
|
2018-03-11 15:59:39 +01:00
|
|
|
{ line: chunk.origFrom, ch: 0 },
|
|
|
|
{ line: chunk.origTo, ch: 0 }
|
|
|
|
);
|
2018-09-03 20:06:49 +02:00
|
|
|
let removedLines = edit.getRange(
|
2018-03-11 15:59:39 +01:00
|
|
|
{ line: chunk.editFrom, ch: 0 },
|
|
|
|
{ line: chunk.editTo, ch: 0 }
|
|
|
|
);
|
|
|
|
toAdd.push(addedLines.trim());
|
|
|
|
toRemove.push(removedLines.trim());
|
2015-03-12 06:52:27 +01:00
|
|
|
}
|
2018-03-23 20:05:35 +01:00
|
|
|
applyDiff(false, toAdd.join('\n'), toRemove.join('\n'));
|
2015-02-11 17:34:51 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
2018-12-22 17:55:13 +01:00
|
|
|
const commitAllHandler = function() {
|
2018-09-03 20:06:49 +02:00
|
|
|
let toAdd = [], toRemove = [];
|
|
|
|
let left = mergeView.leftOriginal(),
|
2018-03-11 15:59:39 +01:00
|
|
|
edit = mergeView.editor();
|
2018-09-03 20:06:49 +02:00
|
|
|
for ( let chunk of mergeView.leftChunks() ) {
|
|
|
|
let addedLines = edit.getRange(
|
2018-03-11 15:59:39 +01:00
|
|
|
{ line: chunk.editFrom, ch: 0 },
|
|
|
|
{ line: chunk.editTo, ch: 0 }
|
|
|
|
);
|
2018-09-03 20:06:49 +02:00
|
|
|
let removedLines = left.getRange(
|
2018-03-11 15:59:39 +01:00
|
|
|
{ line: chunk.origFrom, ch: 0 },
|
|
|
|
{ line: chunk.origTo, ch: 0 }
|
|
|
|
);
|
|
|
|
toAdd.push(addedLines.trim());
|
|
|
|
toRemove.push(removedLines.trim());
|
|
|
|
}
|
2018-03-23 20:05:35 +01:00
|
|
|
applyDiff(true, toAdd.join('\n'), toRemove.join('\n'));
|
2015-02-11 17:34:51 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
2018-12-22 17:55:13 +01:00
|
|
|
const editSaveHandler = function() {
|
2018-09-03 20:06:49 +02:00
|
|
|
let editor = mergeView.editor();
|
|
|
|
let editText = editor.getValue().trim();
|
2018-03-11 15:59:39 +01:00
|
|
|
if ( editText === cleanEditText ) {
|
2018-03-21 12:24:52 +01:00
|
|
|
onTextChanged(true);
|
2018-03-11 15:59:39 +01:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
if ( differ === undefined ) { differ = new diff_match_patch(); }
|
2018-09-03 20:06:49 +02:00
|
|
|
let toAdd = [], toRemove = [];
|
|
|
|
let diffs = differ.diff_main(cleanEditText, editText);
|
|
|
|
for ( let diff of diffs ) {
|
2018-03-11 15:59:39 +01:00
|
|
|
if ( diff[0] === 1 ) {
|
|
|
|
toAdd.push(diff[1]);
|
|
|
|
} else if ( diff[0] === -1 ) {
|
|
|
|
toRemove.push(diff[1]);
|
|
|
|
}
|
|
|
|
}
|
2018-03-23 20:05:35 +01:00
|
|
|
applyDiff(false, toAdd.join(''), toRemove.join(''));
|
2015-02-11 17:34:51 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
2018-03-23 20:05:35 +01:00
|
|
|
self.cloud.onPush = function() {
|
2018-03-11 15:59:39 +01:00
|
|
|
return mergeView.leftOriginal().getValue().trim();
|
2015-08-11 21:29:14 +02:00
|
|
|
};
|
|
|
|
|
2018-03-23 20:05:35 +01:00
|
|
|
self.cloud.onPull = function(data, append) {
|
2018-03-11 15:59:39 +01:00
|
|
|
if ( typeof data !== 'string' ) { return; }
|
|
|
|
applyDiff(
|
|
|
|
false,
|
|
|
|
data,
|
2018-03-23 20:05:35 +01:00
|
|
|
append ? '' : mergeView.editor().getValue().trim()
|
2018-03-11 15:59:39 +01:00
|
|
|
);
|
2015-08-11 21:29:14 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
2018-03-11 15:59:39 +01:00
|
|
|
messaging.send('dashboard', { what: 'getRules' }, renderRules);
|
|
|
|
|
2015-08-11 21:29:14 +02:00
|
|
|
// Handle user interaction
|
|
|
|
uDom('#importButton').on('click', startImportFilePicker);
|
|
|
|
uDom('#importFilePicker').on('change', handleImportFilePicker);
|
|
|
|
uDom('#exportButton').on('click', exportUserRulesToFile);
|
2018-03-11 15:59:39 +01:00
|
|
|
uDom('#revertButton').on('click', revertAllHandler);
|
|
|
|
uDom('#commitButton').on('click', commitAllHandler);
|
|
|
|
uDom('#editSaveButton').on('click', editSaveHandler);
|
2018-03-21 12:24:52 +01:00
|
|
|
uDom('#ruleFilter input').on('input', onFilterChanged);
|
2015-08-11 21:29:14 +02:00
|
|
|
|
2018-03-11 15:59:39 +01:00
|
|
|
// https://groups.google.com/forum/#!topic/codemirror/UQkTrt078Vs
|
2018-03-21 12:24:52 +01:00
|
|
|
mergeView.editor().on('updateDiff', function() { onTextChanged(); });
|
2014-12-31 23:26:17 +01:00
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
|
|
})();
|
|
|
|
|