From d61e37e7990c5d0b3a30ce6becafff5a83d3190f Mon Sep 17 00:00:00 2001
From: Matt Enlow <matt@novaugust.net>
Date: Sun, 10 Aug 2014 14:50:25 -0600
Subject: [PATCH] Fix -navbar events attachment

Closes #3623
- Move hamburger logic to action with terrible name, "toggleSidebarOrGoHome"
- Move ".js-close-sidebar" events to a document.on(event, *selector*, f) to make sure they attach even when the js-close-sidebars aren't on page (ie, hidenav)
---
 core/client/templates/-navbar.hbs       |  4 ++--
 core/client/views/application.js        | 32 +++++++++++++------------
 core/client/views/posts.js              |  1 -
 core/test/functional/client/app_test.js |  8 +++----
 4 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/core/client/templates/-navbar.hbs b/core/client/templates/-navbar.hbs
index ce16be87a1..1f70bb82ca 100644
--- a/core/client/templates/-navbar.hbs
+++ b/core/client/templates/-navbar.hbs
@@ -1,7 +1,7 @@
 <header id="global-header" class="navbar">
-    <a class="ghost-logo" data-off-canvas="left">
+    <button {{action "toggleSidebarOrGoHome" target="view"}} class="ghost-logo">
         <span class="hidden">Ghost</span>
-    </a>
+    </button>
     <nav id="global-nav" role="navigation">
         <ul id="main-menu" >
             {{gh-activating-list-item route="posts" title="Content" classNames="content js-close-sidebar"}}
diff --git a/core/client/views/application.js b/core/client/views/application.js
index b99a521c08..462b2ab6fe 100644
--- a/core/client/views/application.js
+++ b/core/client/views/application.js
@@ -1,21 +1,23 @@
-import {responsiveAction} from 'ghost/utils/mobile';
-
 var ApplicationView = Ember.View.extend({
-
-    mobileInteractions: function () {
-        var body = $('body');
-        // ### Toggle the mobile sidebar menu
-        $('[data-off-canvas]').on('click', function (event) {
-            responsiveAction(event, '(max-width: 650px)', function () {
-                body.toggleClass('off-canvas');
-            });
-        });
-        $('[data-off-canvas]').attr('href', this.get('controller.ghostPaths.blogRoot'));
+    setupCloseSidebar: function () {
         // #### Navigating within the sidebar closes it.
-        $('.js-close-sidebar').on('click', function () {
-            body.removeClass('off-canvas');
+        $(document).on('click', '.js-close-sidebar', function () {
+            $('body').removeClass('off-canvas');
         });
-    }.on('didInsertElement')
+    }.on('didInsertElement'),
+    
+    actions: {
+        //Sends the user to the front if they're not on mobile,
+        //otherwise toggles the sidebar.
+        toggleSidebarOrGoHome: function () {
+            if (window.matchMedia('(max-width: 650px)').matches) {
+                $('body').toggleClass('off-canvas');
+            }
+            else {
+                window.location = this.get('controller.ghostPaths').blogRoot;
+            }
+        }
+    }
 });
 
 export default ApplicationView;
diff --git a/core/client/views/posts.js b/core/client/views/posts.js
index 7551aa464e..d3f2105302 100644
--- a/core/client/views/posts.js
+++ b/core/client/views/posts.js
@@ -28,7 +28,6 @@ var PostsView = Ember.View.extend({
                     self.send('hideContentPreview');
                 });
             });
-            $('[data-off-canvas]').attr('href', this.get('controller.ghostPaths.blogRoot'));
         });
     }.on('didInsertElement'),
 });
diff --git a/core/test/functional/client/app_test.js b/core/test/functional/client/app_test.js
index 88f27e4fac..b006cc7379 100644
--- a/core/test/functional/client/app_test.js
+++ b/core/test/functional/client/app_test.js
@@ -3,21 +3,19 @@
 
 /*globals CasperTest, casper */
 
-CasperTest.begin('Admin navigation bar is correct', 28, function suite(test) {
+CasperTest.begin('Admin navigation bar is correct', 27, function suite(test) {
     casper.thenOpenAndWaitForPageLoad('root', function testTitleAndUrl() {
         test.assertTitle('Ghost Admin', 'Ghost admin has no title');
         test.assertUrlMatch(/ghost\/\d+\/$/, 'Landed on the correct URL');
     });
 
     casper.then(function testNavItems() {
-        var logoHref = this.getElementAttribute('a.ghost-logo', 'href'),
-            contentHref = this.getElementAttribute('#main-menu li.content a', 'href'),
+        var contentHref = this.getElementAttribute('#main-menu li.content a', 'href'),
             editorHref = this.getElementAttribute('#main-menu li.editor a', 'href'),
             settingsHref = this.getElementAttribute('#main-menu li.settings a', 'href');
 
         // Logo
-        test.assertExists('a.ghost-logo', 'Ghost logo home page link exists');
-        test.assertEquals(logoHref, '/', 'Ghost logo href is correct');
+        test.assertExists('button.ghost-logo', 'Ghost logo home page button exists');
 
         // Content
         test.assertExists('#main-menu li.content a', 'Content nav item exists');