Commit ba40c669 authored by Ozzie Isaacs's avatar Ozzie Isaacs

Merge remote-tracking branch 'filepicker/fix-filemodal'

parents e064a3ec 781ca7a3
...@@ -650,10 +650,10 @@ $(function() { ...@@ -650,10 +650,10 @@ $(function() {
var folder = target.data("folderonly"); var folder = target.data("folderonly");
var filter = target.data("filefilter"); var filter = target.data("filefilter");
$("#element_selected").text(path); $("#element_selected").text(path);
$("#file_confirm")[0].attributes["data-link"].value = target.data("link"); $("#file_confirm").data("link", target.data("link"));
$("#file_confirm")[0].attributes["data-folderonly"].value = (typeof folder === 'undefined') ? false : true; $("#file_confirm").data("folderonly", (typeof folder === 'undefined') ? false : true);
$("#file_confirm")[0].attributes["data-filefilter"].value = (typeof filter === 'undefined') ? "" : filter; $("#file_confirm").data("filefilter", (typeof filter === 'undefined') ? "" : filter);
$("#file_confirm")[0].attributes["data-newfile"].value = target.data("newfile"); $("#file_confirm").data("newfile", target.data("newfile"));
fillFileTable(path,"dir", folder, filter); fillFileTable(path,"dir", folder, filter);
}); });
...@@ -667,7 +667,7 @@ $(function() { ...@@ -667,7 +667,7 @@ $(function() {
var folder = $(file_confirm).data("folderonly"); var folder = $(file_confirm).data("folderonly");
var filter = $(file_confirm).data("filefilter"); var filter = $(file_confirm).data("filefilter");
var newfile = $(file_confirm).data("newfile"); var newfile = $(file_confirm).data("newfile");
if (newfile !== 'undefined') { if (newfile !== "") {
$("#element_selected").text(path + $("#new_file".text())); $("#element_selected").text(path + $("#new_file".text()));
} else { } else {
$("#element_selected").text(path); $("#element_selected").text(path);
......
Markdown is supported
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