mirror of
https://github.com/gorhill/uBlock.git
synced 2024-09-22 13:47:43 +02:00
this completes fix of #954
This commit is contained in:
parent
e036ae038e
commit
5a2f6e0f67
3 changed files with 22 additions and 15 deletions
|
@ -38,8 +38,13 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<input class="hidden" id="importFilePicker" type="file" accept="text/plain" style="display: none;">
|
<div id="templates" style="display: none;">
|
||||||
<span class="hidden" data-i18n="rulesDefaultFileName" style="display: none;"></span>
|
<input class="hidden" id="importFilePicker" type="file" accept="text/plain">
|
||||||
|
<span class="hidden" data-i18n="rulesDefaultFileName"></span>
|
||||||
|
<ul>
|
||||||
|
<li> </li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
|
||||||
<script src="js/vapi-common.js"></script>
|
<script src="js/vapi-common.js"></script>
|
||||||
<script src="js/vapi-client.js"></script>
|
<script src="js/vapi-client.js"></script>
|
||||||
|
|
|
@ -33,7 +33,7 @@ var messager = vAPI.messaging.channel('asset-viewer.js');
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|
||||||
var onAssetContentReceived = function(details) {
|
var onAssetContentReceived = function(details) {
|
||||||
uDom('#content').html(details && (details.content || ''));
|
uDom('#content').text(details && (details.content || ''));
|
||||||
};
|
};
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|
|
@ -35,8 +35,6 @@ var messager = vAPI.messaging.channel('dyna-rules.js');
|
||||||
|
|
||||||
var renderRules = function(details) {
|
var renderRules = function(details) {
|
||||||
var rules, rule, i;
|
var rules, rule, i;
|
||||||
var permanentList = [];
|
|
||||||
var sessionList = [];
|
|
||||||
var allRules = {};
|
var allRules = {};
|
||||||
var permanentRules = {};
|
var permanentRules = {};
|
||||||
var sessionRules = {};
|
var sessionRules = {};
|
||||||
|
@ -64,27 +62,31 @@ var renderRules = function(details) {
|
||||||
}
|
}
|
||||||
details.permanentRules = rules.sort().join('\n');
|
details.permanentRules = rules.sort().join('\n');
|
||||||
|
|
||||||
|
var liTemplate = uDom('#templates > ul > li');
|
||||||
|
var ulLeft = uDom('#diff > .left ul').empty();
|
||||||
|
var ulRight = uDom('#diff > .right ul').empty();
|
||||||
|
var liLeft, liRight;
|
||||||
|
|
||||||
rules = Object.keys(allRules).sort();
|
rules = Object.keys(allRules).sort();
|
||||||
for ( i = 0; i < rules.length; i++ ) {
|
for ( i = 0; i < rules.length; i++ ) {
|
||||||
rule = rules[i];
|
rule = rules[i];
|
||||||
onLeft = permanentRules.hasOwnProperty(rule);
|
onLeft = permanentRules.hasOwnProperty(rule);
|
||||||
onRight = sessionRules.hasOwnProperty(rule);
|
onRight = sessionRules.hasOwnProperty(rule);
|
||||||
|
liLeft = liTemplate.clone();
|
||||||
|
liRight = liTemplate.clone();
|
||||||
if ( onLeft && onRight ) {
|
if ( onLeft && onRight ) {
|
||||||
permanentList.push('<li>', rule);
|
liLeft.text(rule);
|
||||||
sessionList.push('<li>', rule);
|
liRight.text(rule);
|
||||||
} else if ( onLeft ) {
|
} else if ( onLeft ) {
|
||||||
permanentList.push('<li>', rule);
|
liLeft.text(rule);
|
||||||
sessionList.push('<li class="notRight toRemove">', rule);
|
liRight.text(rule).addClass('notRight toRemove');
|
||||||
} else {
|
} else {
|
||||||
permanentList.push('<li> ');
|
liRight.text(rule).addClass('notLeft');
|
||||||
sessionList.push('<li class="notLeft">', rule);
|
|
||||||
}
|
}
|
||||||
|
ulLeft.append(liLeft);
|
||||||
|
ulRight.append(liRight);
|
||||||
}
|
}
|
||||||
|
|
||||||
uDom('#diff > .left ul > li').remove();
|
|
||||||
uDom('#diff > .left ul').html(permanentList.join(''));
|
|
||||||
uDom('#diff > .right ul > li').remove();
|
|
||||||
uDom('#diff > .right ul').html(sessionList.join(''));
|
|
||||||
uDom('#diff').toggleClass('dirty', details.sessionRules !== details.permanentRules);
|
uDom('#diff').toggleClass('dirty', details.sessionRules !== details.permanentRules);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue