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

this really fixes #599, #600

This commit is contained in:
gorhill 2015-08-15 09:24:55 -04:00
parent 32b1f4ea86
commit 6dd5c832a2
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/about.html
View File

@ -12,13 +12,13 @@
<p id="aboutNameVer"></p> <p id="aboutNameVer"></p>
<ul> <ul>
<li><a href="https://github.com/gorhill/uBlock/releases" target="_blank" data-i18n="aboutChangelog"></a> <li><a href="https://github.com/gorhill/uBlock/releases" data-i18n="aboutChangelog"></a>
<li><a href="https://github.com/gorhill/uBlock/wiki" target="_blank" data-i18n="aboutWiki"></a> <li><a href="https://github.com/gorhill/uBlock/wiki" data-i18n="aboutWiki"></a>
<li><a href="https://github.com/gorhill/uBlock" target="_blank" data-i18n="aboutCode"></a> <li><a href="https://github.com/gorhill/uBlock" data-i18n="aboutCode"></a>
<li><span data-i18n="aboutContributors"></span> <li><span data-i18n="aboutContributors"></span>
<ul> <ul>
<li><a href="https://github.com/gorhill/uBlock/graphs/contributors" target="_blank">Github</a> <li><a href="https://github.com/gorhill/uBlock/graphs/contributors">Github</a>
<li><a href="https://crowdin.net/project/ublock" target="_blank">Crowdin</a> <li><a href="https://crowdin.net/project/ublock">Crowdin</a>
</ul> </ul>
<li><a href="http://fontawesome.io" target="_blank">Font Awesome by Dave Gandy</a> <li><a href="http://fontawesome.io" target="_blank">Font Awesome by Dave Gandy</a>
</ul> </ul>

14
src/js/dashboard-common.js
View File

@ -31,7 +31,7 @@ self.uBlockDashboard = self.uBlockDashboard || {};
// Helper for client panes: // Helper for client panes:
// Remove literal duplicate lines from a set based on another set. // Remove literal duplicate lines from a set based on another set.
self.uBlock.mergeNewLines = function(text, newText) { self.uBlockDashboard.mergeNewLines = function(text, newText) {
var lineBeg, textEnd, lineEnd; var lineBeg, textEnd, lineEnd;
var line, hash, bucket; var line, hash, bucket;
@ -103,14 +103,12 @@ self.uBlock.mergeNewLines = function(text, newText) {
/******************************************************************************/ /******************************************************************************/
(function() { // Open links in the proper window
// Open links in the proper window uDom('a').attr('target', '_blank');
uDom('a').attr('target', '_blank'); uDom('a[href*="dashboard.html"]').attr('target', '_parent');
uDom('a[href*="dashboard.html"]').attr('target', '_parent'); uDom('.whatisthis').on('click', function() {
uDom('.whatisthis').on('click', function() {
uDom(this) uDom(this)
.parent() .parent()
.descendants('.whatisthis-expandable') .descendants('.whatisthis-expandable')
.toggleClass('whatisthis-expanded'); .toggleClass('whatisthis-expanded');
}); });
})();