From 007428b6dccbcc19d8c8422de9da320a7ba18907 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 26 Mar 2014 17:15:45 +1100
Subject: [PATCH] Splitting between path and hashfragment for offcanvas and
 tabs respectively

---
 .../darkswarm/controllers/menu_controller.js.coffee       | 8 ++++----
 .../darkswarm/controllers/sidebar_controller.js.coffee    | 2 +-
 .../darkswarm/controllers/tabs_controller.js.coffee       | 7 +++----
 app/views/shared/_login_sidebar.html.haml                 | 2 +-
 app/views/shared/_signup_sidebar.html.haml                | 2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/darkswarm/controllers/menu_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/menu_controller.js.coffee
index c85b09f8de..cd5a4ce5fc 100644
--- a/app/assets/javascripts/darkswarm/controllers/menu_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/menu_controller.js.coffee
@@ -1,12 +1,12 @@
 window.MenuCtrl = Darkswarm.controller "MenuCtrl", ($scope, $location) ->
   $scope.toggleLogin = ->
     if $location.path() == "/login"
-      $location.url("/")
+      $location.path("/")
     else
-      $location.url("login#sidebar")
+      $location.path("login")
 
   $scope.toggleSignup = ->
     if $location.path() == "/signup"
-      $location.url("/")
+      $location.path("/")
     else
-      $location.url("signup#sidebar")
+      $location.path("signup")
diff --git a/app/assets/javascripts/darkswarm/controllers/sidebar_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/sidebar_controller.js.coffee
index 42d63ece69..2563d0f74a 100644
--- a/app/assets/javascripts/darkswarm/controllers/sidebar_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/sidebar_controller.js.coffee
@@ -1,3 +1,3 @@
 window.SidebarCtrl = Darkswarm.controller "SidebarCtrl", ($scope, $location) ->
   $scope.active = ->
-    $location.hash() == "sidebar"
+    $location.path() == "/login" || $location.path() == "/signup"
diff --git a/app/assets/javascripts/darkswarm/controllers/tabs_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/tabs_controller.js.coffee
index e0c47e0002..0788cc96ec 100644
--- a/app/assets/javascripts/darkswarm/controllers/tabs_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/tabs_controller.js.coffee
@@ -1,6 +1,6 @@
 Darkswarm.controller "TabsCtrl", ($scope, $rootScope, $location) ->
   $scope.active = (path)->
-    $location.path() == path
+    $location.hash() == path
 
   $scope.tabs = ["contact", "about", "groups", "producers"]
   for tab in $scope.tabs 
@@ -8,11 +8,10 @@ Darkswarm.controller "TabsCtrl", ($scope, $rootScope, $location) ->
       path: "/" + tab 
 
   $scope.select = (tab)->
-    console.log tab
     if $scope.active(tab.path)
-      $location.path "/"
+      $location.hash "/"
     else
-      $location.path tab.path
+      $location.hash tab.path
 
     
 # directive -> ng-click -> scope method (not isolated) -> toggle active | change location
diff --git a/app/views/shared/_login_sidebar.html.haml b/app/views/shared/_login_sidebar.html.haml
index 9bb52c487e..b5b05ca245 100644
--- a/app/views/shared/_login_sidebar.html.haml
+++ b/app/views/shared/_login_sidebar.html.haml
@@ -1,5 +1,5 @@
 %tab#login-content{"ng-controller" => "LoginSidebarCtrl", 
-  header: "Login", 
+  heading: "Login", 
   active: "active()", 
   select: "select()"}
   %form{"ng-submit" => "submit()"}
diff --git a/app/views/shared/_signup_sidebar.html.haml b/app/views/shared/_signup_sidebar.html.haml
index b4d7950ce2..5296c2a922 100644
--- a/app/views/shared/_signup_sidebar.html.haml
+++ b/app/views/shared/_signup_sidebar.html.haml
@@ -1,6 +1,6 @@
 #sign-up-content{"ng-controller" => "SignupSidebarCtrl", "ng-show" => "active()"}
 %tab#sign-up-content{"ng-controller" => "SignupSidebarCtrl", 
-  header: "Signup", 
+  heading: "Signup", 
   active: "active()", 
   select: "select()"}
   %form{"ng-submit" => "submit()"}