move sharing options into popover menu
This commit is contained in:
parent
07a1be2e06
commit
1181ac14f7
|
@ -1,3 +1,5 @@
|
||||||
|
/* global OC, Handlebars */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2015
|
* Copyright (c) 2015
|
||||||
*
|
*
|
||||||
|
@ -19,7 +21,6 @@
|
||||||
'<ul id="shareWithList" class="shareWithList">' +
|
'<ul id="shareWithList" class="shareWithList">' +
|
||||||
'{{#each sharees}}' +
|
'{{#each sharees}}' +
|
||||||
'<li data-share-id="{{shareId}}" data-share-type="{{shareType}}" data-share-with="{{shareWith}}">' +
|
'<li data-share-id="{{shareId}}" data-share-type="{{shareType}}" data-share-with="{{shareWith}}">' +
|
||||||
'<a href="#" class="unshare"><span class="icon-loading-small hidden"></span><span class="icon icon-delete"></span><span class="hidden-visually">{{unshareLabel}}</span></a>' +
|
|
||||||
'{{#if avatarEnabled}}' +
|
'{{#if avatarEnabled}}' +
|
||||||
'<div class="avatar {{#if modSeed}}imageplaceholderseed{{/if}}" data-username="{{shareWith}}" {{#if modSeed}}data-seed="{{shareWith}} {{shareType}}"{{/if}}></div>' +
|
'<div class="avatar {{#if modSeed}}imageplaceholderseed{{/if}}" data-username="{{shareWith}}" {{#if modSeed}}data-seed="{{shareWith}} {{shareType}}"{{/if}}></div>' +
|
||||||
'{{/if}}' +
|
'{{/if}}' +
|
||||||
|
@ -30,45 +31,62 @@
|
||||||
'<label for="mail-{{cid}}-{{shareWith}}">{{notifyByMailLabel}}</label>' +
|
'<label for="mail-{{cid}}-{{shareWith}}">{{notifyByMailLabel}}</label>' +
|
||||||
'</span>' +
|
'</span>' +
|
||||||
'{{/unless}} {{/if}}' +
|
'{{/unless}} {{/if}}' +
|
||||||
'{{#if isResharingAllowed}} {{#if sharePermissionPossible}}' +
|
'<span class="sharingOptionsGroup">' +
|
||||||
'<span class="shareOption">' +
|
'{{#if editPermissionPossible}}' +
|
||||||
'<input id="canShare-{{cid}}-{{shareWith}}" type="checkbox" name="share" class="permissions checkbox" {{#if hasSharePermission}}checked="checked"{{/if}} data-permissions="{{sharePermission}}" />' +
|
'<span class="shareOption">' +
|
||||||
'<label for="canShare-{{cid}}-{{shareWith}}">{{canShareLabel}}</label>' +
|
'<input id="canEdit-{{cid}}-{{shareWith}}" type="checkbox" name="edit" class="permissions checkbox" {{#if hasEditPermission}}checked="checked"{{/if}} />' +
|
||||||
|
'<label for="canEdit-{{cid}}-{{shareWith}}">{{canEditLabel}}</label>' +
|
||||||
|
'</span>' +
|
||||||
|
'{{/if}}' +
|
||||||
|
'<span class="icon icon-more"></span>' +
|
||||||
|
'<div class="popovermenu bubble hidden menu">' +
|
||||||
|
'<ul>' +
|
||||||
|
'{{#if isResharingAllowed}} {{#if sharePermissionPossible}}' +
|
||||||
|
'<li>' +
|
||||||
|
'<span class="shareOption">' +
|
||||||
|
'<input id="canShare-{{cid}}-{{shareWith}}" type="checkbox" name="share" class="permissions checkbox" {{#if hasSharePermission}}checked="checked"{{/if}} data-permissions="{{sharePermission}}" />' +
|
||||||
|
'<label for="canShare-{{cid}}-{{shareWith}}">{{canShareLabel}}</label>' +
|
||||||
|
'</span>' +
|
||||||
|
'</li>' +
|
||||||
|
'{{/if}} {{/if}}' +
|
||||||
|
'{{#if isFolder}}' +
|
||||||
|
'{{#if createPermissionPossible}}' +
|
||||||
|
'<li>' +
|
||||||
|
'<span class="shareOption">' +
|
||||||
|
'<input id="canCreate-{{cid}}-{{shareWith}}" type="checkbox" name="create" class="permissions checkbox" {{#if hasCreatePermission}}checked="checked"{{/if}} data-permissions="{{createPermission}}"/>' +
|
||||||
|
'<label for="canCreate-{{cid}}-{{shareWith}}">{{createPermissionLabel}}</label>' +
|
||||||
|
'</span>' +
|
||||||
|
'</li>' +
|
||||||
|
'{{/if}}' +
|
||||||
|
'{{#if updatePermissionPossible}}' +
|
||||||
|
'<li>' +
|
||||||
|
'<span class="shareOption">' +
|
||||||
|
'<input id="canUpdate-{{cid}}-{{shareWith}}" type="checkbox" name="update" class="permissions checkbox" {{#if hasUpdatePermission}}checked="checked"{{/if}} data-permissions="{{updatePermission}}"/>' +
|
||||||
|
'<label for="canUpdate-{{cid}}-{{shareWith}}">{{updatePermissionLabel}}</label>' +
|
||||||
|
'</span>' +
|
||||||
|
'</li>' +
|
||||||
|
'{{/if}}' +
|
||||||
|
'{{#if deletePermissionPossible}}' +
|
||||||
|
'<li>' +
|
||||||
|
'<span class="shareOption">' +
|
||||||
|
'<input id="canDelete-{{cid}}-{{shareWith}}" type="checkbox" name="delete" class="permissions checkbox" {{#if hasDeletePermission}}checked="checked"{{/if}} data-permissions="{{deletePermission}}"/>' +
|
||||||
|
'<label for="canDelete-{{cid}}-{{shareWith}}">{{deletePermissionLabel}}</label>' +
|
||||||
|
'</span>' +
|
||||||
|
'</li>' +
|
||||||
|
'{{/if}}' +
|
||||||
|
'{{/if}}' +
|
||||||
|
'<li>' +
|
||||||
|
'<a href="#" class="menuitem action action-delete permanent unshare">' +
|
||||||
|
'<span class="icon icon-delete"></span>' +
|
||||||
|
'<span>{{unshareLabel}}</span>' +
|
||||||
|
'</a>' +
|
||||||
|
'</li>' +
|
||||||
|
'</ul>' +
|
||||||
|
'</div>' +
|
||||||
'</span>' +
|
'</span>' +
|
||||||
'{{/if}} {{/if}}' +
|
|
||||||
'{{#if editPermissionPossible}}' +
|
|
||||||
'<span class="shareOption">' +
|
|
||||||
'<input id="canEdit-{{cid}}-{{shareWith}}" type="checkbox" name="edit" class="permissions checkbox" {{#if hasEditPermission}}checked="checked"{{/if}} />' +
|
|
||||||
'<label for="canEdit-{{cid}}-{{shareWith}}">{{canEditLabel}}</label>' +
|
|
||||||
'{{#if isFolder}}' +
|
|
||||||
'<a href="#" class="showCruds"><img alt="{{crudsLabel}}" src="{{triangleSImage}}"/></a>' +
|
|
||||||
'{{/if}}' +
|
|
||||||
'</span>' +
|
|
||||||
'{{/if}}' +
|
|
||||||
'<div class="cruds hidden">' +
|
|
||||||
'{{#if createPermissionPossible}}' +
|
|
||||||
'<span class="shareOption">' +
|
|
||||||
'<input id="canCreate-{{cid}}-{{shareWith}}" type="checkbox" name="create" class="permissions checkbox" {{#if hasCreatePermission}}checked="checked"{{/if}} data-permissions="{{createPermission}}"/>' +
|
|
||||||
'<label for="canCreate-{{cid}}-{{shareWith}}">{{createPermissionLabel}}</label>' +
|
|
||||||
'</span>' +
|
|
||||||
'{{/if}}' +
|
|
||||||
'{{#if updatePermissionPossible}}' +
|
|
||||||
'<span class="shareOption">' +
|
|
||||||
'<input id="canUpdate-{{cid}}-{{shareWith}}" type="checkbox" name="update" class="permissions checkbox" {{#if hasUpdatePermission}}checked="checked"{{/if}} data-permissions="{{updatePermission}}"/>' +
|
|
||||||
'<label for="canUpdate-{{cid}}-{{shareWith}}">{{updatePermissionLabel}}</label>' +
|
|
||||||
'</span>' +
|
|
||||||
'{{/if}}' +
|
|
||||||
'{{#if deletePermissionPossible}}' +
|
|
||||||
'<span class="shareOption">' +
|
|
||||||
'<input id="canDelete-{{cid}}-{{shareWith}}" type="checkbox" name="delete" class="permissions checkbox" {{#if hasDeletePermission}}checked="checked"{{/if}} data-permissions="{{deletePermission}}"/>' +
|
|
||||||
'<label for="canDelete-{{cid}}-{{shareWith}}">{{deletePermissionLabel}}</label>' +
|
|
||||||
'</span>' +
|
|
||||||
'{{/if}}' +
|
|
||||||
'</div>' +
|
|
||||||
'</li>' +
|
'</li>' +
|
||||||
'{{/each}}' +
|
'{{/each}}' +
|
||||||
'</ul>'
|
'</ul>';
|
||||||
;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @class OCA.Share.ShareDialogShareeListView
|
* @class OCA.Share.ShareDialogShareeListView
|
||||||
|
@ -92,8 +110,8 @@
|
||||||
|
|
||||||
events: {
|
events: {
|
||||||
'click .unshare': 'onUnshare',
|
'click .unshare': 'onUnshare',
|
||||||
|
'click .icon-more': 'onToggleMenu',
|
||||||
'click .permissions': 'onPermissionChange',
|
'click .permissions': 'onPermissionChange',
|
||||||
'click .showCruds': 'onCrudsToggle',
|
|
||||||
'click .mailNotification': 'onSendMailNotification'
|
'click .mailNotification': 'onSendMailNotification'
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -224,6 +242,8 @@
|
||||||
},
|
},
|
||||||
|
|
||||||
onUnshare: function(event) {
|
onUnshare: function(event) {
|
||||||
|
event.preventDefault();
|
||||||
|
event.stopPropagation();
|
||||||
var self = this;
|
var self = this;
|
||||||
var $element = $(event.target);
|
var $element = $(event.target);
|
||||||
if (!$element.is('a')) {
|
if (!$element.is('a')) {
|
||||||
|
@ -237,7 +257,7 @@
|
||||||
}
|
}
|
||||||
$loading.removeClass('hidden');
|
$loading.removeClass('hidden');
|
||||||
|
|
||||||
var $li = $element.closest('li');
|
var $li = $element.closest('li[data-share-id]');
|
||||||
|
|
||||||
var shareId = $li.data('share-id');
|
var shareId = $li.data('share-id');
|
||||||
|
|
||||||
|
@ -252,9 +272,21 @@
|
||||||
return false;
|
return false;
|
||||||
},
|
},
|
||||||
|
|
||||||
onPermissionChange: function(event) {
|
onToggleMenu: function(event) {
|
||||||
|
event.preventDefault();
|
||||||
|
event.stopPropagation();
|
||||||
var $element = $(event.target);
|
var $element = $(event.target);
|
||||||
var $li = $element.closest('li');
|
var $li = $element.closest('li[data-share-id]');
|
||||||
|
var $menu = $li.find('.popovermenu');
|
||||||
|
|
||||||
|
OC.showMenu(null, $menu);
|
||||||
|
},
|
||||||
|
|
||||||
|
onPermissionChange: function(event) {
|
||||||
|
event.preventDefault();
|
||||||
|
event.stopPropagation();
|
||||||
|
var $element = $(event.target);
|
||||||
|
var $li = $element.closest('li[data-share-id]');
|
||||||
var shareId = $li.data('share-id');
|
var shareId = $li.data('share-id');
|
||||||
|
|
||||||
// adjust checkbox states
|
// adjust checkbox states
|
||||||
|
@ -278,15 +310,9 @@
|
||||||
this.model.updateShare(shareId, {permissions: permissions});
|
this.model.updateShare(shareId, {permissions: permissions});
|
||||||
},
|
},
|
||||||
|
|
||||||
onCrudsToggle: function(event) {
|
|
||||||
var $target = $(event.target);
|
|
||||||
$target.closest('li').find('.cruds').toggleClass('hidden');
|
|
||||||
return false;
|
|
||||||
},
|
|
||||||
|
|
||||||
onSendMailNotification: function(event) {
|
onSendMailNotification: function(event) {
|
||||||
var $target = $(event.target);
|
var $target = $(event.target);
|
||||||
var $li = $(event.target).closest('li');
|
var $li = $(event.target).closest('li[data-share-id]');
|
||||||
var shareType = $li.data('share-type');
|
var shareType = $li.data('share-type');
|
||||||
var shareWith = $li.attr('data-share-with');
|
var shareWith = $li.attr('data-share-with');
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue