github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-28 02:03:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix shortenUrl helper to not crash when URL doesn't include any "/".

Browse Source
This commit is contained in:
macournoyer 2014-02-05 22:36:26 -05:00
parent 3a6c3ee65d
commit 8bf872e92e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/discourse/helpers/application_helpers.js
View File

@ -106,10 +106,11 @@ Handlebars.registerHelper('titledLinkTo', function(name, object) {
@for Handlebars @for Handlebars
**/ **/
Handlebars.registerHelper('shortenUrl', function(property, options) { Handlebars.registerHelper('shortenUrl', function(property, options) {
var url; var url, matches;
url = Ember.Handlebars.get(this, property, options); url = Ember.Handlebars.get(this, property, options);
// Remove trailing slash if it's a top level URL // Remove trailing slash if it's a top level URL
if (url.match(/\//g).length === 3) { matches = url.match(/\//g);
if (matches && matches.length === 3) {
url = url.replace(/\/$/, ''); url = url.replace(/\/$/, '');
} }
url = url.replace(/^https?:\/\//, ''); url = url.replace(/^https?:\/\//, '');