summaryrefslogtreecommitdiff
path: root/www/js
diff options
context:
space:
mode:
authorPeter Grassberger <petertheone@gmail.com>2015-08-02 22:29:08 (GMT)
committerPeter Grassberger <petertheone@gmail.com>2015-08-02 22:29:08 (GMT)
commit8e34dfc158906ad1ddf5810b8d0a88be6b7ffb1f (patch)
tree488c3d54f54f8fee6de97a3bb67f29c7f4ac60ed /www/js
parent5a3b14483b992969f7f9f1d5fe59b008b20db2c9 (diff)
switch to hashless urls
Diffstat (limited to 'www/js')
-rw-r--r--www/js/apps.js8
-rw-r--r--www/js/utils.js6
2 files changed, 7 insertions, 7 deletions
diff --git a/www/js/apps.js b/www/js/apps.js
index dcabe98..249947a 100644
--- a/www/js/apps.js
+++ b/www/js/apps.js
@@ -59,13 +59,13 @@ function apps_select(app) {
apps_current = app = 'shows';
shows_init();
}
- if (locationHashValue() !== app) {
- history.pushState(null, null, '/#' + app + '/');
+ if (locationHrefValue() !== app) {
+ history.pushState(null, null, '/' + app + '/');
}
}
function apps_init() {
- apps_current = locationHashValue();
+ apps_current = locationHrefValue();
if(auth_token && auth_username) {
apps_select(apps_current);
@@ -73,7 +73,7 @@ function apps_init() {
$(window).on('popstate', function(event) {
if(auth_token && auth_username) {
- apps_select(locationHashValue());
+ apps_select(locationHrefValue());
}
});
}
diff --git a/www/js/utils.js b/www/js/utils.js
index 2c69b73..2b5d576 100644
--- a/www/js/utils.js
+++ b/www/js/utils.js
@@ -96,7 +96,7 @@ function get_rd_week(msEpoch) {
return week;
}
-function locationHashValue() {
- var hash = window.location.hash.match(/#([a-z]+)\/?.*/);
- return hash ? hash[1] : '';
+function locationHrefValue() {
+ var value = window.location.href.match(/import.helsinki.at\/([a-z]+)\/?.*/);
+ return value ? value[1] : '';
}