Commit d6489a758b79713c1c79b67991c7b97f5111401e
1 parent
24d01984
History working with dynamic nav
Showing
1 changed file
with
13 additions
and
6 deletions
Show diff stats
js/crep.js
@@ -7,7 +7,11 @@ function pageSpecific(location) { | @@ -7,7 +7,11 @@ function pageSpecific(location) { | ||
7 | function actLink(ev) { | 7 | function actLink(ev) { |
8 | var location = ev.currentTarget.href | 8 | var location = ev.currentTarget.href |
9 | if (location.indexOf(window.location.host) >= 0) { | 9 | if (location.indexOf(window.location.host) >= 0) { |
10 | - loadDoc(location) | 10 | + loadDoc(location, function () { |
11 | + history.pushState({ | ||
12 | + loc: location | ||
13 | + }, document.title, location) | ||
14 | + }) | ||
11 | return false | 15 | return false |
12 | } | 16 | } |
13 | } | 17 | } |
@@ -16,16 +20,19 @@ function dynamiseLinks(el) { | @@ -16,16 +20,19 @@ function dynamiseLinks(el) { | ||
16 | $("a", el).click(actLink) | 20 | $("a", el).click(actLink) |
17 | } | 21 | } |
18 | 22 | ||
19 | -function loadDoc(location) { | 23 | +function loadDoc(location, callback)) { |
24 | + if (!callback) { | ||
25 | + callaback = function () { | ||
26 | + return undefined | ||
27 | + } | ||
28 | + } | ||
20 | $.get(location + '?c', function (data) { | 29 | $.get(location + '?c', function (data) { |
21 | mainContainer = $("#mainContainer") | 30 | mainContainer = $("#mainContainer") |
22 | mainContainer.html(data) | 31 | mainContainer.html(data) |
23 | - history.pushState({ | ||
24 | - loc: location | ||
25 | - }, document.title, location) | ||
26 | - // POST | 32 | + document.title = location |
27 | dynamiseLinks(mainContainer) | 33 | dynamiseLinks(mainContainer) |
28 | pageSpecific(location) | 34 | pageSpecific(location) |
35 | + callback() | ||
29 | }) | 36 | }) |
30 | 37 | ||
31 | } | 38 | } |