diff options
| author | Jonne Haß <me@jhass.eu> | 2016-08-18 12:59:20 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-18 12:59:20 +0300 |
| commit | c74a7041f127979da40154d133c212c379041cdd (patch) | |
| tree | c61849cf29bfcc9e51a7884a38642bb211873bef /app/assets | |
| parent | 0a1a7b167f3ccbcb743c047e2659b82a33743fdb (diff) | |
| parent | 18683f9ca87d7349d58bf7bdd75430a253217ebc (diff) | |
Merge pull request #7000 from svbergerem/router-trailing-slash
Fix backbone router for URLs with trailing slashes
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/app/router.js | 57 |
1 files changed, 28 insertions, 29 deletions
diff --git a/app/assets/javascripts/app/router.js b/app/assets/javascripts/app/router.js index 5f8a3cc96..d7bb3042c 100644 --- a/app/assets/javascripts/app/router.js +++ b/app/assets/javascripts/app/router.js @@ -2,35 +2,34 @@ app.Router = Backbone.Router.extend({ routes: { - "activity": "stream", - "admin/pods": "adminPods", - "admins/dashboard": "adminDashboard", - "aspects": "aspects", - "commented": "stream", - "community_spotlight": "spotlight", - "contacts": "contacts", - "conversations": "conversations", - "followed_tags": "followed_tags", - "getting_started": "gettingStarted", - "help": "help", - "help/": "help", - "help/:section": "help", - "liked": "stream", - "mentions": "stream", - "notifications": "notifications", - "p/:id": "singlePost", - "people": "pageWithAspectMembershipDropdowns", - "people/:id": "profile", - "people/:id/contacts": "profile", - "people/:id/photos": "photos", - "posts/:id": "singlePost", - "profile/edit": "settings", - "public": "stream", - "stream": "stream", - "tags/:name": "followed_tags", - "u/:name": "profile", - "user/edit": "settings", - "users/sign_up": "registration" + "activity(/)": "stream", + "admin/pods(/)": "adminPods", + "admins/dashboard(/)": "adminDashboard", + "aspects(/)": "aspects", + "commented(/)": "stream", + "community_spotlight(/)": "spotlight", + "contacts(/)": "contacts", + "conversations(/)": "conversations", + "followed_tags(/)": "followed_tags", + "getting_started(/)": "gettingStarted", + "help(/)": "help", + "help/:section(/)": "help", + "liked(/)": "stream", + "mentions(/)": "stream", + "notifications(/)": "notifications", + "p/:id(/)": "singlePost", + "people(/)": "pageWithAspectMembershipDropdowns", + "people/:id(/)": "profile", + "people/:id/contacts(/)": "profile", + "people/:id/photos(/)": "photos", + "posts/:id(/)": "singlePost", + "profile/edit(/)": "settings", + "public(/)": "stream", + "stream(/)": "stream", + "tags/:name(/)": "followed_tags", + "u/:name(/)": "profile", + "user/edit(/)": "settings", + "users/sign_up(/)": "registration" }, initialize: function() { |