Merge branch 'v7-fix-linkpicker-anchor-link-without-url' of https://g…

…ithub.com/kjac/Umbraco-CMS into kjac-v7-fix-linkpicker-anchor-link-without-url
umbraco · Jun 18, 2019 · 9f6da2c · 9f6da2c
2 parents 99cabe5 + 580de6b
commit 9f6da2c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -836,7 +836,7 @@ function tinyMceService($log, imageHelper, $http, $timeout, macroResource, macro
 				}
 			}
 
-			if (!href) {
+            if (!href && !target.anchor) {
 				editor.execCommand('unlink');
 				return;
 			}
@@ -850,6 +850,10 @@ function tinyMceService($log, imageHelper, $http, $timeout, macroResource, macro
 				return;
 			}
 
+		    if (!href) {
+		        href = "";
+            }
+
 		    // Is email and not //user@domain.com and protocol (e.g. mailto:, sip:) is not specified
 		    if (href.indexOf('@') > 0 && href.indexOf('//') === -1 && href.indexOf(':') === -1) {
 		        // assume it's a mailto link