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

Consistently don't use a space in CSS when setting colour.

Browse source 
Fixes #159.
This commit is contained in:
Neil Jenkins 2015-12-03 17:55:22 +11:00
parent 771fe93217
commit 0d1f1cf44b
4 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
build/squire-raw.js
View file

@ -1640,7 +1640,7 @@ var spanToSemantic = {
replace: function ( doc, colour ) { replace: function ( doc, colour ) {
return createElement( doc, 'SPAN', { return createElement( doc, 'SPAN', {
'class': 'highlight', 'class': 'highlight',
style: 'background-color: ' + colour style: 'background-color:' + colour
}); });
} }
}, },
@ -2557,6 +2557,7 @@ var removeZWS = function ( root ) {
parent = node.parentNode; parent = node.parentNode;
parent.removeChild( node ); parent.removeChild( node );
node = parent; node = parent;
walker.currentNode = parent;
} while ( isInline( node ) && !getLength( node ) ); } while ( isInline( node ) && !getLength( node ) );
break; break;
} else { } else {
@ -3785,7 +3786,7 @@ proto.setTextColour = function ( colour ) {
tag: 'SPAN', tag: 'SPAN',
attributes: { attributes: {
'class': 'colour', 'class': 'colour',
style: 'color: ' + colour style: 'color:' + colour
} }
}, { }, {
tag: 'SPAN', tag: 'SPAN',
@ -3799,7 +3800,7 @@ proto.setHighlightColour = function ( colour ) {
tag: 'SPAN', tag: 'SPAN',
attributes: { attributes: {
'class': 'highlight', 'class': 'highlight',
style: 'background-color: ' + colour style: 'background-color:' + colour
} }
}, { }, {
tag: 'SPAN', tag: 'SPAN',

4
build/squire.js
View file

File diff suppressed because one or more lines are too long

2
source/Clean.js
View file

@ -16,7 +16,7 @@ var spanToSemantic = {
replace: function ( doc, colour ) { replace: function ( doc, colour ) {
return createElement( doc, 'SPAN', { return createElement( doc, 'SPAN', {
'class': 'highlight', 'class': 'highlight',
style: 'background-color: ' + colour style: 'background-color:' + colour
}); });
} }
}, },

4
source/Editor.js
View file

@ -1654,7 +1654,7 @@ proto.setTextColour = function ( colour ) {
tag: 'SPAN', tag: 'SPAN',
attributes: { attributes: {
'class': 'colour', 'class': 'colour',
style: 'color: ' + colour style: 'color:' + colour
} }
}, { }, {
tag: 'SPAN', tag: 'SPAN',
@ -1668,7 +1668,7 @@ proto.setHighlightColour = function ( colour ) {
tag: 'SPAN', tag: 'SPAN',
attributes: { attributes: {
'class': 'highlight', 'class': 'highlight',
style: 'background-color: ' + colour style: 'background-color:' + colour
} }
}, { }, {
tag: 'SPAN', tag: 'SPAN',