Split js into two separate files to allow use from third parties code

This commit is contained in:
Fedor A. Fetisov 2021-03-23 19:50:01 +03:00
parent 4ccf6ef3b5
commit 5bbbb0525f
4 changed files with 55 additions and 37 deletions

View File

@ -2,7 +2,7 @@
/*
* This file is a part of Mibew Open Street Map Plugin.
*
* Copyright 2014-2018 the original author or authors.
* Copyright 2014-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -105,7 +105,8 @@ class Plugin extends \Mibew\Plugin\AbstractPlugin implements \Mibew\Plugin\Plugi
$filepath = str_replace(DIRECTORY_SEPARATOR, '/', $this->getFilesPath());
$args['js'][] = $filepath . '/vendor/jquery-colorbox/jquery.colorbox-min.js';
$args['js'][] = $filepath . '/vendor/leaflet/dist/leaflet.js';
$args['js'][] = $filepath . '/js/plugin.js';
$args['js'][] = $filepath . '/js/common.js';
$args['js'][] = $filepath . '/js/users.js';
}
}

View File

@ -1,7 +1,7 @@
/*
* This file is a part of Mibew Open Street Map Plugin.
*
* Copyright 2014-2018 the original author or authors.
* Copyright 2014-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

48
js/common.js Normal file
View File

@ -0,0 +1,48 @@
/*!
* This file is a part of Mibew Open Street Map Plugin.
*
* Copyright 2014-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
* Display popup with a map and a marker on it.
*
* @param {String} country Name of the country. It will be used in the
* marker's title.
* @param {String} city Name of the city. It will be used in the marker's
* title.
* @param {Number} latitude Latitude of the point the marker should be
* placed.
* @param {Number} longitude Longitude of the point the marker should be
* placed.
*/
var showMap = function (country, city, latitude, longitude) {
var $canvas = $('<div id="map-canvas"></div>');
jQuery.colorbox({
html: $canvas,
onComplete: function() {
var map = L.map('map-canvas', {
center: [latitude, longitude],
zoom: 9
});
var osmUrl='https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
var osmAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors';
var osm = new L.TileLayer(osmUrl, {minZoom: 1, maxZoom: 19, attribution: osmAttrib});
map.addLayer(osm);
L.marker([latitude, longitude]).addTo(map).bindPopup('<strong>' + city + ', ' + country + '</strong>').openPopup();
}
});
}

View File

@ -1,7 +1,7 @@
/*!
* This file is a part of Mibew Open Street Map Plugin.
*
* Copyright 2014-2018 the original author or authors.
* Copyright 2014-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -16,38 +16,7 @@
* limitations under the License.
*/
(function (Mibew, $, L) {
/**
* Display popup with a map and a marker on it.
*
* @param {String} country Name of the country. It will be used in the
* marker's title.
* @param {String} city Name of the city. It will be used in the marker's
* title.
* @param {Number} latitude Latitude of the point the marker should be
* placed.
* @param {Number} longitude Longitude of the point the marker should be
* placed.
*/
var showMap = function (country, city, latitude, longitude) {
var $canvas = $('<div id="map-canvas"></div>');
$.colorbox({
html: $canvas,
onComplete: function() {
var map = L.map('map-canvas', {
center: [latitude, longitude],
zoom: 9
});
var osmUrl='https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
var osmAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors';
var osm = new L.TileLayer(osmUrl, {minZoom: 1, maxZoom: 19, attribution: osmAttrib});
map.addLayer(osm);
L.marker([latitude, longitude]).addTo(map).bindPopup('<strong>' + city + ', ' + country + '</strong>').openPopup();
}
});
}
(function (Mibew, $) {
/**
* Makes all necessary actions to get Geo info and show it on the map.
*
@ -124,4 +93,4 @@
}
);
})(Mibew, jQuery, L);
})(Mibew, jQuery);