From 9983e05535c2954c544fac94be9c42f3ab8f2191 Mon Sep 17 00:00:00 2001 From: Harry Wolff Date: Sun, 9 Mar 2014 20:56:56 -0400 Subject: [PATCH] Add HTML5 pushState support for Ember - also updates associated route --- core/client/router.js | 2 +- core/server/routes/admin.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/client/router.js b/core/client/router.js index 485b96ca41..1e3c906f03 100755 --- a/core/client/router.js +++ b/core/client/router.js @@ -4,7 +4,7 @@ var Router = Ember.Router.extend(); Router.reopen({ - //location: 'history', // use HTML5 History API instead of hash-tag based URLs + location: 'history', // use HTML5 History API instead of hash-tag based URLs rootURL: '/ghost/ember/' // admin interface lives under sub-directory /ghost }); diff --git a/core/server/routes/admin.js b/core/server/routes/admin.js index e023eadf8e..b433d49432 100644 --- a/core/server/routes/admin.js +++ b/core/server/routes/admin.js @@ -58,5 +58,5 @@ module.exports = function (server) { }); server.get('/ghost/', admin.indexold); - server.get('/ghost/ember/', admin.index); + server.get('/ghost/ember/*', admin.index); }; \ No newline at end of file