From 10aebb58d294b78148af2b03180f15a1cbaf53b4 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Mon, 24 Apr 2017 09:32:36 +0200 Subject: [PATCH 1/8] Allow user selection in overlay container --- css/ol.css | 9 +++++++-- src/ol/css.js | 8 ++++++++ src/ol/overlay.js | 3 ++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/css/ol.css b/css/ol.css index a3800baf14..36b63fbd8e 100644 --- a/css/ol.css +++ b/css/ol.css @@ -37,13 +37,18 @@ .ol-viewport, .ol-unselectable { -webkit-touch-callout: none; -webkit-user-select: none; - -khtml-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none; -webkit-tap-highlight-color: rgba(0,0,0,0); } - +.ol-selectable { + -webkit-touch-callout: default; + -webkit-user-select: auto; + -moz-user-select: auto; + -ms-user-select: auto; + user-select: auto; +} .ol-control { position: absolute; background-color: rgba(255,255,255,0.4); diff --git a/src/ol/css.js b/src/ol/css.js index 2d4247be14..915893ea34 100644 --- a/src/ol/css.js +++ b/src/ol/css.js @@ -10,6 +10,14 @@ goog.provide('ol.css'); ol.css.CLASS_HIDDEN = 'ol-hidden'; +/** + * The CSS class that we'll give the DOM elements to have them selectable. + * + * @const + * @type {string} + */ +ol.css.CLASS_SELECTABLE = 'ol-selectable'; + /** * The CSS class that we'll give the DOM elements to have them unselectable. * diff --git a/src/ol/overlay.js b/src/ol/overlay.js index 4be6ff6e3e..f69f4dd808 100644 --- a/src/ol/overlay.js +++ b/src/ol/overlay.js @@ -4,6 +4,7 @@ goog.require('ol'); goog.require('ol.MapEventType'); goog.require('ol.Object'); goog.require('ol.OverlayPositioning'); +goog.require('ol.css'); goog.require('ol.dom'); goog.require('ol.events'); goog.require('ol.extent'); @@ -58,7 +59,7 @@ ol.Overlay = function(options) { * @type {Element} */ this.element_ = document.createElement('DIV'); - this.element_.className = 'ol-overlay-container'; + this.element_.className = 'ol-overlay-container ' + ol.css.CLASS_SELECTABLE; this.element_.style.position = 'absolute'; /** From 1a9c41ae4ee3ed1ae72319cbf0f4b56ae344a8b2 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Fri, 28 Apr 2017 08:48:46 +0200 Subject: [PATCH 2/8] Add missing goog.require --- src/ol/format/gml2.js | 1 + src/ol/interaction/translate.js | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/ol/format/gml2.js b/src/ol/format/gml2.js index 8c1fb481fb..f9a86e3f2f 100644 --- a/src/ol/format/gml2.js +++ b/src/ol/format/gml2.js @@ -5,6 +5,7 @@ goog.require('ol.extent'); goog.require('ol.format.Feature'); goog.require('ol.format.GMLBase'); goog.require('ol.format.XSD'); +goog.require('ol.geom.Geometry'); goog.require('ol.obj'); goog.require('ol.proj'); goog.require('ol.xml'); diff --git a/src/ol/interaction/translate.js b/src/ol/interaction/translate.js index 57526896fa..da7bfa9d1e 100644 --- a/src/ol/interaction/translate.js +++ b/src/ol/interaction/translate.js @@ -2,11 +2,13 @@ goog.provide('ol.interaction.Translate'); goog.require('ol'); goog.require('ol.Collection'); +goog.require('ol.Object'); goog.require('ol.events'); goog.require('ol.events.Event'); goog.require('ol.functions'); goog.require('ol.array'); goog.require('ol.interaction.Pointer'); +goog.require('ol.interaction.Property'); goog.require('ol.interaction.TranslateEventType'); From d2e571e3d152a571101491da1529a314e4929e7e Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Thu, 13 Apr 2017 21:20:34 -0600 Subject: [PATCH 3/8] Correct path to cleancss --- tasks/publish.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/publish.sh b/tasks/publish.sh index 036adccad8..4ae20c9c95 100755 --- a/tasks/publish.sh +++ b/tasks/publish.sh @@ -72,7 +72,7 @@ build_js() { } build_css() { - ./node_modules/clean-css/bin/cleancss css/ol.css -o ${BUILDS}/ol.css + ./node_modules/.bin/cleancss css/ol.css -o ${BUILDS}/ol.css cp css/ol.css ${BUILDS}/ol-debug.css } From ec336e1d0eb66d61c7fa248f14e86e62aad7d4a9 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Thu, 13 Apr 2017 21:21:37 -0600 Subject: [PATCH 4/8] Out of beta --- package/readme.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/readme.md b/package/readme.md index 703e2cd25d..c27827b9ea 100644 --- a/package/readme.md +++ b/package/readme.md @@ -2,8 +2,6 @@ OpenLayers as ES2015 modules. -**Note: This package is in beta and the API is subject to change before a final stable release.** - ## Usage Add the `ol` package as a dependency to your project. @@ -51,5 +49,4 @@ Utility functions are available as properties of the default export from utility ## Caveats - * Module identifiers and the structure of the exports are subject to change while this package is in beta. * The WebGL renderer is not available in this package. From 069ae0aff4e550fe343921d166ec229aab0df813 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Wed, 19 Apr 2017 14:41:04 +0200 Subject: [PATCH 5/8] Fix tissot example docs --- examples/tissot.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/tissot.html b/examples/tissot.html index 9308e421df..5bbd30f6bf 100644 --- a/examples/tissot.html +++ b/examples/tissot.html @@ -3,7 +3,7 @@ layout: example.html title: Tissot Indicatrix shortdesc: Draw Tissot's indicatrices on maps. docs: > - Example of [Tissot indicatrix](http://en.wikipedia.org/wiki/Tissot's_indicatrix) maps. The map on the left is an EPSG:4326 map. The one on the right is EPSG:3857. + Example of [Tissot indicatrix](http://en.wikipedia.org/wiki/Tissot's_indicatrix) maps. The map on the top is an `EPSG:4326` map. The one on the bottom is `EPSG:3857`. tags: "tissot, circle" ---

EPSG:4326

From 51230aa3fb0744e43838e13c22404a72f8e5f971 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Wed, 19 Apr 2017 14:58:16 +0200 Subject: [PATCH 6/8] Fix broken link in wmts-ign example --- examples/wmts-ign.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/wmts-ign.html b/examples/wmts-ign.html index f7edf86982..3f84a9cdce 100644 --- a/examples/wmts-ign.html +++ b/examples/wmts-ign.html @@ -5,10 +5,10 @@ shortdesc: Demonstrates displaying IGN (France) WMTS layers. docs: > In this example an IGN WMTS layer is displayed. For more information on IGN's WMTS service see the - IGN Géoportail API web page - and - - Descriptif technique des web services du Géoportail (french). + [IGN Géoportail API web page](http://api.ign.fr/accueil) + and + [Descriptif technique des web services du Géoportail](http://www.geoportail.gouv.fr/depot/api/cgu/DT_APIGeoportail.pdf) + (french). tags: "french, ign, geoportail, wmts" ---
From 5e3ba9b7d16fc87652924b58a24562ec12f75795 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Thu, 20 Apr 2017 10:54:41 +0200 Subject: [PATCH 7/8] Use firefox < 53 in travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 74212c2c27..089ab6968d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ node_js: - "6.1" addons: - firefox: "latest" + firefox: "52.0" cache: directories: From e7afe2cb9cdd7488acd9a50526da402905e7da07 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Wed, 3 May 2017 08:30:29 -0600 Subject: [PATCH 8/8] Update package versions to 4.1.1 --- changelog/v4.1.1.md | 13 +++++++++++++ package.json | 2 +- package/package.json | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 changelog/v4.1.1.md diff --git a/changelog/v4.1.1.md b/changelog/v4.1.1.md new file mode 100644 index 0000000000..facc665cf4 --- /dev/null +++ b/changelog/v4.1.1.md @@ -0,0 +1,13 @@ +# 4.1.1 + +## Summary + +This is a patch release to fix several minor issues and two regressions in the [4.1.0 release](https://github.com/openlayers/openlayers/releases/tag/v4.1.0). + +## Changes + + * [#6711](https://github.com/openlayers/openlayers/pull/6711) - Correct path to cleancss ([@tschaub](https://github.com/tschaub)) + * [#6728](https://github.com/openlayers/openlayers/pull/6728) - Fix tissot examples docs ([@fredj](https://github.com/fredj)) + * [#6732](https://github.com/openlayers/openlayers/pull/6732) - Use firefox < 53 in travis ([@fredj](https://github.com/fredj)) + * [#6741](https://github.com/openlayers/openlayers/pull/6741) - Allow user selection in overlay container ([@fredj](https://github.com/fredj)) + * [#6755](https://github.com/openlayers/openlayers/pull/6755) - Add missing goog.require ([@fredj](https://github.com/fredj)) diff --git a/package.json b/package.json index 4d9541b84e..8f31b6af88 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openlayers", - "version": "4.1.0", + "version": "4.1.1", "description": "Build tools and sources for developing OpenLayers based mapping applications", "keywords": [ "map", diff --git a/package/package.json b/package/package.json index c369b881fb..9ac21a2b7e 100644 --- a/package/package.json +++ b/package/package.json @@ -1,6 +1,6 @@ { "name": "ol", - "version": "4.1.0", + "version": "4.1.1", "description": "OpenLayers as ES2015 modules", "main": "index.js", "module": "index.js",