Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
ef0f708
Allow to select multiple files at once from remote providers
sadovnychyi Nov 11, 2017
e976d1f
Fix for styleguide
sadovnychyi Nov 11, 2017
cca123b
Allow to select multiple files using shift and click
sadovnychyi Nov 11, 2017
5e8d5cf
Do not display NaN for folder sizes
sadovnychyi Nov 12, 2017
0f12dc8
Add isFolder property for each file
sadovnychyi Nov 12, 2017
37bbaa2
Merge branch 'master' into multiselect
sadovnychyi Nov 16, 2017
258343c
Merge branch 'master' of https://github.com/transloadit/uppy into mul…
sadovnychyi Nov 16, 2017
70471d4
Merge branch 'multiselect' of github.com:sadovnychyi/uppy into multis…
sadovnychyi Nov 16, 2017
2718837
Use lodash.isFinite instead of isNaN for IE support
sadovnychyi Nov 16, 2017
e8971eb
Add/remove folder contents on checkbox change
sadovnychyi Nov 16, 2017
5f17d0d
Remove isFolder property from files
sadovnychyi Nov 16, 2017
f1dd42c
No need to check for isFinite since folders are no longer displayed
sadovnychyi Nov 16, 2017
f046d3d
Handle errors when adding a folder
sadovnychyi Nov 17, 2017
35b1624
Add info message with number of files added from folder
sadovnychyi Nov 17, 2017
47b0434
fileToId -> providerFileToId
sadovnychyi Nov 17, 2017
998178d
Remove isCheckbox core property; Manually call hideAllPanels instead
sadovnychyi Nov 17, 2017
0bde308
Remove unused argument
sadovnychyi Nov 17, 2017
5c94437
Update folder state when file is removed from main screen
sadovnychyi Nov 17, 2017
4884428
Fix wrong i18n assignment in dashboard
sadovnychyi Nov 17, 2017
912b6b8
Add i18n for folder message
sadovnychyi Nov 17, 2017
e6eec30
Add another message for empty folders
sadovnychyi Nov 17, 2017
1f1f064
Merge branch 'master' into multiselect
sadovnychyi Nov 22, 2017
46b53f5
Fix nanoraf
sadovnychyi Nov 22, 2017
0e7505d
Add tearDown method for provider view
sadovnychyi Nov 22, 2017
ffbcfdc
Add some docs for new methods
sadovnychyi Nov 23, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add another message for empty folders
  • Loading branch information
sadovnychyi committed Nov 17, 2017
commit e6eec307839eb95066b3437a2c1948d6319dccbe
12 changes: 9 additions & 3 deletions src/generic-provider-views/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -352,9 +352,15 @@ module.exports = class View {
state.selectedFolders[folderId] = {loading: false, files: files}
this.updateState({selectedFolders: folders})
const dashboard = this.plugin.core.getPlugin('Dashboard')
this.plugin.core.info(dashboard.i18n('folderAdded', {
smart_count: files.length, folder: this.plugin.getItemName(folder)
}))
let message
if (files.length) {
message = dashboard.i18n('folderAdded', {
smart_count: files.length, folder: this.plugin.getItemName(folder)
})
} else {
message = dashboard.i18n('emptyFolderAdded')
}
this.plugin.core.info(message)
}).catch((e) => {
state = this.plugin.core.getState()[this.plugin.stateId]
delete state.selectedFolders[folderId]
Expand Down
1 change: 1 addition & 0 deletions src/plugins/Dashboard/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ module.exports = class DashboardUI extends Plugin {
fileProgress: 'File progress: upload speed and ETA',
numberOfSelectedFiles: 'Number of selected files',
uploadAllNewFiles: 'Upload all new files',
emptyFolderAdded: 'No files were added from empty folder',
folderAdded: {
0: 'Added %{smart_count} file from %{folder}',
1: 'Added %{smart_count} files from %{folder}'
Expand Down