From 1be74a87a27e9d2a20936f4fa40bb2918c2d855d Mon Sep 17 00:00:00 2001 From: tonio Date: Tue, 27 Jul 2010 17:13:13 +0200 Subject: [PATCH] Bugfixes --- lib/templatetags/libextras.py | 1 + static/js/common.js | 17 ++++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/templatetags/libextras.py b/lib/templatetags/libextras.py index 4627c86de..3cc2565a9 100644 --- a/lib/templatetags/libextras.py +++ b/lib/templatetags/libextras.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- import os from django.conf import settings from django import template diff --git a/static/js/common.js b/static/js/common.js index d117f1a96..f2a2d1bc3 100644 --- a/static/js/common.js +++ b/static/js/common.js @@ -333,13 +333,16 @@ searchbox_init = function() { } }); $("searchbox").setStyle("float", "left"); - var uri = new URI(location.href); - var params = uri.get("fragment").parseQueryString(); - if ($defined(params.pattern)) { - $("searchfield").set("value", params.pattern); - } - if ($defined(params.criteria)) { - $("crit_" + params.criteria).checked = true; + var frag = new URI(location.href).get("fragment"); + if (frag.indexOf('?') != -1) { + var params = frag.substring(frag.indexOf('?') + 1).parseQueryString(); + console.log(params); + if ($defined(params.pattern)) { + $("searchfield").set("value", params.pattern); + } + if ($defined(params.criteria)) { + $("crit_" + params.criteria).checked = true; + } } }