Skip to content

Rename parameter in OCP.Toast for consistency with OC.Notification - #16369

Merged
MorrisJobke merged 1 commit into
masterfrom
rename-parameter-in-ocp-toast-for-consistency-with-oc-notification
Jul 15, 2019
Merged

Rename parameter in OCP.Toast for consistency with OC.Notification#16369
MorrisJobke merged 1 commit into
masterfrom
rename-parameter-in-ocp-toast-for-consistency-with-oc-notification

Conversation

@danxuliu

@danxuliudanxuliu commented Jul 12, 2019

Copy link
Copy Markdown
Member

Follow up to #15124
Fixes#16367

This fixes HTML messages in OC.Notification.showTemporary (as showHtml was not set based on isHTML), and also makes OCP.Toast to keep the old OC.Notification API when used directly.

@danxuliudanxuliu added bug 3. to review Waiting for reviews labels Jul 12, 2019
@danxuliudanxuliu added this to the Nextcloud 17 milestone Jul 12, 2019

@rullzerrullzer left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

sure

@MorrisJobke

Copy link
Copy Markdown
Member

JSUnit fails

@danxuliu

Copy link
Copy Markdown
MemberAuthor

JSUnit fails

It should be fixed now.

This fixes HTML messages in "OC.Notification.showTemporary" (as
"showHtml" was not set based on "isHTML"), and also makes OCP.Toast to
keep the old OC.Notification API when used directly.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
@MorrisJobke

Copy link
Copy Markdown
Member

Rebased and autosquashed.

@MorrisJobke
MorrisJobkeforce-pushed the rename-parameter-in-ocp-toast-for-consistency-with-oc-notification branch from 3a1cc62 to 916c957CompareJuly 12, 2019 14:15
@MorrisJobkeMorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jul 12, 2019
@MorrisJobke
MorrisJobke merged commit c048c56 into masterJul 15, 2019
@delete-merged-branch
delete-merged-branchBot deleted the rename-parameter-in-ocp-toast-for-consistency-with-oc-notification branch July 15, 2019 08:20
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finishbug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

OCP.Toast mismatch to old OC.Notifications options

4 participants

@danxuliu@MorrisJobke@rullzer@skjnldsv