phyks/leed-adblock
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes wrong display of "whitelist" and "blacklist"

Browse Source 
By default, the behavior is to use a blacklist as all contents are
allowed. But at that time, it's "whitelist" which is displayed instead
of blacklist. I clicked on the radio buttons (for flash and images) the title turned to
"blacklist", instead of "whitelist".
This commit is contained in:
Christophe HENRY 2013-12-08 16:00:23 +01:00
parent 28356b59be
commit 351b795a9b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
adblock.plugin.disabled.php
View File

@ -198,7 +198,7 @@ function adblock_plugin_setting_bloc(&$myUser) {
<input type="radio" name="flash_adblock_default_behavior" value="0" id="flash_adblock_allowall" onchange="adblock_whitelist_blacklist(\'adblock_flash_whitelist_blacklist\', 0);" '.((!$flash_block) ? 'checked="checked"' : '').'/><label for="flash_adblock_allowall">Allow all contents (and use a blacklist)</label> <input type="radio" name="flash_adblock_default_behavior" value="0" id="flash_adblock_allowall" onchange="adblock_whitelist_blacklist(\'adblock_flash_whitelist_blacklist\', 0);" '.((!$flash_block) ? 'checked="checked"' : '').'/><label for="flash_adblock_allowall">Allow all contents (and use a blacklist)</label>
</p> </p>
<p><span id="adblock_flash_whitelist_blacklist">'.(($flash_block) ? 'Blacklist :' : 'Whitelist :').'</span></br> <p><span id="adblock_flash_whitelist_blacklist">'.(($flash_block) ? 'Whitelist :' : 'Blacklist :').'</span></br>
<textarea name="flash_adblock_list" rows="7">'.$flash_list.'</textarea> <textarea name="flash_adblock_list" rows="7">'.$flash_list.'</textarea>
</div> </div>
</fieldset> </fieldset>
@ -222,7 +222,7 @@ function adblock_plugin_setting_bloc(&$myUser) {
<input type="radio" name="img_adblock_only_mobiles" value="0" id="img_adblock_only_mobiles_no" '.((!$img_only_mobiles) ? 'checked="checked"' : '').'/><label for="img_adblock_only_mobiles_no">Block images on all devices</label> <input type="radio" name="img_adblock_only_mobiles" value="0" id="img_adblock_only_mobiles_no" '.((!$img_only_mobiles) ? 'checked="checked"' : '').'/><label for="img_adblock_only_mobiles_no">Block images on all devices</label>
</p> </p>
<p><span id="adblock_img_whitelist_blacklist">'.(($img_block) ? 'Blacklist :' : 'Whitelist :').'</span></br> <p><span id="adblock_img_whitelist_blacklist">'.(($img_block) ? 'Whitelist :' : 'Blacklist :').'</span></br>
<textarea name="img_adblock_list" rows="7">'.$img_list.'</textarea> <textarea name="img_adblock_list" rows="7">'.$img_list.'</textarea>
</div> </div>
</fieldset> </fieldset>

4
js/adblock_plugin_js.js
View File

@ -1,8 +1,8 @@
function adblock_whitelist_blacklist(id, whitelist_blacklist) { function adblock_whitelist_blacklist(id, whitelist_blacklist) {
if(whitelist_blacklist == 0) if(whitelist_blacklist == 0)
document.getElementById(id).innerHTML = "Whitelist :";
else
document.getElementById(id).innerHTML = "Blacklist :"; document.getElementById(id).innerHTML = "Blacklist :";
else
document.getElementById(id).innerHTML = "Whitelist :";
} }
function adblock_unblock_img(span, url) { function adblock_unblock_img(span, url) {