Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #290 #291

Merged
merged 1 commit into from
Apr 26, 2019
Merged

Fix #290 #291

merged 1 commit into from
Apr 26, 2019

Conversation

JiuqingSong
Copy link
Collaborator

#290 applyInlineStyle() needs to clean any conflict styles from b/i/u/... tags

When apply style to HTML which contains some inner node with style, e.g.

<span>aa<b style="color:red">bb</b>cc</span>

The existing code will always apply style to the outer SPAN tag (or create a SPAN tag if SPAN can't be found). So the style on inner node will override the style will apply.

The fix there is to call the callback styler function with an additional parameter (isInnerNode) for the inner nodes, and caller code can check this parameter and do proper handling.

Lego6245
Lego6245 approved these changes Apr 25, 2019
View reviewed changes
Copy link
Contributor

@Lego6245 Lego6245 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not 100% satisifed with the type contract here, but I suppose it makes sense. Feels weird to have to special case handle innerNodes.

@JiuqingSong JiuqingSong merged commit cc8e3c1 into master Apr 26, 2019
@JiuqingSong JiuqingSong deleted the jisong/290 branch April 26, 2019 19:20
JiuqingSong added a commit that referenced this pull request Apr 29, 2019
@JiuqingSong
7.3.2-darkmode.0 (#296)
1b842e8 
* 7.1.1

* 7.1.2 Fix #218 (#219)

* 7.1.2 Fix #218

* Fix typo

* Track content changed events and report up to PickerPluginDataProvider (#222)

* Refactor ReplaceWithNode to use the editor core API (#223)

* Address comments raised in #225 but not addressed (#227)

* Fix a js error in insertNode (#229)

* 7.2.0 (#230)

* Fix 4 issues (#234)

* Fix #74 (#236)

* Fix #74

* Fix #74

* address comments

* Replace deprecated TSLint extension with MSFT TSLint (#240)

* 7.2.1 (#243)

* stopPropagation for key inputs (#245)

* Make picker plugin generic (#246)

* Make PickerPlugin generic

* fix build

* Selection Management step 1 (#247)

* Selection management step 1: New core API selectRange

* Fix build

* fix comment

* Fix keyboard event issue (#251)

* Improve hyperlink onLinkClick option (#255)

Allow Hyperlink onLinkClick to fall back to default handling to reduce redundant code.

* Bump version (#256)

* fix autolink bug (#263)

* Filter CTRL+Click for Hyperlink plugin to main button (#262)

* 7.2.5 (#265)

* Fix some perf issue and some other changes (#272)

* 45000

* 7.2.6

* init commit

* syntax error

* remove Input event so doesn't re-autocomplete

* StopPropagation for Input event (#276)

* Re-implemented the processList API. (#275)

* revert unneded changes and add check for char val

* ready for pr

* forgot 0 case again

* export from root

* undefined --> null, removes attribute instead of set as undefined

* Fix #279 (#281)

* take out unwanted change

* try that again

* 7.3.0 (#282)

* Add dark mode publish variant (#284)

* Fix #286 (#287)

* init commit

* add charcodes

* Fix #290 (#291)

* 7.3.1 (#294)

* 7.3.1-darkmode.0

* Fix an issue when call onKeyUp handler in PickerPlugin (#297)

* Check isSuggesting for function key in PickerPlugin

* 7.3.2

* Fix emoji reappear issue when space after backspace
JiuqingSong added a commit that referenced this pull request Jun 10, 2019
@JiuqingSong
Integrate latest code to dark mode branch (#309)
c8e2f5f 
* 7.1.1

* 7.1.2 Fix #218 (#219)

* 7.1.2 Fix #218

* Fix typo

* Track content changed events and report up to PickerPluginDataProvider (#222)

* Refactor ReplaceWithNode to use the editor core API (#223)

* Address comments raised in #225 but not addressed (#227)

* Fix a js error in insertNode (#229)

* 7.2.0 (#230)

* Fix 4 issues (#234)

* Fix #74 (#236)

* Fix #74

* Fix #74

* address comments

* Replace deprecated TSLint extension with MSFT TSLint (#240)

* 7.2.1 (#243)

* stopPropagation for key inputs (#245)

* Make picker plugin generic (#246)

* Make PickerPlugin generic

* fix build

* Selection Management step 1 (#247)

* Selection management step 1: New core API selectRange

* Fix build

* fix comment

* Fix keyboard event issue (#251)

* Improve hyperlink onLinkClick option (#255)

Allow Hyperlink onLinkClick to fall back to default handling to reduce redundant code.

* Bump version (#256)

* fix autolink bug (#263)

* Filter CTRL+Click for Hyperlink plugin to main button (#262)

* 7.2.5 (#265)

* Fix some perf issue and some other changes (#272)

* 45000

* 7.2.6

* init commit

* syntax error

* remove Input event so doesn't re-autocomplete

* StopPropagation for Input event (#276)

* Re-implemented the processList API. (#275)

* revert unneded changes and add check for char val

* ready for pr

* forgot 0 case again

* export from root

* undefined --> null, removes attribute instead of set as undefined

* Fix #279 (#281)

* take out unwanted change

* try that again

* 7.3.0 (#282)

* Add dark mode publish variant (#284)

* Fix #286 (#287)

* init commit

* add charcodes

* Fix #290 (#291)

* 7.3.1 (#294)

* Fix an issue when call onKeyUp handler in PickerPlugin (#297)

* Check isSuggesting for function key in PickerPlugin

* 7.3.2

* Fix emoji reappear issue when space after backspace

* Export code to codepen from demo site (#289)

* init commit

* move order one down

* mouseUp before

* Add more comments to improve doc (#302)

* Improve doc

* Add more comments

* Fix cursor stuck at list issue (#303)

* Fix cursor stuck at list issue

* fix build

* Add getTextContent

* address comments for getTextContent

* Address comment

* change some element to use the class param

* remove comments

* 7.4.0 (#308)
JiuqingSong added a commit that referenced this pull request Jun 11, 2019
@JiuqingSong
7.4.1-darkmode.0 (#311)
944d19b 
* 7.1.1

* 7.1.2 Fix #218 (#219)

* 7.1.2 Fix #218

* Fix typo

* Track content changed events and report up to PickerPluginDataProvider (#222)

* Refactor ReplaceWithNode to use the editor core API (#223)

* Address comments raised in #225 but not addressed (#227)

* Fix a js error in insertNode (#229)

* 7.2.0 (#230)

* Fix 4 issues (#234)

* Fix #74 (#236)

* Fix #74

* Fix #74

* address comments

* Replace deprecated TSLint extension with MSFT TSLint (#240)

* 7.2.1 (#243)

* stopPropagation for key inputs (#245)

* Make picker plugin generic (#246)

* Make PickerPlugin generic

* fix build

* Selection Management step 1 (#247)

* Selection management step 1: New core API selectRange

* Fix build

* fix comment

* Fix keyboard event issue (#251)

* Improve hyperlink onLinkClick option (#255)

Allow Hyperlink onLinkClick to fall back to default handling to reduce redundant code.

* Bump version (#256)

* fix autolink bug (#263)

* Filter CTRL+Click for Hyperlink plugin to main button (#262)

* 7.2.5 (#265)

* Fix some perf issue and some other changes (#272)

* 45000

* 7.2.6

* init commit

* syntax error

* remove Input event so doesn't re-autocomplete

* StopPropagation for Input event (#276)

* Re-implemented the processList API. (#275)

* revert unneded changes and add check for char val

* ready for pr

* forgot 0 case again

* export from root

* undefined --> null, removes attribute instead of set as undefined

* Fix #279 (#281)

* take out unwanted change

* try that again

* 7.3.0 (#282)

* Add dark mode publish variant (#284)

* Fix #286 (#287)

* init commit

* add charcodes

* Fix #290 (#291)

* 7.3.1 (#294)

* Fix an issue when call onKeyUp handler in PickerPlugin (#297)

* Check isSuggesting for function key in PickerPlugin

* 7.3.2

* Fix emoji reappear issue when space after backspace

* Export code to codepen from demo site (#289)

* init commit

* move order one down

* mouseUp before

* Add more comments to improve doc (#302)

* Improve doc

* Add more comments

* Fix cursor stuck at list issue (#303)

* Fix cursor stuck at list issue

* fix build

* Add getTextContent

* address comments for getTextContent

* Address comment

* change some element to use the class param

* remove comments

* 7.4.0 (#308)

* Revert #298 since it breaks IE (#310)

* revert #298

* 7.4.1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@titrongt titrongt titrongt approved these changes

@Lego6245 Lego6245 Lego6245 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@JiuqingSong @Lego6245 @titrongt