Merge pull request #9670 from ckeditor/i/2762

Fix (media-embed): Added support for more google maps URL formats (goo.gl/maps, maps.google.com, maps.app.goo.gl). Closes #2762.
ckeditor · May 25, 2021 · a5991c9 · a5991c9
2 parents 3dbbadd + 97ef6ed
commit a5991c9
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 2 deletions.
diff --git a/packages/ckeditor5-media-embed/src/mediaembedediting.js b/packages/ckeditor5-media-embed/src/mediaembedediting.js
@@ -133,7 +133,12 @@ export default class MediaEmbedEditing extends Plugin {
 				},
 				{
 					name: 'googleMaps',
-					url: /^google\.com\/maps/
+					url: [
+						/^google\.com\/maps/,
+						/^goo\.gl\/maps/,
+						/^maps\.google\.com/,
+						/^maps\.app\.goo\.gl/
+					]
 				},
 				{
 					name: 'flickr',

diff --git a/packages/ckeditor5-media-embed/tests/mediaembedediting.js b/packages/ckeditor5-media-embed/tests/mediaembedediting.js
@@ -303,6 +303,22 @@ describe( 'MediaEmbedEditing', () => {
 							] );
 						} );
 
+						it( 'upcasts the URL (google maps short URL)', () => {
+							testMediaUpcast( [
+								'https://goo.gl/maps/foo',
+								'goo.gl/maps/foo'
+							] );
+						} );
+
+						it( 'upcasts the URL (google maps for Android)', () => {
+							testMediaUpcast( [
+								'https://maps.google.com',
+								'https://maps.app.goo.gl',
+								'maps.google.com',
+								'maps.app.goo.gl'
+							] );
+						} );
+
 						it( 'upcasts the URL (flickr)', () => {
 							testMediaUpcast( [
 								'https://www.flickr.com/foo/bar',

diff --git a/packages/ckeditor5-media-embed/theme/mediaembedediting.css b/packages/ckeditor5-media-embed/theme/mediaembedediting.css
@@ -32,6 +32,9 @@
 
 	&[data-oembed-url*="twitter.com"],
 	&[data-oembed-url*="google.com/maps"],
+	&[data-oembed-url*="goo.gl/maps"],
+	&[data-oembed-url*="maps.google.com"],
+	&[data-oembed-url*="maps.app.goo.gl"],
 	&[data-oembed-url*="facebook.com"],
 	&[data-oembed-url*="instagram.com"] {
 		& .ck-media__placeholder__icon * {

diff --git a/packages/ckeditor5-theme-lark/theme/ckeditor5-media-embed/mediaembedediting.css b/packages/ckeditor5-theme-lark/theme/ckeditor5-media-embed/mediaembedediting.css