Merge branch 'master' into zoom

build/build.py

@@ -51,10 +51,14 @@ def build(config_file = None, output_file = None, options = None):
         outputFilename = output_file
 
     print "Merging libraries."
-    if use_compressor == "closure":
+    try:
-        sourceFiles = mergejs.getNames(sourceDirectory, configFilename)
+        if use_compressor == "closure":
-    else:
+            sourceFiles = mergejs.getNames(sourceDirectory, configFilename)
-        merged = mergejs.run(sourceDirectory, None, configFilename)
+        else:
+            merged = mergejs.run(sourceDirectory, None, configFilename)
+    except mergejs.MissingImport, E:
+        print "\nAbnormal termination."
+        sys.exit("ERROR: %s" % E)
 
     print "Compressing using %s" % use_compressor
     if use_compressor == "jsmin":

examples/mapbox.js

@@ -18,7 +18,6 @@ var streets = new OpenLayers.Layer.XYZ(
 
 var map = new OpenLayers.Map({
     div: "map",
-    projeciton: "EPSG:900913",
     layers: [streets],
     controls: [
         new OpenLayers.Control.Attribution(),

lib/OpenLayers/Popup.js

@@ -685,7 +685,9 @@ OpenLayers.Popup = OpenLayers.Class({
         // 'img' properties in the context.
         //
         var onImgLoad = function() {
-            
+            if (this.popup.id === null) { // this.popup has been destroyed!
+                return;
+            }
             this.popup.updateSize();
      
             if ( this.popup.visible() && this.popup.panMapIfOutOfView ) {

readme.md

@@ -48,7 +48,7 @@ As an example, using bash (with the release files in ~/openlayers):
 The [examples directory](http://openlayers.org/dev/examples/) is full of useful examples.
 
 Documentation is available at http://trac.osgeo.org/openlayers/wiki/Documentation.
-You can generate the API documentation with http://www.naturaldocs.org/:
+You can generate the API documentation with http://www.naturaldocs.org/
 As an example, using bash (with the release files in ~/openlayers):
 
     $ cd ~/openlayers/

tests/Test.AnotherWay.baseadditions.js

@@ -141,7 +141,7 @@ Test.AnotherWay.quicksearch = function(){
 Test.AnotherWay.filterTestList = function(str){
     Test.AnotherWay.unfilterTestList();
     var re = new RegExp(str, 'i');
-    var candidates  = document.querySelectorAll('#testtable tr td:nth-child(2) a');
+    var candidates  = document.querySelectorAll('#testtable tr a');
     for (var idx = 0, len = candidates.length; idx<len; idx++) {
         var tr = candidates[idx].parentNode.parentNode;
         var html = candidates[idx].innerHTML;
@@ -164,10 +164,10 @@ Test.AnotherWay.unfilterTestList = function() {
 };
 
 // bind our quicksearch init method to body onload.
-(function(win){
+(function(win) {
     if (win.addEventListener) {
         win.addEventListener('load', Test.AnotherWay.bindQuicksearchListener);
-    } else if (input.attachEvent) {
+    } else if (win.attachEvent) {
         win.attachEvent('onload', Test.AnotherWay.bindQuicksearchListener);
     } else {
         win.onload = function(){