Korbs/Squire
0
Fork 0
mirror of https://github.com/fastmail/Squire.git synced 2025-01-03 05:00:13 -05:00
Code Issues Activity

Add 'H2' as editable element.

Browse source 
This will almost certainly require further modifications down the road, but let's start here.
This commit is contained in:
Chris Laidlaw 2015-04-27 17:05:56 -07:00
parent 3676651e6f
commit 75e87a94eb
5 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,2 +1,3 @@
node_modules node_modules
bower_components bower_components
.DS_Store

7
build/squire-raw.js
View file

@ -133,6 +133,8 @@ TreeWalker.prototype.previousNode = function () {
var inlineNodeNames = /^(?:#text|A(?:BBR|CRONYM)?|B(?:R|D[IO])?|C(?:ITE|ODE)|D(?:ATA|FN|EL)|EM|FONT|HR|I(?:NPUT|MG|NS)?|KBD|Q|R(?:P|T|UBY)|S(?:U[BP]|PAN|TR(?:IKE|ONG)|MALL|AMP)?|U|VAR|WBR)$/; var inlineNodeNames = /^(?:#text|A(?:BBR|CRONYM)?|B(?:R|D[IO])?|C(?:ITE|ODE)|D(?:ATA|FN|EL)|EM|FONT|HR|I(?:NPUT|MG|NS)?|KBD|Q|R(?:P|T|UBY)|S(?:U[BP]|PAN|TR(?:IKE|ONG)|MALL|AMP)?|U|VAR|WBR)$/;
var editableBlockNodeNames = /^H2$/;
var leafNodeNames = { var leafNodeNames = {
BR: 1, BR: 1,
IMG: 1, IMG: 1,
@ -179,6 +181,9 @@ function isLeaf ( node ) {
function isInline ( node ) { function isInline ( node ) {
return inlineNodeNames.test( node.nodeName ); return inlineNodeNames.test( node.nodeName );
} }
function isEditableBlock( node ) {
return editableBlockNodeNames.test( node.nodeName );
}
function isBlock ( node ) { function isBlock ( node ) {
return node.nodeType === ELEMENT_NODE && return node.nodeType === ELEMENT_NODE &&
!isInline( node ) && every( node.childNodes, isInline ); !isInline( node ) && every( node.childNodes, isInline );
@ -1829,7 +1834,7 @@ proto._removeFormat = function ( tag, attributes, range, partial ) {
// Find block-level ancestor of selection // Find block-level ancestor of selection
var root = range.commonAncestorContainer; var root = range.commonAncestorContainer;
while ( isInline( root ) ) { while ( isInline( root ) || isEditableBlock( root ) ) {
root = root.parentNode; root = root.parentNode;
} }

5
build/squire.js
View file

File diff suppressed because one or more lines are too long

2
source/Editor.js
View file

@ -773,7 +773,7 @@ proto._removeFormat = function ( tag, attributes, range, partial ) {
// Find block-level ancestor of selection // Find block-level ancestor of selection
var root = range.commonAncestorContainer; var root = range.commonAncestorContainer;
while ( isInline( root ) ) { while ( isInline( root ) || isEditableBlock( root ) ) {
root = root.parentNode; root = root.parentNode;
} }

5
source/Node.js
View file

@ -2,6 +2,8 @@
var inlineNodeNames = /^(?:#text|A(?:BBR|CRONYM)?|B(?:R|D[IO])?|C(?:ITE|ODE)|D(?:ATA|FN|EL)|EM|FONT|HR|I(?:NPUT|MG|NS)?|KBD|Q|R(?:P|T|UBY)|S(?:U[BP]|PAN|TR(?:IKE|ONG)|MALL|AMP)?|U|VAR|WBR)$/; var inlineNodeNames = /^(?:#text|A(?:BBR|CRONYM)?|B(?:R|D[IO])?|C(?:ITE|ODE)|D(?:ATA|FN|EL)|EM|FONT|HR|I(?:NPUT|MG|NS)?|KBD|Q|R(?:P|T|UBY)|S(?:U[BP]|PAN|TR(?:IKE|ONG)|MALL|AMP)?|U|VAR|WBR)$/;
var editableBlockNodeNames = /^H2$/;
var leafNodeNames = { var leafNodeNames = {
BR: 1, BR: 1,
IMG: 1, IMG: 1,
@ -48,6 +50,9 @@ function isLeaf ( node ) {
function isInline ( node ) { function isInline ( node ) {
return inlineNodeNames.test( node.nodeName ); return inlineNodeNames.test( node.nodeName );
} }
function isEditableBlock( node ) {
return editableBlockNodeNames.test( node.nodeName );
}
function isBlock ( node ) { function isBlock ( node ) {
return node.nodeType === ELEMENT_NODE && return node.nodeType === ELEMENT_NODE &&
!isInline( node ) && every( node.childNodes, isInline ); !isInline( node ) && every( node.childNodes, isInline );