From 3e4b7b4cd79b23a6bd739a85182ea199b2e24096 Mon Sep 17 00:00:00 2001 From: CounterPillow Date: Fri, 5 Aug 2011 13:38:09 +0200 Subject: [PATCH 1/3] Added title field for sign search box, added default value which sets to nothing when focussed and resets when box is empty and blured. --- overviewer_core/data/web_assets/overviewer.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/overviewer_core/data/web_assets/overviewer.js b/overviewer_core/data/web_assets/overviewer.js index c5083fc..1d7fe60 100644 --- a/overviewer_core/data/web_assets/overviewer.js +++ b/overviewer_core/data/web_assets/overviewer.js @@ -817,6 +817,22 @@ var overviewer = { var searchInput = document.createElement("input"); searchInput.type = "text"; + searchInput.value = "Sign Search" + searchInput.title = "Sign Search" + + /* Hey dawg, I heard you like functions. + * So we defined a function inside your function. + */ + searchInput.onfocus = function() { + if (searchInput.value == "Sign Search") { + searchInput.value = ""; + } + }; + searchInput.onblur = function() { + if (searchInput.value == "") { + searchInput.value = "Sign Search"; + } + }; searchControl.appendChild(searchInput); From f5399b78cc92a01f0b7ac88a39dac4b3ba411b9e Mon Sep 17 00:00:00 2001 From: Andrew Chin Date: Fri, 5 Aug 2011 09:18:14 -0400 Subject: [PATCH 2/3] Made searchbox text gray if inactive --- .../data/web_assets/overviewer.css | 8 ++++++ overviewer_core/data/web_assets/overviewer.js | 27 ++++++++++--------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/overviewer_core/data/web_assets/overviewer.css b/overviewer_core/data/web_assets/overviewer.css index d875cdb..9085557 100644 --- a/overviewer_core/data/web_assets/overviewer.css +++ b/overviewer_core/data/web_assets/overviewer.css @@ -114,6 +114,14 @@ body { background-colour: #fff; } +#searchControl>input.inactive { + color: #ccc; +} + +#searchControl>input.active { + color: #000; +} + div#searchDropDown { border: 1px solid #000; width: 17em; diff --git a/overviewer_core/data/web_assets/overviewer.js b/overviewer_core/data/web_assets/overviewer.js index 1d7fe60..12ca796 100644 --- a/overviewer_core/data/web_assets/overviewer.js +++ b/overviewer_core/data/web_assets/overviewer.js @@ -817,22 +817,25 @@ var overviewer = { var searchInput = document.createElement("input"); searchInput.type = "text"; - searchInput.value = "Sign Search" - searchInput.title = "Sign Search" + searchInput.value = "Sign Search"; + searchInput.title = "Sign Search"; + $(searchInput).addClass("inactive"); /* Hey dawg, I heard you like functions. * So we defined a function inside your function. - */ - searchInput.onfocus = function() { - if (searchInput.value == "Sign Search") { - searchInput.value = ""; - } - }; + */ + searchInput.onfocus = function() { + if (searchInput.value == "Sign Search") { + searchInput.value = ""; + $(searchInput).removeClass("inactive").addClass("active"); + } + }; searchInput.onblur = function() { - if (searchInput.value == "") { - searchInput.value = "Sign Search"; - } - }; + if (searchInput.value == "") { + searchInput.value = "Sign Search"; + $(searchInput).removeClass("active").addClass("inactive"); + } + }; searchControl.appendChild(searchInput); From d767eb9d00c3b04f1040aebb53a3af8940d8097a Mon Sep 17 00:00:00 2001 From: Thomas Lake Date: Thu, 11 Aug 2011 18:30:17 +0100 Subject: [PATCH 3/3] Explicitly pass regionlist to _iterate_regionfiles() in world.py --- overviewer_core/world.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overviewer_core/world.py b/overviewer_core/world.py index fbd61a9..aece3fa 100644 --- a/overviewer_core/world.py +++ b/overviewer_core/world.py @@ -82,7 +82,7 @@ class World(object): self.regionlist = map(os.path.abspath, regionlist) # a list of paths else: self.regionlist = None - for x, y, regionfile in self._iterate_regionfiles(): + for x, y, regionfile in self._iterate_regionfiles(regionlist): mcr = self.reload_region(regionfile) mcr.get_chunk_info() regionfiles[(x,y)] = (x,y,regionfile,mcr)