Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nextcloud-libraries/nextcloud-dialogs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v4.2.0
Choose a base ref
...
head repository: nextcloud-libraries/nextcloud-dialogs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v4.2.1
Choose a head ref
  • 6 commits
  • 5 files changed
  • 2 contributors

Commits on Sep 14, 2023

  1. fix: Do not log console errors if buttons is an empty array

    Signed-off-by: Julius Härtl <jus@bitgrid.net>
    juliusknorr committed Sep 14, 2023

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    susnux Ferdinand Thiessen
    Copy the full SHA
    8d547d8 View commit details
  2. Merge pull request #1000 from nextcloud-libraries/bugfix/noid/error-o…

    …n-choose
    
    [stable4] Avoid error when not using any custom buttons
    susnux authored Sep 14, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    424c21e View commit details

Commits on Sep 20, 2023

  1. fix(FilePicker): Legacy filepicker is broken because the default type…

    … was unset
    
    Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
    susnux committed Sep 20, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    c099c9c View commit details
  2. Merge pull request #1007 from nextcloud-libraries/fix/missing-default…

    …-type
    
    [stable24] Bring back the default value for legacy file picker
    susnux authored Sep 20, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    9d36c42 View commit details
  3. chore: Prepare 4.2.1 release

    Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
    susnux committed Sep 20, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    bd48f0f View commit details

Commits on Sep 21, 2023

  1. Merge pull request #1008 from nextcloud-libraries/prepare/release

    chore: Prepare 4.2.1 release
    susnux authored Sep 21, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    c23dbc5 View commit details
Showing with 13 additions and 5 deletions.
  1. +8 −0 CHANGELOG.md
  2. +1 −1 lib/filepicker.ts
  3. +1 −1 lib/legacy.ts
  4. +2 −2 package-lock.json
  5. +1 −1 package.json
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,6 +2,14 @@

All notable changes to this project will be documented in this file.

## [v4.2.1]()

[Full Changelog](https://github.com/nextcloud-libraries/nextcloud-dialogs/compare/v4.2.0...v4.2.1)

### :bug: Fixed bugs
* \[stable4\] Avoid error when not using any custom buttons by ([juliushaertl](https://github.com/juliushaertl)) in [\#1000](https://github.com/nextcloud-libraries/nextcloud-dialogs/pull/1000)
* \[stable4\] Bring back the default value for legacy file picker by ([susnux](https://github.com/susnux)) in [\#1007](https://github.com/nextcloud-libraries/nextcloud-dialogs/pull/1007)

## [v4.2.0](https://github.com/nextcloud-libraries/nextcloud-dialogs/tree/v4.2.0) (2023-09-13)

[Full Changelog](https://github.com/nextcloud-libraries/nextcloud-dialogs/compare/v4.2.0-beta.5...v4.2.0)
2 changes: 1 addition & 1 deletion lib/filepicker.ts
Original file line number Diff line number Diff line change
@@ -143,7 +143,7 @@ export class FilePickerBuilder {
}

public build(): FilePicker {
if (this.buttons && this.type !== FilePickerType.Custom) {
if (this.buttons?.length > 0 && this.type !== FilePickerType.Custom) {
console.error('FilePickerBuilder: When adding custom buttons the `type` must be set to `FilePickerType.Custom`.')
}

2 changes: 1 addition & 1 deletion lib/legacy.ts
Original file line number Diff line number Diff line change
@@ -89,7 +89,7 @@ const spawnDialog = (dialog: Component | AsyncComponent, props: any, onClose: ()
* @param {Object} [options] additonal options that need to be set
* @param {Function} [options.filter] filter function for advanced filtering
*/
export async function filepicker(title: string, callback: (s: string | string[], type: FilePickerType) => void, multiselect = false, mimetype?: string | string[], _modal?: boolean, type?: FilePickerType, path?: string, options?: any) {
export async function filepicker(title: string, callback: (s: string | string[], type: FilePickerType) => void, multiselect = false, mimetype?: string | string[], _modal?: boolean, type: FilePickerType = FilePickerType.Choose, path?: string, options?: any) {

/**
* Create legacy callback wrapper to support old filepicker syntax
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nextcloud/dialogs",
"version": "4.2.0",
"version": "4.2.1",
"description": "Nextcloud dialog helpers",
"types": "dist/index.d.ts",
"main": "dist/index.cjs",