From 25fbba2084a23fb62ab0e7fdf2dd47eadc28a967 Mon Sep 17 00:00:00 2001
From: Noah Loomans <noahloomans@gmail.com>
Date: Mon, 30 Jan 2017 14:04:20 +0100
Subject: Fix bugs in url update

 - Document title doesn't update
 - Page crashes when going back to front page
---
 public/javascripts/main.js | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

(limited to 'public/javascripts/main.js')

diff --git a/public/javascripts/main.js b/public/javascripts/main.js
index 6c7fd05..561316d 100644
--- a/public/javascripts/main.js
+++ b/public/javascripts/main.js
@@ -20,14 +20,20 @@ scrollSnap.startListening()
 
 if (url.hasSelectedItem()) {
   state.selectedItem = url.getSelectedItem()
+
   favorite.update(state.selectedItem)
+  url.update(state.selectedItem)
   analytics.send.search(state.selectedItem)
+
   schedule.viewItem(weekSelector.getSelectedWeek(), state.selectedItem)
 } else if (favorite.get() != null) {
   state.selectedItem = favorite.get()
+
   favorite.update(state.selectedItem)
+  url.push(state.selectedItem, false)
   url.update(state.selectedItem)
   analytics.send.search(state.selectedItem, true)
+
   schedule.viewItem(weekSelector.getSelectedWeek(), state.selectedItem)
 } else {
   search.focus()
@@ -35,9 +41,21 @@ if (url.hasSelectedItem()) {
 
 search.on('search', function (selectedItem) {
   state.selectedItem = selectedItem
+
   favorite.update(state.selectedItem)
+  url.push(state.selectedItem)
   url.update(state.selectedItem)
   analytics.send.search(state.selectedItem)
+
+  schedule.viewItem(weekSelector.getSelectedWeek(), state.selectedItem)
+})
+
+url.on('update', function (selectedItem) {
+  state.selectedItem = selectedItem
+
+  favorite.update(state.selectedItem)
+  url.update(state.selectedItem)
+
   schedule.viewItem(weekSelector.getSelectedWeek(), state.selectedItem)
 })
 
@@ -50,10 +68,4 @@ favorite.on('click', function () {
   favorite.toggle(state.selectedItem)
 })
 
-url.on('update', function (selectedItem) {
-  state.selectedItem = selectedItem
-  favorite.update(state.selectedItem)
-  schedule.viewItem(weekSelector.getSelectedWeek(), state.selectedItem)
-})
-
 document.body.style.opacity = 1
-- 
cgit v1.1