Merge branch 'release/1.10.1'

Author: Htbaa

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gh-datainmap",
-  "version": "1.10.0",
+  "version": "1.10.1",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -18,9 +18,9 @@
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
     "classnames": "^2.3.1",
-    "core-js": "^3.16.3",
+    "core-js": "~3.15.2",
     "lodash": "^4.17.21",
-    "ol": "^6.6.1",
+    "ol": "~6.5.0",
     "proj4": "^2.7.5",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",

plugins/gh-datainmap/CHANGELOG.md

@@ -1,3 +1,9 @@
+**1.10.1 (2021-10-06)**
+
+- Fix voor kaartweergave in de backend. Deze was namelijk niet zichtbaar.
+- Fix voor jQuery deprecation van `ready()` in de backend.
+- Oudere versies van ondersteunende software bibliotheken weer in gebruik genomen i.v.m. problemen in de backend.
+
 **1.10.0 (2021-08-25)**
 
 - Nieuwe versies van ondersteunende software bibliotheken in gebruik genomen.

plugins/gh-datainmap/gh-datainmap.php

@@ -3,7 +3,7 @@
 Plugin Name: Data In Map
 Plugin URI: https://bitbucket.org/gemeenteheerenveen/datainmap-plugin/src/master/
 Description: Data In Map is a plugin for displaying maps.
-Version: 1.10.0
+Version: 1.10.1
 Requires at least: 5.0
 Requires PHP: 7.2
 Author: Gemeente Heerenveen
@@ -26,7 +26,7 @@
 */
 
 if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
-if ( ! defined('GH_DIM_VERSION')) define('GH_DIM_VERSION', '1.10.0');
+if ( ! defined('GH_DIM_VERSION')) define('GH_DIM_VERSION', '1.10.1');
 if ( ! defined('GH_DIM_FILE')) define('GH_DIM_FILE', __FILE__);
 if ( ! defined('GH_DIM_DIR')) define('GH_DIM_DIR', dirname(__FILE__));
 if ( ! defined('GH_DIM_DEBUG')) define('GH_DIM_DEBUG', false);

src/admin-layers.js

@@ -13,7 +13,7 @@
 */
 import jQuery from 'jquery';
 const $ = jQuery;
-$(document).ready(function() {
+$(function() {
     const layerType = $('#gh_dim_layer_type');
     if(!layerType) {
         return;

src/admin-location.js

@@ -79,7 +79,7 @@ $(document).ready(function() {
 });
 
 // Location Content Type (Post, Redirect etc.)
-$(document).ready(function() {
+$(function() {
     const allFields = [
         '#gh_dim_location_redirect_url'
     ];

src/admin-locationpicker.js

@@ -23,6 +23,7 @@ import {configureMapView, fetchWMTSLayer, setSearchProjection, setSearchTownship
 import {mapReducer} from './reducers/map';
 import {searchReducer} from './reducers/search';
 import { filterReducer } from './reducers/filter';
+import { togglerReducer } from './reducers/toggler';
 import {Vector as VectorLayer} from 'ol/layer';
 import {Vector as VectorSource } from 'ol/source';
 import {Fill, Stroke, Style} from 'ol/style';
@@ -38,7 +39,8 @@ const _ = ld.noConflict();
 const rootReducer = combineReducers({
     map: mapReducer,
     search: searchReducer,
-    filter: filterReducer
+    filter: filterReducer,
+    toggler: togglerReducer
 });
 
 const middleware = applyMiddleware(createDebounce(), thunk);

src/scss/style.scss

@@ -13,8 +13,8 @@ $textcolor-button-hover: $textcolor-button-neutral;
 $shadow-color: rgba(0, 0, 0, 0.5);
 
 .ol-zoom {
-    left:auto;
-    top:auto;
+    left:auto!important;
+    top:auto!important;
     right:.5em;
     bottom:.5em;
 }