diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-07-19 23:28:46 +0200 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-07-21 15:02:21 +0200 |
| commit | d4de77afb9bdff57985863b6adc8a37d6d198807 (patch) | |
| tree | 8358964bb605e891ede6ea590df570c2f6668f0d /core/js | |
| parent | 977c4626987764933ce2ac25011ce160fd3e016e (diff) | |
| download | nextcloud-server-d4de77afb9bdff57985863b6adc8a37d6d198807.tar.gz nextcloud-server-d4de77afb9bdff57985863b6adc8a37d6d198807.zip | |
No remote note and various fixes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/sharedialogshareelistview.js | 3 | ||||
| -rw-r--r-- | core/js/sharedialogview.js | 8 |
2 files changed, 3 insertions, 8 deletions
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js index a9704155394..823c49e7e65 100644 --- a/core/js/sharedialogshareelistview.js +++ b/core/js/sharedialogshareelistview.js @@ -125,6 +125,7 @@ ' <input id="expirationDatePicker-{{cid}}-{{shareId}}" class="datepicker" type="text" placeholder="{{expirationDatePlaceholder}}" value="{{#if hasExpireDate}}{{expireDate}}{{else}}{{defaultExpireDate}}{{/if}}" />' + '</span>' + '</li>' + + '{{#if isNoteAvailable}}' + '<li>' + '<a href="#" class="share-add"><span class="icon-loading-small hidden"></span>' + ' <span class="icon icon-edit"></span>' + @@ -138,6 +139,7 @@ ' <input type="submit" class="icon-confirm share-note-submit" value="" id="add-note-{{shareId}}" />' + '</span>' + '</li>' + + '{{/if}}' + '<li>' + '<a href="#" class="unshare"><span class="icon-loading-small hidden"></span><span class="icon icon-delete"></span><span>{{unshareLabel}}</span></a>' + '</li>' + @@ -276,6 +278,7 @@ modSeed: shareType !== OC.Share.SHARE_TYPE_USER && (shareType !== OC.Share.SHARE_TYPE_CIRCLE || shareWithAvatar), isRemoteShare: shareType === OC.Share.SHARE_TYPE_REMOTE, isRemoteGroupShare: shareType === OC.Share.SHARE_TYPE_REMOTE_GROUP, + isNoteAvailable: shareType !== OC.Share.SHARE_TYPE_REMOTE && shareType !== OC.Share.SHARE_TYPE_REMOTE_GROUP, isMailShare: shareType === OC.Share.SHARE_TYPE_EMAIL, isCircleShare: shareType === OC.Share.SHARE_TYPE_CIRCLE, isFileSharedByMail: shareType === OC.Share.SHARE_TYPE_EMAIL && !this.model.isFolder(), diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js index 60e9211752c..9fa1847d3d5 100644 --- a/core/js/sharedialogview.js +++ b/core/js/sharedialogview.js @@ -59,9 +59,6 @@ linkShareView: undefined, /** @type {object} **/ - expirationView: undefined, - - /** @type {object} **/ shareeListView: undefined, /** @type {object} **/ @@ -104,14 +101,12 @@ var subViewOptions = { model: this.model, - parent: this, configModel: this.configModel }; var subViews = { resharerInfoView: 'ShareDialogResharerInfoView', linkShareView: 'ShareDialogLinkShareView', - expirationView: 'ShareDialogExpirationView', shareeListView: 'ShareDialogShareeListView' }; @@ -671,9 +666,6 @@ this.linkShareView.$el = this.$el.find('.linkShareView'); this.linkShareView.render(); - this.expirationView.$el = this.$el.find('.expirationView'); - this.expirationView.render(); - this.shareeListView.$el = this.$el.find('.shareeListView'); this.shareeListView.render(); |