Skip to content

Commit f486358

Browse files
committed
Restore copy button text on directory fetch error
Signed-off-by: Louis Chemineau <louis@chmn.me>
1 parent c8a7c95 commit f486358

File tree

5 files changed

+13
-12
lines changed

5 files changed

+13
-12
lines changed

core/src/OC/dialogs.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ const Dialogs = {
427427
if (checkInput()) {
428428
var newname = $input.val()
429429
self.filepicker.filesClient.createDirectory(self.$filePicker.data('path') + "/" + newname).always(function (status) {
430-
self._fillFilePicker(self.$filePicker.data('path') + "/" + newname)
430+
self._fillFilePicker(self.$filePicker.data('path') + "/" + newname, type)
431431
})
432432
OC.hideMenus()
433433
self.$filePicker.ocdialog('unsetEnterCallback')
@@ -459,10 +459,10 @@ const Dialogs = {
459459
var dir = self.$filePicker.data('path')
460460
self.filepicker.sortField = $(event.currentTarget).data('sort')
461461
self.filepicker.sortOrder = self.filepicker.sortOrder === 'asc' ? 'desc' : 'asc'
462-
self._fillFilePicker(dir)
462+
self._fillFilePicker(dir, type)
463463
}
464464
})
465-
self._fillFilePicker(path)
465+
self._fillFilePicker(path, type)
466466
})
467467

468468
// build buttons
@@ -1133,7 +1133,7 @@ const Dialogs = {
11331133
/**
11341134
* fills the filepicker with files
11351135
*/
1136-
_fillFilePicker: async function(dir) {
1136+
_fillFilePicker: async function(dir, type) {
11371137
var self = this
11381138
this.$filelist.empty()
11391139
this.$filePicker.find('.emptycontent').hide()
@@ -1168,6 +1168,7 @@ const Dialogs = {
11681168
console.error('Requested path does not exists, falling back to root')
11691169
var files = await getFolderContents('/')
11701170
this.$filePicker.data('path', '/')
1171+
this._changeButtonsText(type, '')
11711172
}
11721173

11731174
self.filelist = files
@@ -1333,7 +1334,7 @@ const Dialogs = {
13331334
_handleTreeListSelect: function(event, type) {
13341335
var self = event.data
13351336
var dir = $(event.target).closest('.crumb').data('dir')
1336-
self._fillFilePicker(dir)
1337+
self._fillFilePicker(dir, type)
13371338
var getOcDialog = (event.target).closest('.oc-dialog')
13381339
var buttonEnableDisable = $('.primary', getOcDialog)
13391340
this._changeButtonsText(type, dir.split(/[/]+/).pop())
@@ -1356,7 +1357,7 @@ const Dialogs = {
13561357
$element.toggleClass('filepicker_element_selected')
13571358
buttonEnableDisable.prop('disabled', false)
13581359
} else if ($element.data('type') === 'dir') {
1359-
this._fillFilePicker(this.$filePicker.data('path') + '/' + $element.data('entryname'))
1360+
this._fillFilePicker(this.$filePicker.data('path') + '/' + $element.data('entryname'), type)
13601361
this._changeButtonsText(type, $element.data('entryname'))
13611362
if (this.$filePicker.data('mimetype').indexOf('httpd/unix-directory') !== -1 || this.$filePicker.data('allowDirectoryChooser')) {
13621363
buttonEnableDisable.prop('disabled', false)

dist/core-login.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/core-login.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/core-main.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/core-main.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)