jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/341525 )
Change subject: Sync text exitor scroll including change titles height
......................................................................
Sync text exitor scroll including change titles height
Bug: T159819
Change-Id: Iae1f723b8863945ecabacb420a102166a6136ef4
---
M modules/ext.TwoColConflict.AutoScroll.js
1 file changed, 10 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Andrew-WMDE: Looks good to me, approved
diff --git a/modules/ext.TwoColConflict.AutoScroll.js
b/modules/ext.TwoColConflict.AutoScroll.js
index 975cade..5c39f7c 100644
--- a/modules/ext.TwoColConflict.AutoScroll.js
+++ b/modules/ext.TwoColConflict.AutoScroll.js
@@ -19,6 +19,15 @@
},
/**
+ * Get the height of the change div titles
+ *
+ * @return {number}
+ */
+ getChangeDivTitleHeight: function() {
+ return parseInt( $(
'.mw-twocolconflict-diffchange-title:first' ).outerHeight( true ) );
+ },
+
+ /**
* Synchronize width and height of the hidden textbox with the
* actual textbox
*/
@@ -149,7 +158,7 @@
} );
$textEditor.animate( {
- scrollTop: dataOffset,
+ scrollTop: dataOffset -
this.getChangeDivTitleHeight(),
duration: 1000
} );
},
--
To view, visit https://gerrit.wikimedia.org/r/341525
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iae1f723b8863945ecabacb420a102166a6136ef4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Andrew-WMDE <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
