Changeset 10054

Timestamp:

08/18/2015 10:54:46 PM (9 years ago)

Author:

djpaul

Message:

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, ` doesn'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 #6487 (trunk). Props dcavins, imath, DJPaul.

Location:

trunk/src/bp-activity

Files:

• bp-activity-cssjs.php (modified) (2 diffs)
• js/mentions.js (modified) (2 diffs)

trunk/src/bp-activity/bp-activity-cssjs.php

@@ -42 +42 @@
     }
 
+    // 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 );
+
     /**
      * Fires at the end of the Activity Mentions script.
@@ -54 +57 @@
 add_action( 'bp_enqueue_scripts', 'bp_activity_mentions_script' );
 add_action( 'bp_admin_enqueue_scripts', 'bp_activity_mentions_script' );
+
+/**
+ * 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;
+}

trunk/src/bp-activity/js/mentions.js

@@ -1 @@
-(function( $, undefined ) {
+/* global bp */
+
+window.bp = window.bp || {};
+
+( function( bp, $, undefined ) {
     var mentionsQueryCache = [],
         mentionsItem;
+
+    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;
+    }
 
     /**
@@ -229 +240 @@
 
     $( document ).ready(function() {
-        var loadMentionsInTinyMCE,
-            loadAttempts = 0,
-            users        = [];
-
-        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;
-                }
-            }
-
+        // Activity/reply, post comments, dashboard post 'text' editor.
+        $( '.bp-suggestions, #comments form textarea, .wp-editor-area' ).bp_mentions( bp.mentions.users );
+    });
+
+    bp.mentions.tinyMCEinit = function() {
+        if ( typeof window.tinyMCE === 'undefined' || window.tinyMCE.activeEditor === null || typeof window.tinyMCE.activeEditor === 'undefined' ) {
+            return;
+        } else {
             $( window.tinyMCE.activeEditor.contentDocument.activeElement )
                 .atwho( 'setIframe', $( '#content_ifr' )[0] )
-                .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 );
+                .bp_mentions( bp.mentions.users );
+        }
+    };
+})( bp, jQuery );