Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid conflict between JQTooltip in the same DOM as a BSTooltip #15951

Merged
merged 3 commits into from Dec 23, 2017
Merged

Avoid conflict between JQTooltip in the same DOM as a BSTooltip #15951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8de0ff4
Avoid conflict between JQTooltip in the same DOM as a BSTooltip
PhilETaylor May 10, 2017
5744988
Merge branch 'staging' into issue15896ToolTips
rdeutz May 27, 2017
206e74e
Fix code style
mbabker Dec 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions media/media/js/mediafield.js
View file
Open in desktop
Expand Up @@ -135,8 +135,12 @@
}
} else {
// Reset tooltip and preview
this.$containerPreview.popover('destroy');
this.$input.tooltip('destroy');
try {
this.$containerPreview.popover('destroy');
this.$input.tooltip('destroy');
} catch(err) {
// Doing this so that jQueryUI tooltips and popover can exist alongside Bootstrap.
}

var value = this.$input.val();

Expand Down
2 changes: 1 addition & 1 deletion media/media/js/mediafield.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.