wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-15 18:39:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Place cursor at start of paragraph, not heading, when section-editing

Browse source 
Also checks for subheadings, i.e. we keep moving forward one sibling
as long as the next sibling is a heading of higher order than the
previous one. If the heading is of the same or lower order then we
assume there is an empty section, so we just stop.

Bug: 49563
Change-Id: I6fcc463aeeae40278f5caf04ae251c8ecfe65472
This commit is contained in:
Ed Sanders 2013-06-24 20:20:12 +01:00
parent 1889495aa2
commit 138b9365c2
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
View file

@ -1881,13 +1881,26 @@ ve.init.mw.ViewPageTarget.prototype.restoreEditSection = function () {
surfaceView = this.surface.getView(), surfaceView = this.surface.getView(),
surfaceModel = surfaceView.getModel(); surfaceModel = surfaceView.getModel();
this.$document.find( 'h1, h2, h3, h4, h5, h6' ).eq( this.section - 1 ).each( function () { this.$document.find( 'h1, h2, h3, h4, h5, h6' ).eq( this.section - 1 ).each( function () {
var headingNode = $( this ).data( 'view' ); var offsetNode, nextNode,
headingNode = $( this ).data( 'view' ),
lastHeadingLevel = -1;
if ( headingNode ) { if ( headingNode ) {
// Find next sibling which isn't a heading
offsetNode = headingNode;
while ( offsetNode instanceof ve.ce.HeadingNode && offsetNode.getModel().getAttribute( 'level' ) > lastHeadingLevel ) {
lastHeadingLevel = offsetNode.getModel().getAttribute( 'level' );
// Next sibling
nextNode = offsetNode.parent.children[ve.indexOf( offsetNode, offsetNode.parent.children ) + 1];
if ( !nextNode ) {
break;
}
offsetNode = nextNode;
}
offset = surfaceModel.getDocument().data.getNearestContentOffset( offset = surfaceModel.getDocument().data.getNearestContentOffset(
headingNode.getModel().getOffset() offsetNode.getModel().getOffset(), 1
); );
surfaceModel.change( null, new ve.Range( offset, offset ) ); surfaceModel.change( null, new ve.Range( offset ) );
// Scroll to heading: // Scroll to heading:
// Wait for toolbar to animate in so we can account for its height // Wait for toolbar to animate in so we can account for its height
setTimeout( function () { setTimeout( function () {