Korbs/Squire
0
Fork 0
mirror of https://github.com/fastmail/Squire.git synced 2024-12-22 07:13:08 -05:00
Code Issues Activity

Calling functions from modifyBlocks and forEachBlock with arguments

Browse source
This commit is contained in:
dryoma 2015-05-13 17:46:38 +08:00
parent bdc8b0c576
commit cd3526e223
3 changed files with 36 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
build/squire-raw.js
View file

@ -2448,7 +2448,13 @@ var splitBlock = function ( self, block, node, offset ) {
return nodeAfterSplit;
};
proto.forEachBlock = function ( fn, mutates, range ) {
proto.forEachBlock = function ( fn, mutates, args, range ) {
if ( !range && args &&
args.collapse && typeof( args.collapse ) === 'function' ) {
range = args;
args = null;
}
if ( !range && !( range = this.getSelection() ) ) {
return this;
}
@ -2463,7 +2469,7 @@ proto.forEachBlock = function ( fn, mutates, range ) {
end = getEndBlockOfRange( range );
if ( start && end ) {
do {
if ( fn( start ) || start === end ) { break; }
if ( fn( start, args ) || start === end ) { break; }
} while ( start = getNextBlock( start ) );
}
@ -2481,10 +2487,16 @@ proto.forEachBlock = function ( fn, mutates, range ) {
return this;
};
proto.modifyBlocks = function ( modify, range ) {
proto.modifyBlocks = function ( modify, args, range ) {
if ( !range && args &&
args.collapse && typeof( args.collapse ) === 'function' ) {
range = args;
args = null;
}
if ( !range && !( range = this.getSelection() ) ) {
return this;
}
}
// 1. Save undo checkpoint and bookmark selection
if ( this._isInUndoState ) {
@ -2503,7 +2515,7 @@ proto.modifyBlocks = function ( modify, range ) {
frag = extractContentsOfRange( range, body );
// 4. Modify tree of fragment and reinsert.
insertNodeInRange( range, modify.call( this, frag ) );
insertNodeInRange( range, modify.call( this, frag, args ) );
// 5. Merge containers at edges
if ( range.endOffset < range.endContainer.childNodes.length ) {

4
build/squire.js
View file

File diff suppressed because one or more lines are too long

22
source/Editor.js
View file

@ -972,7 +972,13 @@ var splitBlock = function ( self, block, node, offset ) {
return nodeAfterSplit;
};
proto.forEachBlock = function ( fn, mutates, range ) {
proto.forEachBlock = function ( fn, mutates, args, range ) {
if ( !range && args &&
args.collapse && typeof( args.collapse ) === 'function' ) {
range = args;
args = null;
}
if ( !range && !( range = this.getSelection() ) ) {
return this;
}
@ -987,7 +993,7 @@ proto.forEachBlock = function ( fn, mutates, range ) {
end = getEndBlockOfRange( range );
if ( start && end ) {
do {
if ( fn( start ) || start === end ) { break; }
if ( fn( start, args ) || start === end ) { break; }
} while ( start = getNextBlock( start ) );
}
@ -1005,10 +1011,16 @@ proto.forEachBlock = function ( fn, mutates, range ) {
return this;
};
proto.modifyBlocks = function ( modify, range ) {
proto.modifyBlocks = function ( modify, args, range ) {
if ( !range && args &&
args.collapse && typeof( args.collapse ) === 'function' ) {
range = args;
args = null;
}
if ( !range && !( range = this.getSelection() ) ) {
return this;
}
}
// 1. Save undo checkpoint and bookmark selection
if ( this._isInUndoState ) {
@ -1027,7 +1039,7 @@ proto.modifyBlocks = function ( modify, range ) {
frag = extractContentsOfRange( range, body );
// 4. Modify tree of fragment and reinsert.
insertNodeInRange( range, modify.call( this, frag ) );
insertNodeInRange( range, modify.call( this, frag, args ) );
// 5. Merge containers at edges
if ( range.endOffset < range.endContainer.childNodes.length ) {