From addc67549e41f3a15daf99dfe40f67071d482013 Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Fri, 22 Feb 2019 21:56:17 +0100 Subject: [PATCH] frameborder lower case fix #670 --- umap/static/umap/js/umap.controls.js | 2 +- umap/static/umap/js/umap.core.js | 6 +++--- umap/static/umap/test/Util.js | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/umap/static/umap/js/umap.controls.js b/umap/static/umap/js/umap.controls.js index c0d34bec..ed257d13 100644 --- a/umap/static/umap/js/umap.controls.js +++ b/umap/static/umap/js/umap.controls.js @@ -1056,7 +1056,7 @@ L.U.IframeExporter = L.Evented.extend({ } var currentView = this.options.currentView ? window.location.hash : '', iframeUrl = this.baseUrl + '?' + this.map.xhr.buildQueryString(this.queryString) + currentView, - code = ''; + code = ''; if (this.options.includeFullScreenLink) { code += '

' + L._('See full screen') + '

'; } diff --git a/umap/static/umap/js/umap.core.js b/umap/static/umap/js/umap.core.js index 202595e0..c27c2bc6 100644 --- a/umap/static/umap/js/umap.core.js +++ b/umap/static/umap/js/umap.core.js @@ -81,9 +81,9 @@ L.Util.toHTML = function (r) { r = r.replace(/\[\[([^|]*?)\|(.*?)\]\]/g, '$2'); // iframe - r = r.replace(/{{{(h_t_t_ps?[^ |]*)}}}/g, ''); - r = r.replace(/{{{(h_t_t_ps?[^ |]*)\|(\d*)(px)?}}}/g, ''); - r = r.replace(/{{{(h_t_t_ps?[^ |]*)\|(\d*)(px)?\*(\d*)(px)?}}}/g, ''); + r = r.replace(/{{{(h_t_t_ps?[^ |]*)}}}/g, ''); + r = r.replace(/{{{(h_t_t_ps?[^ |]*)\|(\d*)(px)?}}}/g, ''); + r = r.replace(/{{{(h_t_t_ps?[^ |]*)\|(\d*)(px)?\*(\d*)(px)?}}}/g, ''); // images r = r.replace(/{{([^\]|]*?)}}/g, ''); diff --git a/umap/static/umap/test/Util.js b/umap/static/umap/test/Util.js index 6d93c443..ea8d6b2d 100644 --- a/umap/static/umap/test/Util.js +++ b/umap/static/umap/test/Util.js @@ -75,23 +75,23 @@ describe('L.Util', function () { }); it('should handle iframe', function () { - assert.equal(L.Util.toHTML('A simple iframe: {{{http://osm.org/pouet.html}}}'), 'A simple iframe: '); + assert.equal(L.Util.toHTML('A simple iframe: {{{http://osm.org/pouet.html}}}'), 'A simple iframe: '); }); it('should handle iframe with height', function () { - assert.equal(L.Util.toHTML('A simple iframe: {{{http://osm.org/pouet.html|200}}}'), 'A simple iframe: '); + assert.equal(L.Util.toHTML('A simple iframe: {{{http://osm.org/pouet.html|200}}}'), 'A simple iframe: '); }); it('should handle iframe with height and width', function () { - assert.equal(L.Util.toHTML('A simple iframe: {{{http://osm.org/pouet.html|200*400}}}'), 'A simple iframe: '); + assert.equal(L.Util.toHTML('A simple iframe: {{{http://osm.org/pouet.html|200*400}}}'), 'A simple iframe: '); }); it('should handle iframe with height with px', function () { - assert.equal(L.Util.toHTML('A simple iframe: {{{http://osm.org/pouet.html|200px}}}'), 'A simple iframe: '); + assert.equal(L.Util.toHTML('A simple iframe: {{{http://osm.org/pouet.html|200px}}}'), 'A simple iframe: '); }); it('should handle iframe with url parameter', function () { - assert.equal(L.Util.toHTML('A simple iframe: {{{https://osm.org/?url=https%3A//anotherurl.com}}}'), 'A simple iframe: '); + assert.equal(L.Util.toHTML('A simple iframe: {{{https://osm.org/?url=https%3A//anotherurl.com}}}'), 'A simple iframe: '); }); it('http link with http link as parameter as variable', function () {