Ensure current focused node is eligible for control

WordPress · Mar 2, 2017 · a3bdbec · a3bdbec
1 parent 7049fd7
commit a3bdbec
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/tinymce-single/tinymce/block.js b/tinymce-single/tinymce/block.js
@@ -10,6 +10,17 @@
 
 		// Global controls
 
+		function isNodeEligibleForControl( node, name ) {
+			var block;
+
+			if ( ! node ) {
+				return false;
+			}
+
+			block = wp.blocks.getBlockSettingsByElement( node );
+			return block && _.includes( block.controls, name );
+		}
+
 		_.forEach( wp.blocks.getControls(), function( control, name ) {
 			var settings = {
 				icon: control.icon
@@ -27,7 +38,9 @@
 					var button = this;
 
 					editor.on( 'nodechange', function() {
-						button.active( control.isActive( element ) );
+						if ( isNodeEligibleForControl( element, name ) ) {
+							button.active( control.isActive( element ) );
+						}
 					} );
 				};
 			}