wikimedia/mediawiki-extensions-DiscussionTools
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/DiscussionTools synced 2024-11-24 00:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use new heading markers for getting heading ranges/text

Browse source 
This will need to be deployed a few days after I782caafc3
to avoid issues with cached HTML.

Change-Id: I4b00d0b0efed9d91c0bc28914bbdf0955bb552b6
This commit is contained in:
Ed Sanders 2020-10-27 12:18:50 +00:00 committed by Bartosz Dziewoński
parent 24c224a3e7
commit 7abd4621ae
3 changed files with 13 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/ThreadItem.js
View file

@ -47,17 +47,17 @@ OO.initClass( ThreadItem );
*
* @param {string|Object} json JSON serialization or hash object
* @param {Object} commentsById Collection of comments by ID for building replies/parent pointers
* @param {Node} placeholderNode Placeholder node in the DOM which contained this JSON
* @return {ThreadItem}
* @throws {Error} Unknown ThreadItem type
*/
ThreadItem.static.newFromJSON = function ( json, commentsById, placeholderNode ) {
ThreadItem.static.newFromJSON = function ( json, commentsById ) {
// The page can be served from the HTTP cache (Varnish), and the JSON may be generated
// by an older version of our PHP code. Code below must be able to handle that.
// See ThreadItem::jsonSerialize() in PHP.
var CommentItem, HeadingItem, item, idEscaped,
hash = typeof json === 'string' ? JSON.parse( json ) : json;
switch ( hash.type ) {
case 'comment':
// Late require to avoid circular dependency
@ -81,10 +81,8 @@ ThreadItem.static.newFromJSON = function ( json, commentsById, placeholderNode )
default:
throw new Error( 'Unknown ThreadItem type ' + hash.name );
}
item.id = hash.id;
if ( hash.type === 'comment' ) {
idEscaped = $.escapeSelector( item.id );
item.range = {
startContainer: document.querySelector( '[data-mw-comment-start="' + idEscaped + '"]' ),
@ -92,14 +90,6 @@ ThreadItem.static.newFromJSON = function ( json, commentsById, placeholderNode )
endContainer: document.querySelector( '[data-mw-comment-end="' + idEscaped + '"]' ),
endOffset: 0
};
} else {
item.range = {
startContainer: placeholderNode,
startOffset: 0,
endContainer: placeholderNode,
endOffset: 0
};
}
// Setup replies/parent pointers
item.replies = hash.replies.map( function ( id ) {

2
modules/controller.js
View file

@ -226,7 +226,7 @@ function init( $container, state ) {
// Iterate over commentNodes backwards so replies are always deserialized before their parents.
for ( i = commentNodes.length - 1; i >= 0; i-- ) {
hash = JSON.parse( commentNodes[ i ].getAttribute( 'data-mw-comment' ) );
comment = ThreadItem.static.newFromJSON( hash, threadItemsById, commentNodes[ i ] );
comment = ThreadItem.static.newFromJSON( hash, threadItemsById );
threadItemsById[ comment.id ] = comment;
if ( comment.type === 'comment' ) {

10
modules/dt.ui.ReplyWidget.js
View file

@ -1,8 +1,7 @@
var controller = require( 'ext.discussionTools.init' ).controller,
modifier = require( 'ext.discussionTools.init' ).modifier,
utils = require( 'ext.discussionTools.init' ).utils,
logger = require( 'ext.discussionTools.init' ).logger,
Parser = require( 'ext.discussionTools.init' ).Parser;
logger = require( 'ext.discussionTools.init' ).logger;
/**
* @external CommentController
@ -377,7 +376,7 @@ ReplyWidget.prototype.onModeTabSelectChoose = function ( option ) {
* @return {ReplyWidget}
*/
ReplyWidget.prototype.setup = function ( data ) {
var heading, headingNode, summary;
var heading, summary;
data = data || {};
@ -395,10 +394,7 @@ ReplyWidget.prototype.setup = function ( data ) {
// This comment is in 0th section, there's no section title for the edit summary
summary = '';
} else {
headingNode = ( new Parser() ).getHeadlineNodeAndOffset( heading.range.startContainer ).node;
// Remove mw-headline-number. T264561
$( headingNode ).find( '.mw-headline-number' ).remove();
summary = '/* ' + headingNode.innerText.trim() + ' */ ';
summary = '/* ' + heading.getNativeRange().toString().trim() + ' */ ';
}
summary += mw.msg( 'discussiontools-defaultsummary-reply' );
}