jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/337037 )
Change subject: Scroll to first own or conlifct
......................................................................
Scroll to first own or conlifct
Instead of auto-scrolling to the first own addiion
better scroll to first own addition or conflict.
Otherwise when the first own addition is part of
a conflict the changes view scrolls a bit to far.
Change-Id: Ie5255fdf1f44e61278d8bed16968611e0c077d0e
---
M modules/ext.TwoColConflict.AutoScroll.js
M modules/ext.TwoColConflict.init.js
2 files changed, 5 insertions(+), 3 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.TwoColConflict.AutoScroll.js
b/modules/ext.TwoColConflict.AutoScroll.js
index 58e525d..975cade 100644
--- a/modules/ext.TwoColConflict.AutoScroll.js
+++ b/modules/ext.TwoColConflict.AutoScroll.js
@@ -157,9 +157,11 @@
/**
* Scroll to the first conflict
*/
- scrollToFirstOwnAddition: function() {
+ scrollToFirstOwnOrConflict: function() {
this.scrollToConflictWithData(
- $( '.mw-twocolconflict-diffchange-own:eq(0)' )
+ $( $(
+
'.mw-twocolconflict-diffchange-conflict, .mw-twocolconflict-diffchange-own'
+ )[ 0 ] )
);
}
} );
diff --git a/modules/ext.TwoColConflict.init.js
b/modules/ext.TwoColConflict.init.js
index a5cd8ed..66da069 100644
--- a/modules/ext.TwoColConflict.init.js
+++ b/modules/ext.TwoColConflict.init.js
@@ -26,7 +26,7 @@
} );
autoScroll.setScrollBaseData();
- autoScroll.scrollToFirstOwnAddition();
+ autoScroll.scrollToFirstOwnOrConflict();
$( window ).on( 'resize', function() {
autoScroll.setScrollBaseData();
--
To view, visit https://gerrit.wikimedia.org/r/337037
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5255fdf1f44e61278d8bed16968611e0c077d0e
Gerrit-PatchSet: 2
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
