diff options
| author | root | 2019-02-19 18:53:50 +0100 |
|---|---|---|
| committer | root | 2019-02-19 18:53:50 +0100 |
| commit | 0ad4c0f8196b61699754762aacbaab0223478ab9 (patch) | |
| tree | de434c4aea8d07ecd01cd3badd48d057d62c2d1b /script/taskmanager.js | |
| parent | [usb-lock-off] Edit rule cleanup and fix of the dropdown boxes. (diff) | |
| parent | [statistics] Fix RAM change warning to handle increase too (diff) | |
| download | slx-admin-usb-lock-off.tar.gz slx-admin-usb-lock-off.tar.xz slx-admin-usb-lock-off.zip | |
Merge branch 'master' into usb-lock-offusb-lock-off
Diffstat (limited to 'script/taskmanager.js')
| -rw-r--r-- | script/taskmanager.js | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/script/taskmanager.js b/script/taskmanager.js index 5eae6cb3..ae1d2f09 100644 --- a/script/taskmanager.js +++ b/script/taskmanager.js @@ -16,7 +16,13 @@ function tmInit() item.append('<div class="data-tm-progress"><div class="progress"><div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0%"></div></div></div>'); } if (item.is('[data-tm-log]')) { - item.append('<pre class="data-tm-log" style="display:none" />'); + var lh = item.data('tm-log-height'); + if (!lh) { + lh = ''; + } else { + lh = 'min-height:' + lh; + } + item.append('<pre class="data-tm-log collapse" style="' + lh + '" />'); } item.prepend('<span class="data-tm-icon" />'); }); @@ -123,8 +129,7 @@ function tmResult(data, status) if (log) { var lKey = obj.attr('data-tm-log'); if (task.data && task.data[lKey]) { - log.text(task.data[lKey]); - log.attr('style', (task.data[lKey] !== '' ? '' : 'display:none')); + log.text(task.data[lKey]).show(); } } var cb = obj.attr('data-tm-callback'); |