From 0810c24ff0e1d71e8fff8de85775b6858f027f2d Mon Sep 17 00:00:00 2001 From: Dominik Schilling Date: Wed, 8 Apr 2015 16:59:26 +0000 Subject: [PATCH] Merge strings that describe the same command. props iseulde. fixes #31776. Built from https://develop.svn.wordpress.org/trunk@32078 git-svn-id: http://core.svn.wordpress.org/trunk@32057 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../js/tinymce/plugins/wplink/plugin.js | 2 +- .../js/tinymce/plugins/wplink/plugin.min.js | 2 +- wp-includes/js/tinymce/wp-mce-help.php | 2 +- wp-includes/js/tinymce/wp-tinymce.js.gz | Bin 138523 -> 138523 bytes wp-includes/version.php | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wp-includes/js/tinymce/plugins/wplink/plugin.js b/wp-includes/js/tinymce/plugins/wplink/plugin.js index 48628005c8..f4b2747ac5 100644 --- a/wp-includes/js/tinymce/plugins/wplink/plugin.js +++ b/wp-includes/js/tinymce/plugins/wplink/plugin.js @@ -24,7 +24,7 @@ tinymce.PluginManager.add( 'wplink', function( editor ) { editor.addMenuItem( 'link', { icon: 'link', - text: 'Insert link', + text: 'Insert/edit link', cmd: 'WP_Link', stateSelector: 'a[href]', context: 'insert', diff --git a/wp-includes/js/tinymce/plugins/wplink/plugin.min.js b/wp-includes/js/tinymce/plugins/wplink/plugin.min.js index e36fc035fe..35868b9d52 100644 --- a/wp-includes/js/tinymce/plugins/wplink/plugin.min.js +++ b/wp-includes/js/tinymce/plugins/wplink/plugin.min.js @@ -1 +1 @@ -tinymce.PluginManager.add("wplink",function(a){a.addCommand("WP_Link",function(){window.wpLink&&window.wpLink.open(a.id)}),a.addShortcut("Alt+Shift+A","","WP_Link"),a.addShortcut("Meta+K","","WP_Link"),a.addButton("link",{icon:"link",tooltip:"Insert/edit link",cmd:"WP_Link",stateSelector:"a[href]"}),a.addButton("unlink",{icon:"unlink",tooltip:"Remove link",cmd:"unlink"}),a.addMenuItem("link",{icon:"link",text:"Insert link",cmd:"WP_Link",stateSelector:"a[href]",context:"insert",prependToContext:!0}),a.on("pastepreprocess",function(b){var c=b.content;a.selection.isCollapsed()||(c=c.replace(/<[^>]+>/g,""),c=tinymce.trim(c),/^(?:https?:)?\/\/\S+$/i.test(c)&&(a.execCommand("mceInsertLink",!1,{href:a.dom.decode(c)}),b.preventDefault()))})}); \ No newline at end of file +tinymce.PluginManager.add("wplink",function(a){a.addCommand("WP_Link",function(){window.wpLink&&window.wpLink.open(a.id)}),a.addShortcut("Alt+Shift+A","","WP_Link"),a.addShortcut("Meta+K","","WP_Link"),a.addButton("link",{icon:"link",tooltip:"Insert/edit link",cmd:"WP_Link",stateSelector:"a[href]"}),a.addButton("unlink",{icon:"unlink",tooltip:"Remove link",cmd:"unlink"}),a.addMenuItem("link",{icon:"link",text:"Insert/edit link",cmd:"WP_Link",stateSelector:"a[href]",context:"insert",prependToContext:!0}),a.on("pastepreprocess",function(b){var c=b.content;a.selection.isCollapsed()||(c=c.replace(/<[^>]+>/g,""),c=tinymce.trim(c),/^(?:https?:)?\/\/\S+$/i.test(c)&&(a.execCommand("mceInsertLink",!1,{href:a.dom.decode(c)}),b.preventDefault()))})}); \ No newline at end of file diff --git a/wp-includes/js/tinymce/wp-mce-help.php b/wp-includes/js/tinymce/wp-mce-help.php index 9f7e8d3fab..53d649e281 100644 --- a/wp-includes/js/tinymce/wp-mce-help.php +++ b/wp-includes/js/tinymce/wp-mce-help.php @@ -117,7 +117,7 @@ header('Content-Type: text/html; charset=' . get_bloginfo('charset')); nl jc dr - u• a + u• a o1. s qm wt diff --git a/wp-includes/js/tinymce/wp-tinymce.js.gz b/wp-includes/js/tinymce/wp-tinymce.js.gz index dad4db51a879b1c7b8dd7995f3291f64cbbd0be3..9b9f08e71607095135b9b151f378c9476199723d 100644 GIT binary patch delta 2260 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