Skip to content

Commit e36ce00

Browse files
Replace custom tooltips with native ones in files_sharing
Signed-off-by: julia.kirschenheuter <julia.kirschenheuter@nextcloud.com>
1 parent 7284091 commit e36ce00

File tree

9 files changed

+10
-17
lines changed

9 files changed

+10
-17
lines changed

apps/files_sharing/js/files_drop.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,13 @@
6565
$('#drop-upload-progress-indicator').removeClass('hidden');
6666

6767
$('#drop-uploaded-files').append(output({isUploading: true, name: data.files[0].name}));
68-
$('[data-toggle="tooltip"]').tooltip();
6968
data.submit();
7069

7170
return true;
7271
},
7372

7473
updateFileItem: function (fileName, fileItem) {
7574
$('#drop-uploaded-files li[data-name="' + fileName + '"]').replaceWith(fileItem);
76-
$('[data-toggle="tooltip"]').tooltip();
7775
},
7876

7977
initialize: function () {

apps/files_sharing/js/public.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ OCA.Sharing.PublicApp = {
6565
// Toggle for grid view
6666
this.$showGridView = $('input#showgridview');
6767
this.$showGridView.on('change', _.bind(this._onGridviewChange, this));
68-
$('#view-toggle').tooltip({placement: 'bottom', trigger: 'hover'});
6968

7069
var filesClient = new OC.Files.Client({
7170
host: OC.getHost(),
@@ -380,7 +379,7 @@ OCA.Sharing.PublicApp = {
380379
.removeClass('icon-toggle-filelist icon-toggle-pictures')
381380
.addClass(isGridView ? 'icon-toggle-filelist' : 'icon-toggle-pictures')
382381
this.$showGridView.next('#view-toggle').attr(
383-
'data-original-title',
382+
'title',
384383
isGridView ? t('files', 'Show list view') : t('files', 'Show grid view'),
385384
)
386385

apps/files_sharing/js/sharedfilelist.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,7 @@
135135
'class': 'modified',
136136
'title': formatted,
137137
'style': 'color:rgb(' + modifiedColor + ',' + modifiedColor + ',' + modifiedColor + ')'
138-
}).text(text)
139-
.tooltip({ placement: 'top' })
140-
)
138+
}).text(text))
141139

142140
$tr.append(td)
143141
}

apps/files_sharing/js/templates/files_drop.handlebars

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<li data-toggle="tooltip" title="{{name}}" data-name="{{name}}">
1+
<li title="{{name}}" data-name="{{name}}">
22
{{#if isUploading}}
33
<div id="drop-upload-name">{{name}}</div><div id="drop-upload-status"></div>
4-
<progress id="drop-upload-progress-bar" value="0" max="100"></progress>
4+
<progress id="drop-upload-progress-bar" value="0" max="100"></progress>
55
{{else}}
66
<img src="{{iconSrc}}"/> {{name}}
77
{{/if}}

apps/files_sharing/src/share.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,6 @@ import { getCapabilities } from '@nextcloud/capabilities'
377377
avatarElement.each(function() {
378378
$(this).avatar($(this).data('username'), 32)
379379
})
380-
action.find('span[title]').tooltip({ placement: 'top' })
381380
}
382381
} else {
383382
action.html('<span class="hidden-visually">' + t('files_sharing', 'Shared') + '</span>').prepend(icon)
@@ -511,7 +510,6 @@ import { getCapabilities } from '@nextcloud/capabilities'
511510
avatarElement.each(function() {
512511
$(this).avatar($(this).data('username'), 32)
513512
})
514-
action.find('span[title]').tooltip({ placement: 'top' })
515513
}
516514
} else {
517515
action.html('<span class="hidden-visually">' + t('files_sharing', 'Shared') + '</span>').prepend(icon)

dist/files_sharing-additionalScripts.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/files_sharing-additionalScripts.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/files_sharing-files_sharing.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/files_sharing-files_sharing.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)