Commit bcf1adbe authored by Eric Windham's avatar Eric Windham

Merge branch '3326-merge-tag-box-position' into 'develop'

Shifted merge tag box down if it goes above the top of the page.

Closes #3326

See merge request !3856
parents 91f74c8a be792634
Pipeline #2853 passed with stages
in 1 minute and 54 seconds
......@@ -197,8 +197,12 @@ define( [
// change it to render above the field
if ( ( tagBoxY + tagBoxHeight ) > windowHeight ) {
tagBoxY = posY - tagBoxHeight;
}
tagBoxY = posY - tagBoxHeight;
}
if ( 0 > tagBoxY ) {
tagBoxY = posY;
}
jQuery( '#merge-tags-box' ).css( 'top', tagBoxY );
......@@ -437,6 +441,10 @@ define( [
tagBoxY = posY - tagBoxHeight;
}
if ( 0 > tagBoxY ) {
tagBoxY = posY;
}
jQuery( '#merge-tags-box' ).css( 'top', tagBoxY );
var repeaterRow = $this.closest( '.nf-list-options-tbody' );
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment