Compare commits

...

2 Commits

Author SHA1 Message Date
Jamie V
0d8a66c9e4 catching errors while retrieving git info 2022-06-16 13:19:14 -07:00
Jesse Mazzella
60d021ef82 Fix imagery filter slider drag in flexible layouts (#5326) (#5350) 2022-06-16 12:25:29 -07:00
3 changed files with 22 additions and 7 deletions

View File

@@ -14,6 +14,8 @@
type="range" type="range"
min="0" min="0"
max="500" max="500"
draggable="true"
@dragstart.stop.prevent
@change="notifyFiltersChanged" @change="notifyFiltersChanged"
@input="notifyFiltersChanged" @input="notifyFiltersChanged"
> >
@@ -24,6 +26,8 @@
type="range" type="range"
min="0" min="0"
max="500" max="500"
draggable="true"
@dragstart.stop.prevent
@change="notifyFiltersChanged" @change="notifyFiltersChanged"
@input="notifyFiltersChanged" @input="notifyFiltersChanged"
> >

View File

@@ -21,7 +21,11 @@
*****************************************************************************/ *****************************************************************************/
<template> <template>
<div class="h-local-controls h-local-controls--overlay-content h-local-controls--menus-aligned c-local-controls--show-on-hover"> <div
class="h-local-controls h-local-controls--overlay-content h-local-controls--menus-aligned c-local-controls--show-on-hover"
role="toolbar"
aria-label="Image controls"
>
<imagery-view-menu-switcher <imagery-view-menu-switcher
:icon-class="'icon-brightness'" :icon-class="'icon-brightness'"
:title="'Brightness and contrast'" :title="'Brightness and contrast'"

View File

@@ -7,12 +7,19 @@ const webpack = require('webpack');
const MiniCssExtractPlugin = require("mini-css-extract-plugin"); const MiniCssExtractPlugin = require("mini-css-extract-plugin");
const {VueLoaderPlugin} = require('vue-loader'); const {VueLoaderPlugin} = require('vue-loader');
const gitRevision = require('child_process') let gitRevision = 'error-retrieving-revision';
.execSync('git rev-parse HEAD') let gitBranch = 'error-retrieving-branch';
.toString().trim();
const gitBranch = require('child_process') try {
.execSync('git rev-parse --abbrev-ref HEAD') gitRevision = require('child_process')
.toString().trim(); .execSync('git rev-parse HEAD')
.toString().trim();
gitBranch = require('child_process')
.execSync('git rev-parse --abbrev-ref HEAD')
.toString().trim();
} catch (err) {
console.warn(err);
}
/** @type {import('webpack').Configuration} */ /** @type {import('webpack').Configuration} */
const config = { const config = {