diff options
| author | taehoon <th.dev91@gmail.com> | 2019-07-17 13:56:27 -0400 |
|---|---|---|
| committer | taehoon <th.dev91@gmail.com> | 2019-10-24 15:15:33 -0400 |
| commit | c009f17651e153835babd04b1cda1cb4a24ca0a2 (patch) | |
| tree | 5073426fccc2bd71903c92562a3aa0273e915a0b | |
| parent | c9ba37ba2cb5871fbf31881842308f503b9852bb (diff) | |
set different trigger event in desktop and mobile by default
| -rw-r--r-- | package.json | 1 | ||||
| -rw-r--r-- | src/components/extra_buttons/extra_buttons.vue | 2 | ||||
| -rw-r--r-- | src/components/moderation_tools/moderation_tools.vue | 2 | ||||
| -rw-r--r-- | src/components/status/status.vue | 3 | ||||
| -rw-r--r-- | src/main.js | 9 | ||||
| -rw-r--r-- | yarn.lock | 5 |
6 files changed, 14 insertions, 8 deletions
diff --git a/package.json b/package.json index f039d412..dabc4d11 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "diff": "^3.0.1", "karma-mocha-reporter": "^2.2.1", "localforage": "^1.5.0", + "mobile-detect": "^1.4.3", "object-path": "^0.11.3", "phoenix": "^1.3.0", "portal-vue": "^2.1.4", diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue index 6781a4f8..746f1c91 100644 --- a/src/components/extra_buttons/extra_buttons.vue +++ b/src/components/extra_buttons/extra_buttons.vue @@ -4,8 +4,6 @@ trigger="click" placement="top" class="extra-button-popover" - :offset="5" - :container="false" > <div slot="popover"> <div class="dropdown-menu"> diff --git a/src/components/moderation_tools/moderation_tools.vue b/src/components/moderation_tools/moderation_tools.vue index d97ca3aa..006d6373 100644 --- a/src/components/moderation_tools/moderation_tools.vue +++ b/src/components/moderation_tools/moderation_tools.vue @@ -3,9 +3,7 @@ <v-popover trigger="click" class="moderation-tools-popover" - :container="false" placement="bottom-end" - :offset="5" @show="showDropDown = true" @hide="showDropDown = false" > diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 7053e2cb..1b383558 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -179,9 +179,6 @@ ref="statusPreviewPopper" popover-class="status-popover" placement="top-start" - trigger="hover" - :offset="5" - :container="false" :popper-options="{ modifiers: { preventOverflow: { padding: 50, boundariesElement: 'viewport' }, diff --git a/src/main.js b/src/main.js index 7923ffe8..cfa683e5 100644 --- a/src/main.js +++ b/src/main.js @@ -29,6 +29,7 @@ import VueClickOutside from 'v-click-outside' import PortalVue from 'portal-vue' import VBodyScrollLock from './directives/body_scroll_lock' import VTooltip from 'v-tooltip' +import MobileDetect from 'mobile-detect' import afterStoreSetup from './boot/after_store.js' @@ -41,7 +42,13 @@ Vue.use(VueChatScroll) Vue.use(VueClickOutside) Vue.use(PortalVue) Vue.use(VBodyScrollLock) -Vue.use(VTooltip) +Vue.use(VTooltip, { + popover: { + defaultTrigger: (new MobileDetect(window.navigator.userAgent)).mobile() ? 'click' : 'hover', + defaultContainer: false, + defaultOffset: 5 + } +}) const i18n = new VueI18n({ // By default, use the browser locale, we will update it if neccessary @@ -4836,6 +4836,11 @@ mkpath@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/mkpath/-/mkpath-1.0.0.tgz#ebb3a977e7af1c683ae6fda12b545a6ba6c5853d" +mobile-detect@^1.4.3: + version "1.4.3" + resolved "https://registry.yarnpkg.com/mobile-detect/-/mobile-detect-1.4.3.tgz#e436a3839f5807dd4d3cd4e081f7d3a51ffda2dd" + integrity sha512-UaahPNLllQsstHOEHAmVnTHCMQrAS9eL5Qgdi50QrYz6UgGk+Xziz2udz2GN6NYcyODcPLnasC7a7s6R2DjiaQ== + mocha-nightwatch@3.2.2: version "3.2.2" resolved "https://registry.yarnpkg.com/mocha-nightwatch/-/mocha-nightwatch-3.2.2.tgz#91bcb9b3bde057dd7677c78125e491e58d66647c" |