Skip to content
GitLab
Commit bae18a55 authored by Francois Marier's avatar Francois Marier Committed by Gerrit Code Review
Browse files

Merge "Fix file block config edit, select, upload buttons in Chrome (bug #819102)"

parents 29fbcca3 56ace97c
Hide whitespace changes
Inline Side-by-side
htdocs/artefact/file/js/filebrowser.js
View file @ bae18a55
...@@ -60,7 +60,10 @@ function FileBrowser(idprefix, folderid, config, globalconfig) { ...@@ -60,7 +60,10 @@ function FileBrowser(idprefix, folderid, config, globalconfig) {
this.upload_init = function () { this.upload_init = function () {
if ($(self.id + '_notice')) { if ($(self.id + '_notice')) {
setNodeAttribute(self.id + '_userfile', 'disabled', true); // If the file input is disabled immediately without this delay, later javascript changes
// to the filebrowser are not rendered by Chrome when the filebrowser is inside a block
// configuration form.
callLater(0.0001, function() { setNodeAttribute(self.id + '_userfile', 'disabled', true); });
} }
if (!$(self.id + '_upload')) { if (!$(self.id + '_upload')) {
insertSiblingNodesAfter(self.id + '_uploadnumber', INPUT({ insertSiblingNodesAfter(self.id + '_uploadnumber', INPUT({
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment