Merge pull request #168 from WordPress/update/single-remove-window-el…

…ement Single TinyMCE: Drop window element global
WordPress · Mar 2, 2017 · ca89f74 · ca89f74
2 parents b942bb4 + 5ebcd10
commit ca89f74
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/shared/tinymce/toolbar.js b/shared/tinymce/toolbar.js
@@ -75,7 +75,8 @@
 					function onClick( callback ) {
 						return function() {
 							editor.undoManager.transact( function() {
-								callback( editor, window.element );
+								var element = editor.selection.getSelectedBlocks()[ 0 ];
+								callback( editor, element );
 							} );
 						}
 					}

diff --git a/tinymce-single/tinymce/block.js b/tinymce-single/tinymce/block.js
@@ -4,8 +4,8 @@
 
 		// Set focussed block. Global variable for now. Top-level node for now.
 
-		editor.on( 'nodechange', function( event ) {
-			element = window.element = event.parents[ event.parents.length - 1 ];
+		editor.on( 'nodechange', function() {
+			element = editor.selection.getSelectedBlocks()[ 0 ];
 		} );
 
 		// Global controls