aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorgorhill <rhill@raymondhill.net>2015-08-15 09:24:55 -0400
committergorhill <rhill@raymondhill.net>2015-08-15 09:24:55 -0400
commit6dd5c832a2c9dadc518754a9839b7494950e8484 (patch)
tree5d5305f6f874713b6ee859e2dfc372ce331f31e6 /src
parent32b1f4ea86e087993d6ba71709b38846b3cf0d79 (diff)
downloaduBlock-6dd5c832a2c9dadc518754a9839b7494950e8484.zip
uBlock-6dd5c832a2c9dadc518754a9839b7494950e8484.tar.gz
uBlock-6dd5c832a2c9dadc518754a9839b7494950e8484.tar.bz2
this really fixes #599, #600
Diffstat (limited to 'src')
-rw-r--r--src/about.html10
-rw-r--r--src/js/dashboard-common.js22
2 files changed, 15 insertions, 17 deletions
diff --git a/src/about.html b/src/about.html
index cf7256d..02d6a2e 100644
--- a/src/about.html
+++ b/src/about.html
@@ -12,13 +12,13 @@
<p id="aboutNameVer"></p>
<ul>
- <li><a href="https://github.com/gorhill/uBlock/releases" target="_blank" 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" target="_blank" data-i18n="aboutCode"></a>
+ <li><a href="https://github.com/gorhill/uBlock/releases" data-i18n="aboutChangelog"></a>
+ <li><a href="https://github.com/gorhill/uBlock/wiki" data-i18n="aboutWiki"></a>
+ <li><a href="https://github.com/gorhill/uBlock" data-i18n="aboutCode"></a>
<li><span data-i18n="aboutContributors"></span>
<ul>
- <li><a href="https://github.com/gorhill/uBlock/graphs/contributors" target="_blank">Github</a>
- <li><a href="https://crowdin.net/project/ublock" target="_blank">Crowdin</a>
+ <li><a href="https://github.com/gorhill/uBlock/graphs/contributors">Github</a>
+ <li><a href="https://crowdin.net/project/ublock">Crowdin</a>
</ul>
<li><a href="http://fontawesome.io" target="_blank">Font Awesome by Dave Gandy</a>
</ul>
diff --git a/src/js/dashboard-common.js b/src/js/dashboard-common.js
index e34e18a..ba7660e 100644
--- a/src/js/dashboard-common.js
+++ b/src/js/dashboard-common.js
@@ -31,7 +31,7 @@ self.uBlockDashboard = self.uBlockDashboard || {};
// Helper for client panes:
// 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 line, hash, bucket;
@@ -103,14 +103,12 @@ self.uBlock.mergeNewLines = function(text, newText) {
/******************************************************************************/
-(function() {
- // Open links in the proper window
- uDom('a').attr('target', '_blank');
- uDom('a[href*="dashboard.html"]').attr('target', '_parent');
- uDom('.whatisthis').on('click', function() {
- uDom(this)
- .parent()
- .descendants('.whatisthis-expandable')
- .toggleClass('whatisthis-expanded');
- });
-})();
+// Open links in the proper window
+uDom('a').attr('target', '_blank');
+uDom('a[href*="dashboard.html"]').attr('target', '_parent');
+uDom('.whatisthis').on('click', function() {
+ uDom(this)
+ .parent()
+ .descendants('.whatisthis-expandable')
+ .toggleClass('whatisthis-expanded');
+});