').appendTo(container)[0])
form.$root = this
form.$toast = this.$toast
- dialog = $(form.$el)
+ dialog = form.$el
}
- dialog.on('shown.bs.modal', () => {
- dialog.find('input').first().focus()
- }).modal()
+ dialog.__vue__.showDialog()
},
userStatusClass(user) {
if (user.isDeleted) {
@@ -464,7 +466,7 @@
// Create an error message
// API responses can use a string, array or object
let msg_text = ''
- if ($.type(msg) !== 'string') {
+ if (typeof(msg) !== 'string') {
$.each(msg, (index, str) => {
msg_text += str + ' '
})
diff --git a/src/resources/js/bootstrap.js b/src/resources/js/bootstrap.js
--- a/src/resources/js/bootstrap.js
+++ b/src/resources/js/bootstrap.js
@@ -1,18 +1,22 @@
/**
- * We'll load jQuery and the Bootstrap jQuery plugin which provides support
- * for JavaScript based Bootstrap features such as modals and tabs. This
- * code may be modified to fit the specific needs of your application.
+ * Import Cash (jQuery replacement)
*/
-window.Popper = require('popper.js').default
-window.$ = window.jQuery = require('jquery')
+import $ from 'cash-dom'
+window.$ = $
-require('bootstrap')
+$.fn.focus = function() {
+ if (this.length && this[0].focus) {
+ this[0].focus()
+ }
+ return this
+}
/**
- * We'll load Vue, VueRouter and global components
+ * Load Vue, VueRouter and global components
*/
+import { Tooltip } from 'bootstrap'
import FontAwesomeIcon from './fontawesome'
import Vue from 'vue'
import VueRouter from 'vue-router'
@@ -24,26 +28,26 @@
Vue.component('SvgIcon', FontAwesomeIcon)
const vTooltip = (el, binding) => {
- const t = []
+ let t = []
if (binding.modifiers.focus) t.push('focus')
if (binding.modifiers.hover) t.push('hover')
if (binding.modifiers.click) t.push('click')
- if (!t.length) t.push('hover')
+ if (!t.length) t.push('click')
- $(el).tooltip({
+ el.tooltip = new Tooltip(el, {
title: binding.value,
placement: binding.arg || 'top',
trigger: t.join(' '),
- html: !!binding.modifiers.html,
- });
+ html: !!binding.modifiers.html
+ })
}
Vue.directive('tooltip', {
bind: vTooltip,
update: vTooltip,
unbind (el) {
- $(el).tooltip('dispose')
+ el.tooltip.dispose()
}
})
@@ -70,7 +74,7 @@
})
/**
- * We'll load the axios HTTP library which allows us to easily issue requests
+ * Load the axios HTTP library which allows us to easily issue requests
* to our Laravel back-end. This library automatically handles sending the
* CSRF token as a header based on the value of the "XSRF" token cookie.
*/
diff --git a/src/resources/js/meet/app.js b/src/resources/js/meet/app.js
--- a/src/resources/js/meet/app.js
+++ b/src/resources/js/meet/app.js
@@ -1,4 +1,5 @@
import anchorme from 'anchorme'
+import { Dropdown } from 'bootstrap'
import { library } from '@fortawesome/fontawesome-svg-core'
import { OpenVidu } from 'openvidu-browser'
@@ -1033,7 +1034,7 @@
}
if (params.isSelf) {
- wrapper.find('.link-setup').removeClass('hidden').click(() => sessionData.onMediaSetup())
+ wrapper.find('.link-setup').removeClass('hidden').on('click', () => sessionData.onMediaSetup())
} else {
let volumeInput = wrapper.find('.volume input')
let audioButton = wrapper.find('.link-audio')
@@ -1284,19 +1285,19 @@
+ '
'
+ '
'
+ ''
- + '
'
+ '
'
+ '
'
+ ''
- + '