Skip to content

feat($modal): revert modal jumping hack #3251

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

Open
andreiglingeanu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat($modal): revert modal jumping hack #3251

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
63 changes: 63 additions & 0 deletions framework/static/js/fw.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,6 +749,8 @@ fw.getQueryString = function(name) {
uploader: false
});

patchMediaFramesModalToDoTheFocusCorrectly( this.frame );

var modal = this;

this.frame.once('ready', function(){
Expand Down Expand Up @@ -1005,6 +1007,67 @@ fw.getQueryString = function(name) {
$frame.css('overflow-y', 'hidden');
}
});

// https://github.com/WordPress/WordPress/blob/4ca4ff999aba05892c05d26cddf3af540f47b93b/wp-includes/js/media-views.js#L6800
// When you execute frame.modal.open() - the modal tries to switch focus
// to its $el. Actually, this switches the scrollTop property for window.
//
// In order to prevent that we'll have to monkey patch the frame.modal.open
// method and do the focus properly - that's what this function does
//
// TODO: remove to remove this after WordPress 5.0
function patchMediaFramesModalToDoTheFocusCorrectly (frame) {
if (! frame.modal) return;

frame.modal.open = function () {
var $el = this.$el,
options = this.options,
mceEditor;

if ( $el.is(':visible') ) {
return this;
}

this.clickedOpenerEl = document.activeElement;

if ( ! this.views.attached ) {
this.attach();
}

// If the `freeze` option is set, record the window's scroll position.
if ( options.freeze ) {
this._freeze = {
scrollTop: jQuery( window ).scrollTop()
};
}

// Disable page scrolling.
jQuery( 'body' ).addClass( 'modal-open' );

$el.show();

// Try to close the onscreen keyboard
if ( 'ontouchend' in document ) {
if ( ( mceEditor = window.tinymce && window.tinymce.activeEditor ) && ! mceEditor.isHidden() && mceEditor.iframeElement ) {
mceEditor.iframeElement.focus();
mceEditor.iframeElement.blur();

setTimeout( function() {
mceEditor.iframeElement.blur();
}, 100 );
}
}

// this part is changed from the original method
// this.$el.focus();
// http://stackoverflow.com/a/11676673/3220977
var initialX = window.scrollX, initialY = window.scrollY;
this.$el.focus();
window.scrollTo(initialX, initialY);

return this.propagate('open');
}
}
})();

/**
Expand Down