WordPress 4.7-scripts

[autoinstalls/wordpress.git] / wp-includes / js / tinymce / plugins / paste / plugin.js

diff --git a/wp-includes/js/tinymce/plugins/paste/plugin.js b/wp-includes/js/tinymce/plugins/paste/plugin.js
index 8839e9ad4486934e993cb2ee66356692bbf299f7..7d2a71e5998bbbff64106b675b595a01b933dfb6 100644 (file)
--- a/wp-includes/js/tinymce/plugins/paste/plugin.js
+++ b/wp-includes/js/tinymce/plugins/paste/plugin.js
@@ -264,7 +264,7 @@ define("tinymce/pasteplugin/SmartPaste", [
        "tinymce/util/Tools"
 ], function (Tools) {
        var isAbsoluteUrl = function (url) {
-               return /^https?:\/\/[\w\?\-\/+=.&%]+$/i.test(url);
+               return /^https?:\/\/[\w\?\-\/+=.&%@~#]+$/i.test(url);
        };
 
        var isImageUrl = function (url) {
@@ -1766,6 +1766,15 @@ define("tinymce/pasteplugin/Plugin", [
                        editor.focus();
                }
 
+               // draw back if power version is requested and registered
+               if (/(^|[ ,])powerpaste([, ]|$)/.test(settings.plugins) && PluginManager.get('powerpaste')) {
+                       /*eslint no-console:0 */
+                       if (typeof console !== "undefined" && console.log) {
+                               console.log("PowerPaste is incompatible with Paste plugin! Remove 'paste' from the 'plugins' option.");
+                       }
+                       return;
+               }
+
                self.clipboard = clipboard = new Clipboard(editor);
                self.quirks = new Quirks(editor);
                self.wordFilter = new WordFilter(editor);