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

FIX: Logo links to a different domain were broken

This commit is contained in:
Robin Ward 2016-05-10 10:42:16 -04:00
parent 6f9a3d1370
commit 4875fe1c3e
No known key found for this signature in database
GPG Key ID: 0E091E2B4ED1B83D
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/lib/url.js.es6
View File

@ -139,9 +139,7 @@ const DiscourseURL = Ember.Object.extend({
} }
} }
rewrites.forEach(function(rw) { rewrites.forEach(rw => path = path.replace(rw.regexp, rw.replacement));
path = path.replace(rw.regexp, rw.replacement);
});
if (this.navigatedToPost(oldPath, path)) { return; } if (this.navigatedToPost(oldPath, path)) { return; }
// Schedule a DOM cleanup event // Schedule a DOM cleanup event

6
app/assets/javascripts/discourse/widgets/home-logo.js.es6
View File

@ -48,7 +48,13 @@ export default createWidget('home-logo', {
click(e) { click(e) {
if (wantsNewWindow(e)) { return false; } if (wantsNewWindow(e)) { return false; }
e.preventDefault(); e.preventDefault();
const a = $(e.target).closest('a')[0];
if (a && a.host !== document.location.host) {
document.location = a.href;
}
DiscourseURL.routeTo(this.href()); DiscourseURL.routeTo(this.href());
return false; return false;
} }