From db3e2acc8be84e0a47a6b7c37044a4e916460d20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Velarde?= Date: Tue, 24 Apr 2018 13:09:11 +0200 Subject: [PATCH 1/3] Remove image from hook in IE and Edge (as CSS clip-path is not supported) --- package.json | 2 +- src/geo/ui/infowindow-view.js | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 980e214290..1b5554a315 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "carto.js", - "version": "4.0.1-0", + "version": "4.0.1-0-13808", "description": "CARTO javascript library", "repository": { "type": "git", diff --git a/src/geo/ui/infowindow-view.js b/src/geo/ui/infowindow-view.js index a3b3f2f0fd..15a3684dee 100644 --- a/src/geo/ui/infowindow-view.js +++ b/src/geo/ui/infowindow-view.js @@ -313,8 +313,12 @@ var Infowindow = View.extend({ }, _loadImageHook: function (imageDimensions, coverDimensions, url) { - var $hook = this.$('.CDB-hook'); + var cssClipPathNotSupported = util.ie || util.browser.ie || util.browser.edge; + if (cssClipPathNotSupported) { + return; + } + var $hook = this.$('.CDB-hook'); if (!$hook) { return; } From a18a37e95649d106a2690c9517ab9e4585216efb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Velarde?= Date: Tue, 24 Apr 2018 13:50:03 +0200 Subject: [PATCH 2/3] Preparing temporal version suffix --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1b5554a315..ba26c9a1b4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "carto.js", - "version": "4.0.1-0-13808", + "version": "4.0.1-13808", "description": "CARTO javascript library", "repository": { "type": "git", From 6210eab5633ca3c361ce738267b9429cbccf0287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Velarde?= Date: Tue, 24 Apr 2018 17:39:13 +0200 Subject: [PATCH 3/3] Hiding popup's hook if image on hook is not supported (IE / Edge) --- src/geo/ui/infowindow-view.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/geo/ui/infowindow-view.js b/src/geo/ui/infowindow-view.js index 15a3684dee..1298a77a52 100644 --- a/src/geo/ui/infowindow-view.js +++ b/src/geo/ui/infowindow-view.js @@ -312,14 +312,19 @@ var Infowindow = View.extend({ return false; }, + _imageOnHookNotSupported: function () { + var noCssClipPath = util.ie || util.browser.ie || util.browser.edge; + return noCssClipPath; + }, + _loadImageHook: function (imageDimensions, coverDimensions, url) { - var cssClipPathNotSupported = util.ie || util.browser.ie || util.browser.edge; - if (cssClipPathNotSupported) { + var $hook = this.$('.CDB-hook'); + if (!$hook) { return; } - var $hook = this.$('.CDB-hook'); - if (!$hook) { + if (this._imageOnHookNotSupported()) { + $hook.hide(); return; }