mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #19411 from owncloud/files-sidebar-shareloadspinner 

Show loading spinner for first fetch of shares
This commit is contained in:
Thomas Müller 2015-09-29 13:18:04 +02:00
parent f2cd334c8a a823a79f12
commit 3cd82b8918
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
core/js/sharedialogview.js
View File

@ -14,7 +14,7 @@
}
var TEMPLATE_BASE =
'<div class="resharerInfoView"></div>' +
'<div class="resharerInfoView subView"></div>' +
'{{#if isSharingAllowed}}' +
'<label for="shareWith" class="hidden-visually">{{shareLabel}}</label>' +
'<div class="oneline">' +
@ -23,10 +23,10 @@
'{{{remoteShareInfo}}}' +
'</div>' +
'{{/if}}' +
'<div class="shareeListView"></div>' +
'<div class="linkShareView"></div>' +
'<div class="expirationView"></div>'
;
'<div class="shareeListView subView"></div>' +
'<div class="linkShareView subView"></div>' +
'<div class="expirationView subView"></div>' +
'<div class="loading hidden" style="height: 50px"></div>';
var TEMPLATE_REMOTE_SHARE_INFO =
'<a target="_blank" class="icon-info svg shareWithRemoteInfo hasTooltip" href="{{docLink}}" ' +
@ -87,6 +87,9 @@
view.render();
});
this.model.on('request', this._onRequest, this);
this.model.on('sync', this._onEndRequest, this);
var subViewOptions = {
model: this.model,
configModel: this.configModel
@ -161,6 +164,24 @@
this.model.addShare(s.item.value);
},
_toggleLoading: function(state) {
this._loading = state;
this.$el.find('.subView').toggleClass('hidden', state);
this.$el.find('.loading').toggleClass('hidden', !state);
},
_onRequest: function() {
// only show the loading spinner for the first request (for now)
if (!this._loadingOnce) {
this._toggleLoading(true);
this._loadingOnce = true;
}
},
_onEndRequest: function() {
this._toggleLoading(false);
},
render: function() {
var baseTemplate = this._getTemplate('base', TEMPLATE_BASE);

2
core/js/shareitemmodel.js
View File

@ -624,7 +624,9 @@
fetch: function() {
var model = this;
this.trigger('request', this);
OC.Share.loadItem(this.get('itemType'), this.get('itemSource'), function(data) {
model.trigger('sync', 'GET', this);
model.set(model.parse(data));
});
},