Skip to content

J
jumpserver
Commit 3977b731 authored by ibuler's avatar ibuler
Browse files
Options

Merge branch 'dev' of github.com:jumpserver/jumpserver into dev

parents 3fb79c77 d5dcab15
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
apps/locale/zh/LC_MESSAGES/django.po
View file @ 3977b731
This diff is collapsed.
apps/static/plugins/elfinder/elfinder.full.js
View file @ 3977b731
...@@ -14230,6 +14230,8 @@ $.fn.elfindercwd = function(fm, options) { ...@@ -14230,6 +14230,8 @@ $.fn.elfindercwd = function(fm, options) {
selectCheckbox && selectAllCheckbox.find('input').prop('checked', true); selectCheckbox && selectAllCheckbox.find('input').prop('checked', true);
fm.lazy(function() { fm.lazy(function() {
var files; var files;
// fix select all display; remove cwd disable status
cwd.find('[id]:not(.'+clSelected+'):not(.elfinder-cwd-parent)').removeClass(clDisabled);
cwd.find('[id]:not(.'+clSelected+'):not(.elfinder-cwd-parent)').trigger(evtSelect); cwd.find('[id]:not(.'+clSelected+'):not(.elfinder-cwd-parent)').trigger(evtSelect);
if (fm.maxTargets && (incHashes || cwdHashes).length > fm.maxTargets) { if (fm.maxTargets && (incHashes || cwdHashes).length > fm.maxTargets) {
files = $.map(incHashes || cwdHashes, function(hash) { return fm.file(hash) || null; }); files = $.map(incHashes || cwdHashes, function(hash) { return fm.file(hash) || null; });
...@@ -33643,4 +33645,4 @@ elFinder.prototype.commands.view = function() { ...@@ -33643,4 +33645,4 @@ elFinder.prototype.commands.view = function() {
}; };
return elFinder; return elFinder;
})); }));
\ No newline at end of file
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