Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: clicking an attachment link works only once

This commit is contained in:
Régis Hanol 2015-02-09 17:49:59 +01:00
parent e36272cb68
commit b809e02c6c
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/discourse/lib/click_track.js
View File

@ -112,11 +112,6 @@ Discourse.ClickTrack = {
return false;
}
// Otherwise, use a custom URL with a redirect
if (Discourse.User.currentProp('external_links_in_new_tab')) {
var win = window.open(trackingUrl, '_blank');
win.focus();
// restore href
setTimeout(function() {
$link.removeClass('no-href');
@ -124,6 +119,10 @@ Discourse.ClickTrack = {
$link.data('href', null);
}, 50);
// Otherwise, use a custom URL with a redirect
if (Discourse.User.currentProp('external_links_in_new_tab')) {
var win = window.open(trackingUrl, '_blank');
win.focus();
} else {
Discourse.URL.redirectTo(trackingUrl);
}

10
test/javascripts/lib/click-track-test.js.es6
View File

@ -71,6 +71,16 @@ test("removes the href and put it as a data attribute", function() {
ok(Discourse.URL.redirectTo.calledOnce);
});
asyncTest("restores the href after a while", function() {
expect(1);
track(generateClickEventOn('a'));
setTimeout(function() {
start();
equal(fixture('a').attr('href'), "http://www.google.com");
}, 75);
});
var badgeClickCount = function(id, expected) {
track(generateClickEventOn('#' + id));