Add spinner when loading ext storages

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
pull/30113/head
Vincent Petry 4 years ago committed by nextcloud-command
parent 3a1ef2b012
commit a7e8da9da8
  1. 4
      apps/files_external/css/settings.scss
  2. 12
      apps/files_external/js/settings.js
  3. 5
      apps/files_external/templates/settings.php

@ -4,6 +4,10 @@
#externalStorage { #externalStorage {
margin: 15px 0 20px 0; margin: 15px 0 20px 0;
tr.externalStorageLoading > td {
text-align: center;
}
} }
#externalStorage td { #externalStorage td {

@ -907,6 +907,14 @@ MountConfigListView.prototype = _.extend({
loadStorages: function() { loadStorages: function() {
var self = this; var self = this;
var onLoaded1 = $.Deferred();
var onLoaded2 = $.Deferred();
this.$el.find('.externalStorageLoading').removeClass('hidden');
$.when(onLoaded1, onLoaded2).always(() => {
self.$el.find('.externalStorageLoading').addClass('hidden');
})
if (this._isPersonal) { if (this._isPersonal) {
// load userglobal storages // load userglobal storages
$.ajax({ $.ajax({
@ -953,8 +961,11 @@ MountConfigListView.prototype = _.extend({
$('#emptycontent').show(); $('#emptycontent').show();
} }
onCompletion.resolve(); onCompletion.resolve();
onLoaded1.resolve();
} }
}); });
} else {
onLoaded1.resolve();
} }
var url = this._storageConfigClass.prototype._url; var url = this._storageConfigClass.prototype._url;
@ -973,6 +984,7 @@ MountConfigListView.prototype = _.extend({
self.recheckStorageConfig($tr); self.recheckStorageConfig($tr);
}); });
onCompletion.resolve(); onCompletion.resolve();
onLoaded2.resolve();
} }
}); });
}, },

@ -124,6 +124,11 @@ $canCreateMounts = $_['visibilityType'] === BackendService::VISIBILITY_ADMIN ||
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr class="externalStorageLoading">
<td colspan="8">
<span id="externalStorageLoading" class="icon icon-loading"></span>
</td>
</tr>
<tr id="addMountPoint" <tr id="addMountPoint"
<?php if (!$canCreateMounts): ?> <?php if (!$canCreateMounts): ?>
style="display: none;" style="display: none;"

Loading…
Cancel
Save