Merge pull request #1672 from magicbug/dev

This commit is contained in:
Peter Goodhall
2022-10-14 17:06:19 +01:00
committed by GitHub
2 changed files with 4 additions and 5 deletions

View File

@@ -23,8 +23,7 @@
</script>
<script type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/L.Maidenhead.js"></script>
<script type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/leafembed.js"></script>
<script type="text/javascript">
<script id="leafembed" type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/leafembed.js" tileUrl="<?php echo $this->optionslib->get_option('map_tile_server');?>"></script> <script type="text/javascript">
$(function () {
$('[data-toggle="tooltip"]').tooltip()
});

View File

@@ -1,5 +1,5 @@
//! moment.js
//! version : 2.29.2
//! version : 2.29.4
//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
//! license : MIT
//! momentjs.com
@@ -2454,7 +2454,7 @@
function preprocessRFC2822(s) {
// Remove comments and folding whitespace and replace multiple-spaces with a single space
return s
.replace(/\([^)]*\)|[\n\t]/g, ' ')
.replace(/\([^()]*\)|[\n\t]/g, ' ')
.replace(/(\s\s+)/g, ' ')
.replace(/^\s\s*/, '')
.replace(/\s\s*$/, '');
@@ -5635,7 +5635,7 @@
//! moment.js
hooks.version = '2.29.2';
hooks.version = '2.29.4';
setHookCallback(createLocal);