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

Added checks to prevent overwriting of detected font info.

Browse source
This commit is contained in:
Gert K. Sønderby 2015-08-31 10:11:06 +02:00
parent f6b79eb82b
commit b6af31e4b5
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/squire-raw.js
View file

@ -2851,10 +2851,10 @@ proto.getFontInfo = function ( range ) {
element = element.parentNode; element = element.parentNode;
} }
while ( !( fontInfo.family && fontInfo.size ) && element && element.nodeName !== 'BODY' ) { while ( !( fontInfo.family && fontInfo.size ) && element && element.nodeName !== 'BODY' ) {
if ( element.style.fontFamily ) { if ( element.style.fontFamily && !fontInfo.family ) {
fontInfo.family = element.style.fontFamily; fontInfo.family = element.style.fontFamily;
} }
if ( element.style.fontSize ) { if ( element.style.fontSize && !fontInfo.size ) {
fontInfo.size = element.style.fontSize; fontInfo.size = element.style.fontSize;
} }
element = element.parentNode; element = element.parentNode;

2
build/squire.js
View file

File diff suppressed because one or more lines are too long

4
source/Editor.js
View file

@ -726,10 +726,10 @@ proto.getFontInfo = function ( range ) {
element = element.parentNode; element = element.parentNode;
} }
while ( !( fontInfo.family && fontInfo.size ) && element && element.nodeName !== 'BODY' ) { while ( !( fontInfo.family && fontInfo.size ) && element && element.nodeName !== 'BODY' ) {
if ( element.style.fontFamily ) { if ( element.style.fontFamily && !fontInfo.family ) {
fontInfo.family = element.style.fontFamily; fontInfo.family = element.style.fontFamily;
} }
if ( element.style.fontSize ) { if ( element.style.fontSize && !fontInfo.size ) {
fontInfo.size = element.style.fontSize; fontInfo.size = element.style.fontSize;
} }
element = element.parentNode; element = element.parentNode;