diff options
author | julia.kirschenheuter <julia.kirschenheuter@nextcloud.com> | 2022-12-15 11:01:57 +0100 |
---|---|---|
committer | julia.kirschenheuter <julia.kirschenheuter@nextcloud.com> | 2022-12-22 13:58:44 +0100 |
commit | a67c53af2b8b47584c2ebe8bc1d8068559bdb807 (patch) | |
tree | 8e080ca654c1cc21280e2387ee0be4fec951ac83 /apps | |
parent | 7284091779183f14c222e8568cf4088318a761a1 (diff) | |
download | nextcloud-server-a67c53af2b8b47584c2ebe8bc1d8068559bdb807.tar.gz nextcloud-server-a67c53af2b8b47584c2ebe8bc1d8068559bdb807.zip |
Replace custom tooltips with native ones in files_sharing
Signed-off-by: julia.kirschenheuter <julia.kirschenheuter@nextcloud.com>
Diffstat (limited to 'apps')
-rw-r--r-- | apps/files_sharing/js/files_drop.js | 2 | ||||
-rw-r--r-- | apps/files_sharing/js/public.js | 3 | ||||
-rw-r--r-- | apps/files_sharing/js/sharedfilelist.js | 4 | ||||
-rw-r--r-- | apps/files_sharing/js/templates.js | 8 | ||||
-rw-r--r-- | apps/files_sharing/js/templates/files_drop.handlebars | 4 | ||||
-rw-r--r-- | apps/files_sharing/src/share.js | 2 |
6 files changed, 8 insertions, 15 deletions
diff --git a/apps/files_sharing/js/files_drop.js b/apps/files_sharing/js/files_drop.js index 3ef2651d054..ffbe8284433 100644 --- a/apps/files_sharing/js/files_drop.js +++ b/apps/files_sharing/js/files_drop.js @@ -65,7 +65,6 @@ $('#drop-upload-progress-indicator').removeClass('hidden'); $('#drop-uploaded-files').append(output({isUploading: true, name: data.files[0].name})); - $('[data-toggle="tooltip"]').tooltip(); data.submit(); return true; @@ -73,7 +72,6 @@ updateFileItem: function (fileName, fileItem) { $('#drop-uploaded-files li[data-name="' + fileName + '"]').replaceWith(fileItem); - $('[data-toggle="tooltip"]').tooltip(); }, initialize: function () { diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index 9b0f4421360..128875ba6ab 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -65,7 +65,6 @@ OCA.Sharing.PublicApp = { // Toggle for grid view this.$showGridView = $('input#showgridview'); this.$showGridView.on('change', _.bind(this._onGridviewChange, this)); - $('#view-toggle').tooltip({placement: 'bottom', trigger: 'hover'}); var filesClient = new OC.Files.Client({ host: OC.getHost(), @@ -380,7 +379,7 @@ OCA.Sharing.PublicApp = { .removeClass('icon-toggle-filelist icon-toggle-pictures') .addClass(isGridView ? 'icon-toggle-filelist' : 'icon-toggle-pictures') this.$showGridView.next('#view-toggle').attr( - 'data-original-title', + 'title', isGridView ? t('files', 'Show list view') : t('files', 'Show grid view'), ) diff --git a/apps/files_sharing/js/sharedfilelist.js b/apps/files_sharing/js/sharedfilelist.js index c15372eb3b3..3a8786bf2a9 100644 --- a/apps/files_sharing/js/sharedfilelist.js +++ b/apps/files_sharing/js/sharedfilelist.js @@ -135,9 +135,7 @@ 'class': 'modified', 'title': formatted, 'style': 'color:rgb(' + modifiedColor + ',' + modifiedColor + ',' + modifiedColor + ')' - }).text(text) - .tooltip({ placement: 'top' }) - ) + }).text(text)) $tr.append(td) } diff --git a/apps/files_sharing/js/templates.js b/apps/files_sharing/js/templates.js index 1f65c3c55a1..07fd6ad6c42 100644 --- a/apps/files_sharing/js/templates.js +++ b/apps/files_sharing/js/templates.js @@ -10,7 +10,7 @@ templates['files_drop'] = template({"1":function(container,depth0,helpers,partia return " <div id=\"drop-upload-name\">" + container.escapeExpression(((helper = (helper = lookupProperty(helpers,"name") || (depth0 != null ? lookupProperty(depth0,"name") : depth0)) != null ? helper : container.hooks.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),{"name":"name","hash":{},"data":data,"loc":{"start":{"line":3,"column":29},"end":{"line":3,"column":37}}}) : helper))) - + "</div><div id=\"drop-upload-status\"></div>\n <progress id=\"drop-upload-progress-bar\" value=\"0\" max=\"100\"></progress> \n"; + + "</div><div id=\"drop-upload-status\"></div>\n <progress id=\"drop-upload-progress-bar\" value=\"0\" max=\"100\"></progress>\n"; },"3":function(container,depth0,helpers,partials,data) { var helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=container.hooks.helperMissing, alias3="function", alias4=container.escapeExpression, lookupProperty = container.lookupProperty || function(parent, propertyName) { if (Object.prototype.hasOwnProperty.call(parent, propertyName)) { @@ -32,10 +32,10 @@ templates['files_drop'] = template({"1":function(container,depth0,helpers,partia return undefined }; - return "<li data-toggle=\"tooltip\" title=\"" - + alias4(((helper = (helper = lookupProperty(helpers,"name") || (depth0 != null ? lookupProperty(depth0,"name") : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data,"loc":{"start":{"line":1,"column":33},"end":{"line":1,"column":41}}}) : helper))) + return "<li title=\"" + + alias4(((helper = (helper = lookupProperty(helpers,"name") || (depth0 != null ? lookupProperty(depth0,"name") : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data,"loc":{"start":{"line":1,"column":11},"end":{"line":1,"column":19}}}) : helper))) + "\" data-name=\"" - + alias4(((helper = (helper = lookupProperty(helpers,"name") || (depth0 != null ? lookupProperty(depth0,"name") : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data,"loc":{"start":{"line":1,"column":54},"end":{"line":1,"column":62}}}) : helper))) + + alias4(((helper = (helper = lookupProperty(helpers,"name") || (depth0 != null ? lookupProperty(depth0,"name") : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data,"loc":{"start":{"line":1,"column":32},"end":{"line":1,"column":40}}}) : helper))) + "\">\n" + ((stack1 = lookupProperty(helpers,"if").call(alias1,(depth0 != null ? lookupProperty(depth0,"isUploading") : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.program(3, data, 0),"data":data,"loc":{"start":{"line":2,"column":1},"end":{"line":7,"column":8}}})) != null ? stack1 : "") + "</li>\n"; diff --git a/apps/files_sharing/js/templates/files_drop.handlebars b/apps/files_sharing/js/templates/files_drop.handlebars index 03db9eb6c7d..4128c920cb9 100644 --- a/apps/files_sharing/js/templates/files_drop.handlebars +++ b/apps/files_sharing/js/templates/files_drop.handlebars @@ -1,7 +1,7 @@ -<li data-toggle="tooltip" title="{{name}}" data-name="{{name}}"> +<li title="{{name}}" data-name="{{name}}"> {{#if isUploading}} <div id="drop-upload-name">{{name}}</div><div id="drop-upload-status"></div> - <progress id="drop-upload-progress-bar" value="0" max="100"></progress> + <progress id="drop-upload-progress-bar" value="0" max="100"></progress> {{else}} <img src="{{iconSrc}}"/> {{name}} {{/if}} diff --git a/apps/files_sharing/src/share.js b/apps/files_sharing/src/share.js index 93891cbf287..be003d51fa4 100644 --- a/apps/files_sharing/src/share.js +++ b/apps/files_sharing/src/share.js @@ -377,7 +377,6 @@ import { getCapabilities } from '@nextcloud/capabilities' avatarElement.each(function() { $(this).avatar($(this).data('username'), 32) }) - action.find('span[title]').tooltip({ placement: 'top' }) } } else { action.html('<span class="hidden-visually">' + t('files_sharing', 'Shared') + '</span>').prepend(icon) @@ -511,7 +510,6 @@ import { getCapabilities } from '@nextcloud/capabilities' avatarElement.each(function() { $(this).avatar($(this).data('username'), 32) }) - action.find('span[title]').tooltip({ placement: 'top' }) } } else { action.html('<span class="hidden-visually">' + t('files_sharing', 'Shared') + '</span>').prepend(icon) |