config / site leftover

This commit is contained in:
j 2011-05-30 00:42:21 +02:00
parent 0bc14bb408
commit d933b4bc43

View file

@ -49,7 +49,7 @@ pandora.URL = (function() {
var split = url.split('/'), var split = url.split('/'),
item = split[0], item = split[0],
view = new RegExp( view = new RegExp(
'^(' + $.map(app.config.itemViews, function(v) { '^(' + $.map(app.site.itemViews, function(v) {
return v.id; return v.id;
}).join('|') + ')$' }).join('|') + ')$'
).exec(split[1]); ).exec(split[1]);
@ -73,7 +73,7 @@ pandora.URL = (function() {
if (arguments.length == 1) { // fixme: remove later if (arguments.length == 1) { // fixme: remove later
url = title; url = title;
} }
history.pushState({}, app.config.site.name + (title ? ' - ' + title : ''), '/' + url); history.pushState({}, app.site.site.name + (title ? ' - ' + title : ''), '/' + url);
old.user.ui = $.extend({}, app.user.ui); // make a clone old.user.ui = $.extend({}, app.user.ui); // make a clone
this.update(); this.update();
}, },