diff options
| author | Julius Härtl <jus@bitgrid.net> | 2018-09-04 21:05:15 +0300 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2018-09-04 22:34:04 +0300 |
| commit | 9a1f139881eff45da2c2093f52d8a8207150c2da (patch) | |
| tree | 29e4067666c26956bd2f5e8b62e5a9a6f3eeeda4 /js | |
| parent | 70d79756e45eb5c781fb1727cd20ce3028bbb42f (diff) | |
Add tooltip, contactsmenu and properly cleanup container
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'js')
| -rw-r--r-- | js/documents.js | 20 | ||||
| -rw-r--r-- | js/viewer/viewer.js | 1 |
2 files changed, 12 insertions, 9 deletions
diff --git a/js/documents.js b/js/documents.js index a02fd2a8..3ee5221d 100644 --- a/js/documents.js +++ b/js/documents.js @@ -187,22 +187,24 @@ var documentsMain = { //Add the avatar toolbar if possible var headerRight = parent.$('#header .header-right'); - headerRight.prepend($('<div id="richdocument-avatars">')); + headerRight.prepend($('<div id="richdocuments-avatars">')); }, renderAvatars: function() { - var avatardiv = parent.$('#header .header-right #richdocument-avatars'); - - // Empty div - while (avatardiv.firstChild) { - avatardiv.removeChild(avatardiv.firstChild); - } + var avatardiv = parent.$('#header .header-right #richdocuments-avatars'); + avatardiv.empty(); // Add new avatars this.views.forEach(function(view, viewId) { - var avatar = $('<div data-user="' + view.UserId + '" class="richdocuments-avatar">' + view.UserId + '</div>'); - avatardiv.append(avatar); + if (view.UserId === parent.OC.currentUser) { + return; + } + var avatarContainer = $('<div class="richdocuments-avatar"><div class="avatar" title="' + view.UserId + '" data-user="' + view.UserId + '"></div></div>'); + var avatar = avatarContainer.find('.avatar'); + avatardiv.append(avatarContainer); $(avatar).avatar(view.UserId, 32); + $(avatar).tooltip({placement: 'bottom'}); + $(avatar).contactsMenu(view.UserId, 0, avatarContainer); }); }, diff --git a/js/viewer/viewer.js b/js/viewer/viewer.js index a4df920f..88ad3498 100644 --- a/js/viewer/viewer.js +++ b/js/viewer/viewer.js @@ -133,6 +133,7 @@ var odfViewer = { $('#richdocumentsframe').remove(); $('#app-navigation').removeClass('hidden'); $('.richdocuments-sharing').remove(); + $('#richdocuments-avatars').remove(); $('.searchbox').show(); OC.Util.History.replaceState(); |