diff --git a/CHANGELOG.md b/CHANGELOG.md index 853fed305..cc7976306 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ [#1097](https://github.com/nextcloud/cookbook/pull/1097) @christianlupus - Ordering corrected for mobile and printout versions [#1107](https://github.com/nextcloud/cookbook/pull/1107) @christianlupus +- Less intrusive sharp popup (suggestion menu for reference autocomplete) + [#1098](https://github.com/nextcloud/cookbook/pull/1098) @MarcelRobitaille ### Fixed - Prevent slow loading of recipes due to iteration over all files diff --git a/package-lock.json b/package-lock.json index f2197d0e1..a22973d70 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,6 +14,7 @@ "@nextcloud/moment": "^1.1.1", "@nextcloud/router": "^2.0.0", "@nextcloud/vue": "^5.1.0", + "caret-pos": "2.0.0", "linkifyjs": "^3.0.1", "lozad": "^1.16.0", "sass": "^1.5.0", @@ -2628,6 +2629,11 @@ "url": "https://opencollective.com/browserslist" } }, + "node_modules/caret-pos": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/caret-pos/-/caret-pos-2.0.0.tgz", + "integrity": "sha512-cOIiBS1SjzXg+LXSiQAzGg89dHDKq/y4c30+tB5hkVN7GbtXh1BNypOmjti4LwAWQrvP4y+bNG7RJFxLGoL3bA==" + }, "node_modules/caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", @@ -7128,7 +7134,6 @@ "version": "3.3.4", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", - "dev": true, "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -14296,6 +14301,11 @@ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001314.tgz", "integrity": "sha512-0zaSO+TnCHtHJIbpLroX7nsD+vYuOVjl3uzFbJO1wMVbuveJA0RK2WcQA9ZUIOiO0/ArMiMgHJLxfEZhQiC0kw==" }, + "caret-pos": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/caret-pos/-/caret-pos-2.0.0.tgz", + "integrity": "sha512-cOIiBS1SjzXg+LXSiQAzGg89dHDKq/y4c30+tB5hkVN7GbtXh1BNypOmjti4LwAWQrvP4y+bNG7RJFxLGoL3bA==" + }, "caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", @@ -17771,8 +17781,7 @@ "nanoid": { "version": "3.3.4", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", - "dev": true + "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==" }, "natural-compare": { "version": "1.4.0", diff --git a/package.json b/package.json index d36a6b12a..4be96f51c 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "@nextcloud/moment": "^1.1.1", "@nextcloud/router": "^2.0.0", "@nextcloud/vue": "^5.1.0", + "caret-pos": "2.0.0", "linkifyjs": "^3.0.1", "lozad": "^1.16.0", "sass": "^1.5.0", diff --git a/src/components/EditInputField.vue b/src/components/EditInputField.vue index fb81163c9..3e97c38ee 100644 --- a/src/components/EditInputField.vue +++ b/src/components/EditInputField.vue @@ -1,5 +1,5 @@ + + diff --git a/src/main.js b/src/main.js index 68cb99092..bf72c48b1 100644 --- a/src/main.js +++ b/src/main.js @@ -37,6 +37,9 @@ window.escapeHTML = helpers.escapeHTML Vue.prototype.$window = window Vue.prototype.OC = OC +// eslint-disable-next-line no-undef +Vue.prototype.verboseDebugLogging = verboseDebugLogging + // Markdown for Vue Vue.use(VueShowdown, { // set default flavor for Markdown diff --git a/webpack.config.js b/webpack.config.js index 99507f104..2eeea9c77 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -10,7 +10,9 @@ const { CleanWebpackPlugin } = require('clean-webpack-plugin') const webpack = require('webpack') const webpackConfig = require('@nextcloud/webpack-vue-config') const { merge } = require('webpack-merge') -const { env } = require('process') + +const buildMode = process.env.NODE_ENV +const isDev = buildMode === 'development' function cookbookConfig (env) { const config = merge(webpackConfig, { @@ -25,6 +27,7 @@ function cookbookConfig (env) { new CleanWebpackPlugin(), new webpack.DefinePlugin({ '__webpack_use_dev_server__': env.dev_server || false, + 'verboseDebugLogging': isDev && (process.env.VERBOSE || false), }), ], resolve: {