<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][10053] branches/2.3/src/bp-activity: Activity: fix @mentions in wp-admin post editor.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/10053">10053</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/10053","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>djpaul</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-08-18 22:49:31 +0000 (Tue, 18 Aug 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Activity: fix @mentions in wp-admin post editor.
If the screen loads with the text editor visible, `bp_mentions` is attached to the text editor as expected, but `loadMentionsInTinyMCE` uses up its tries and gives up trying to attach the iframe, so when you switch to the visual editor, `bp_mentions` didn't work.
This change removes the looped `loadMentionsInTinyMCE` approach and instead hooks into TinyMCE configuration to specify an init callback, where we then load `bp_mentions`.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6487">#6487</a> (branch). Props dcavins, imath, DJPaul.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches23srcbpactivitybpactivitycssjsphp">branches/2.3/src/bp-activity/bp-activity-cssjs.php</a></li>
<li><a href="#branches23srcbpactivityjsmentionsjs">branches/2.3/src/bp-activity/js/mentions.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches23srcbpactivitybpactivitycssjsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/2.3/src/bp-activity/bp-activity-cssjs.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/2.3/src/bp-activity/bp-activity-cssjs.php 2015-08-16 23:09:16 UTC (rev 10052)
+++ branches/2.3/src/bp-activity/bp-activity-cssjs.php 2015-08-18 22:49:31 UTC (rev 10053)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,6 +41,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_style_add_data( 'bp-mentions-css', 'suffix', $min );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If the script has been enqueued, let's attach our mentions TinyMCE init callback.
+ add_filter( 'tiny_mce_before_init', 'bp_add_mentions_on_tinymce_init', 10, 2 );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires at the end of the Activity Mentions script.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,3 +56,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bp_enqueue_scripts', 'bp_activity_mentions_script' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bp_admin_enqueue_scripts', 'bp_activity_mentions_script' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Bind the mentions listener to a wp_editor instance when TinyMCE initializes.
+ *
+ * @since BuddyPress (2.3.3)
+ *
+ * @param array $settings An array with TinyMCE config.
+ * @param string $editor_id Unique editor identifier, e.g. 'content'.
+ *
+ * @return array $mceInit An array with TinyMCE config.
+ */
+function bp_add_mentions_on_tinymce_init( $settings, $editor_id ) {
+ // We only apply the mentions init to the visual post editor in the WP dashboard.
+ if ( 'content' === $editor_id ) {
+ $settings['init_instance_callback'] = 'window.bp.mentions.tinyMCEinit';
+ }
+
+ return $settings;
+}
</ins></span></pre></div>
<a id="branches23srcbpactivityjsmentionsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/2.3/src/bp-activity/js/mentions.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/2.3/src/bp-activity/js/mentions.js 2015-08-16 23:09:16 UTC (rev 10052)
+++ branches/2.3/src/bp-activity/js/mentions.js 2015-08-18 22:49:31 UTC (rev 10053)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,18 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-(function( $, undefined ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* global bp */
+
+window.bp = window.bp || {};
+
+( function( bp, $, undefined ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> var mentionsQueryCache = [],
</span><span class="cx" style="display: block; padding: 0 10px"> mentionsItem;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bp.mentions = bp.mentions || {};
+ bp.mentions.users = window.bp.mentions.users || [];
+
+ if ( typeof window.BP_Suggestions === 'object' ) {
+ bp.mentions.users = window.BP_Suggestions.friends || bp.mentions.users;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Adds BuddyPress @mentions to form inputs.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -228,34 +239,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $( document ).ready(function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var loadMentionsInTinyMCE,
- loadAttempts = 0,
- users = [];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Activity/reply, post comments, dashboard post 'text' editor.
+ $( '.bp-suggestions, #comments form textarea, .wp-editor-area' ).bp_mentions( bp.mentions.users );
+ });
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( typeof window.BP_Suggestions === 'object' ) {
- users = window.BP_Suggestions.friends || users;
- }
-
- // Dashboard post 'visual' editor.
- loadMentionsInTinyMCE = function() {
- if ( loadAttempts < 4 || ! $( 'body' ).hasClass( 'wp-admin' ) ) {
- loadAttempts++;
-
- if ( typeof window.tinyMCE === 'undefined' || window.tinyMCE.activeEditor === null || typeof window.tinyMCE.activeEditor === 'undefined' ) {
- setTimeout( loadMentionsInTinyMCE, 500 );
- return;
- }
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bp.mentions.tinyMCEinit = function() {
+ if ( typeof window.tinyMCE === 'undefined' || window.tinyMCE.activeEditor === null || typeof window.tinyMCE.activeEditor === 'undefined' ) {
+ return;
+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> $( window.tinyMCE.activeEditor.contentDocument.activeElement )
</span><span class="cx" style="display: block; padding: 0 10px"> .atwho( 'setIframe', $( '#content_ifr' )[0] )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .bp_mentions( users );
- };
-
- // Activity/reply, post comments, dashboard post 'text' editor.
- $( '.bp-suggestions, #comments form textarea, .wp-editor-area' ).bp_mentions( users );
-
- // Dashboard post 'visual' editor.
- loadMentionsInTinyMCE();
- });
-})( jQuery );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .bp_mentions( bp.mentions.users );
+ }
+ };
+})( bp, jQuery );
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>