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

Merge pull request #22611 from owncloud/add-uid-on-hover 

Add the uid on hover for sharing autocomplete
This commit is contained in:
Thomas Müller 2016-02-25 16:55:17 +01:00
parent 914ac09aae 1add45ae6a
commit 35423102af
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/js/sharedialogshareelistview.js
View File

@ -16,12 +16,12 @@
var TEMPLATE = var TEMPLATE =
'<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}}" title="{{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><img class="svg" alt="{{unshareLabel}}" title="{{unshareLabel}}" src="{{unshareImage}}" /></a>' + ' <a href="#" class="unshare"><span class="icon-loading-small hidden"></span><img class="svg" alt="{{unshareLabel}}" title="{{unshareLabel}}" src="{{unshareImage}}" /></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}}' +
' <span class="username">{{shareWithDisplayName}}</span>' + ' <span class="has-tooltip username" title="{{shareWith}}">{{shareWithDisplayName}}</span>' +
' {{#if mailNotificationEnabled}} {{#unless isRemoteShare}}' + ' {{#if mailNotificationEnabled}} {{#unless isRemoteShare}}' +
' <input id="mail-{{cid}}-{{shareWith}}" type="checkbox" name="mailNotification" class="mailNotification checkbox" {{#if wasMailSent}}checked="checked"{{/if}} />' + ' <input id="mail-{{cid}}-{{shareWith}}" type="checkbox" name="mailNotification" class="mailNotification checkbox" {{#if wasMailSent}}checked="checked"{{/if}} />' +
' <label for="mail-{{cid}}-{{shareWith}}">{{notifyByMailLabel}}</label>' + ' <label for="mail-{{cid}}-{{shareWith}}">{{notifyByMailLabel}}</label>' +
@ -193,6 +193,10 @@
}); });
} }
this.$el.find('.has-tooltip').tooltip({
placement: 'bottom'
});
this.delegateEvents(); this.delegateEvents();
return this; return this;

7
core/js/sharedialogview.js
View File

@ -221,7 +221,7 @@
.tooltip('hide') .tooltip('hide')
.tooltip({ .tooltip({
placement: 'bottom', placement: 'bottom',
trigger: 'manual', trigger: 'manual'
}) })
.tooltip('fixTitle') .tooltip('fixTitle')
.tooltip('show'); .tooltip('show');
@ -259,9 +259,14 @@
} }
} }
insert.text(text); insert.text(text);
insert.attr('title', item.value.shareWith);
if(item.value.shareType === OC.Share.SHARE_TYPE_GROUP) { if(item.value.shareType === OC.Share.SHARE_TYPE_GROUP) {
insert = insert.wrapInner('<strong></strong>'); insert = insert.wrapInner('<strong></strong>');
} }
insert.tooltip({
placement: 'bottom',
container: 'body'
});
return $("<li>") return $("<li>")
.addClass((item.value.shareType === OC.Share.SHARE_TYPE_GROUP) ? 'group' : 'user') .addClass((item.value.shareType === OC.Share.SHARE_TYPE_GROUP) ? 'group' : 'user')
.append(insert) .append(insert)