Skip to content

Revert "Single TinyMCE: Drop window element global" #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aduth merged 1 commit into from
Mar 2, 2017
+3 −4
Merged

Revert "Single TinyMCE: Drop window element global" #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions shared/tinymce/toolbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@
function onClick( callback ) {
return function() {
editor.undoManager.transact( function() {
var element = editor.selection.getSelectedBlocks()[ 0 ];
callback( editor, element );
callback( editor, window.element );
} );
}
}
Expand Down
4 changes: 2 additions & 2 deletions tinymce-single/tinymce/block.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

// Set focussed block. Global variable for now. Top-level node for now.

editor.on( 'nodechange', function() {
element = editor.selection.getSelectedBlocks()[ 0 ];
editor.on( 'nodechange', function( event ) {
element = window.element = event.parents[ event.parents.length - 1 ];
} );

// Global controls
Expand Down