Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

code review: no need for callback arg

This commit is contained in:
Raymond Hill 2018-03-23 15:05:35 -04:00
parent d9161aeffa
commit e35f6b3df6
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/js/dyna-rules.js
View File

@ -179,7 +179,7 @@ var renderRules = (function() {
/******************************************************************************/ /******************************************************************************/
var applyDiff = function(permanent, toAdd, toRemove, callback) { var applyDiff = function(permanent, toAdd, toRemove) {
messaging.send( messaging.send(
'dashboard', 'dashboard',
{ {
@ -188,7 +188,7 @@ var applyDiff = function(permanent, toAdd, toRemove, callback) {
toAdd: toAdd, toAdd: toAdd,
toRemove: toRemove toRemove: toRemove
}, },
callback renderRules
); );
}; };
@ -221,7 +221,7 @@ mergeView.options.revertChunk = function(
{ line: toStart.line, ch: 0 }, { line: toStart.line, ch: 0 },
{ line: toEnd.line, ch: 0 } { line: toEnd.line, ch: 0 }
); );
applyDiff(from === mv.editor(), toAdd, toRemove, renderRules); applyDiff(from === mv.editor(), toAdd, toRemove);
}; };
/******************************************************************************/ /******************************************************************************/
@ -238,7 +238,7 @@ function handleImportFilePicker() {
.replace(/\|/g, ' ') .replace(/\|/g, ' ')
.replace(/\n/g, ' * noop\n'); .replace(/\n/g, ' * noop\n');
} }
applyDiff(false, result, '', renderRules); applyDiff(false, result, '');
}; };
var file = this.files[0]; var file = this.files[0];
if ( file === undefined || file.name === '' ) { return; } if ( file === undefined || file.name === '' ) { return; }
@ -359,7 +359,7 @@ var revertAllHandler = function() {
toAdd.push(addedLines.trim()); toAdd.push(addedLines.trim());
toRemove.push(removedLines.trim()); toRemove.push(removedLines.trim());
} }
applyDiff(false, toAdd.join('\n'), toRemove.join('\n'), renderRules); applyDiff(false, toAdd.join('\n'), toRemove.join('\n'));
}; };
/******************************************************************************/ /******************************************************************************/
@ -380,7 +380,7 @@ var commitAllHandler = function() {
toAdd.push(addedLines.trim()); toAdd.push(addedLines.trim());
toRemove.push(removedLines.trim()); toRemove.push(removedLines.trim());
} }
applyDiff(true, toAdd.join('\n'), toRemove.join('\n'), renderRules); applyDiff(true, toAdd.join('\n'), toRemove.join('\n'));
}; };
/******************************************************************************/ /******************************************************************************/
@ -402,28 +402,24 @@ var editSaveHandler = function() {
toRemove.push(diff[1]); toRemove.push(diff[1]);
} }
} }
applyDiff(false, toAdd.join(''), toRemove.join(''), renderRules); applyDiff(false, toAdd.join(''), toRemove.join(''));
}; };
/******************************************************************************/ /******************************************************************************/
var getCloudData = function() { self.cloud.onPush = function() {
return mergeView.leftOriginal().getValue().trim(); return mergeView.leftOriginal().getValue().trim();
}; };
var setCloudData = function(data, append) { self.cloud.onPull = function(data, append) {
if ( typeof data !== 'string' ) { return; } if ( typeof data !== 'string' ) { return; }
applyDiff( applyDiff(
false, false,
data, data,
append ? '' : mergeView.editor().getValue().trim(), append ? '' : mergeView.editor().getValue().trim()
renderRules
); );
}; };
self.cloud.onPush = getCloudData;
self.cloud.onPull = setCloudData;
/******************************************************************************/ /******************************************************************************/
messaging.send('dashboard', { what: 'getRules' }, renderRules); messaging.send('dashboard', { what: 'getRules' }, renderRules);