Skip to content

Commit

Permalink
MDL-51921 files: Fixes for file manager issues
Browse files Browse the repository at this point in the history
Fixed the issue where the file path select box goes beyond the
container with very long folder names. Instead of setting to
"width: auto", I set it the select box's "width: 100%" so that it will
just fill up its container's width.
Fixed the issue where markups are being shown on file aliases.
  • Loading branch information
junpataleta committed Oct 28, 2015
1 parent d412f85 commit 9f555a7
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
6 changes: 5 additions & 1 deletion lib/form/filemanager.js
Expand Up @@ -960,8 +960,12 @@ M.form_filemanager.init = function(Y, options) {
for (var i in attrs) {
if (selectnode.one('.fp-'+attrs[i])) {
var value = (node[attrs[i]+'_f']) ? node[attrs[i]+'_f'] : (node[attrs[i]] ? node[attrs[i]] : '');
// Escape if the attribute being evaluated is not for the list of reference files.
if (attrs[i] !== 'reflist') {
value = Y.Escape.html(value);
}
selectnode.one('.fp-'+attrs[i]).addClassIf('fp-unknown', ''+value == '')
.one('.fp-value').setContent(Y.Escape.html(value));
.one('.fp-value').setContent(value);
}
}
// display thumbnail
Expand Down
3 changes: 3 additions & 0 deletions theme/bootstrapbase/less/moodle/filemanager.less
Expand Up @@ -1251,6 +1251,9 @@ a.ygtvspacer:hover {
}
.controls {
margin-left: 125px;
select {
width: 100%;
}
}
.controls.control-radio input {
margin-top: 3px;
Expand Down
2 changes: 1 addition & 1 deletion theme/bootstrapbase/style/moodle.css

Large diffs are not rendered by default.

0 comments on commit 9f555a7

Please sign in to comment.