Merge remote-tracking branch 'upstream/master' into configurable-north

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;

overviewer_core/data/web_assets/overviewer.js

@@ -843,6 +843,25 @@ var overviewer = {
 
             var searchInput = document.createElement("input");
             searchInput.type = "text";
+			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).removeClass("inactive").addClass("active");
+                }
+            };
+			searchInput.onblur = function() {
+                if (searchInput.value == "") {
+                    searchInput.value = "Sign Search";
+                    $(searchInput).removeClass("active").addClass("inactive");
+                }
+            };
 
             searchControl.appendChild(searchInput);
 

overviewer_core/world.py

@@ -84,7 +84,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)