From 1996f5cb25cb41446d8a8b0e5a33561edeae2e14 Mon Sep 17 00:00:00 2001 From: Xavier Mamano Date: Sat, 28 Jan 2012 19:13:28 +0100 Subject: [PATCH 1/5] Monitor the errors from the merge process. --- build/build.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/build/build.py b/build/build.py index ebb07d358f..0ca2a74a0e 100755 --- a/build/build.py +++ b/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": - sourceFiles = mergejs.getNames(sourceDirectory, configFilename) - else: - merged = mergejs.run(sourceDirectory, None, configFilename) + try: + if use_compressor == "closure": + sourceFiles = mergejs.getNames(sourceDirectory, 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": From fa3d89f5727d7170d77270f8f936a05aa9da27d1 Mon Sep 17 00:00:00 2001 From: Xavier Mamano Date: Mon, 30 Jan 2012 19:42:23 +0100 Subject: [PATCH 2/5] A popup can be destroyed before obtaining the images of `contentDiv`. --- lib/OpenLayers/Popup.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/OpenLayers/Popup.js b/lib/OpenLayers/Popup.js index 36f666e73f..774ecb8c03 100644 --- a/lib/OpenLayers/Popup.js +++ b/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 ) { From 1ef5cfd9a06bdd9f4d2ca7d1b40c725f7da1dd7a Mon Sep 17 00:00:00 2001 From: Marc Jansen Date: Fri, 2 Mar 2012 21:30:05 +0100 Subject: [PATCH 3/5] fix link to NaturalDocs --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 074556beb6..edcd4e9dcd 100644 --- a/readme.md +++ b/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/ From 59578931c2498f0f8f4577c75591d94acc8aa21c Mon Sep 17 00:00:00 2001 From: tschaub Date: Fri, 2 Mar 2012 18:29:25 -0700 Subject: [PATCH 4/5] Making testing in IE a tiny bit less painful. The super handy quick filter that Marc added in 57c16b73458b3c16d28695b74f99bdda38236da5 was causing a bit of trouble in IE. First, `input` was undefined where it was used as a misspelling for `window`. After that, IE choked on the nice CSS3 selector when filtering the test list. It turns out we don't need to be as selective and can treat all anchor elements within the table rows as candidates. --- tests/Test.AnotherWay.baseadditions.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/Test.AnotherWay.baseadditions.js b/tests/Test.AnotherWay.baseadditions.js index 01887bfb88..2354b34361 100644 --- a/tests/Test.AnotherWay.baseadditions.js +++ b/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 Date: Fri, 2 Mar 2012 18:38:42 -0700 Subject: [PATCH 5/5] Correcting example typo. Thanks @probins. --- examples/mapbox.js | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/mapbox.js b/examples/mapbox.js index c22116d126..ee57d66e0c 100644 --- a/examples/mapbox.js +++ b/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(),