codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-12-18 03:25:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1909 from codedinc/shortenUrl-fix

Browse source 
Fix shortenUrl helper to not crash when URL doesn't include any "/".
This commit is contained in:
Régis Hanol 2014-02-06 16:35:11 +01:00
commit 9b3740a7c6
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

@ -112,10 +112,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?:\/\//, '');