Skip to content

Commit 8b7daf0

Browse files
committed
Merge remote-tracking branch 'origin/master' into 5291-imagery-view-does-not-discard-old-images-when-they-fall-out-of-bounds-1
2 parents 8e49a8e + 451ca07 commit 8b7daf0

File tree

7 files changed

+390
-71
lines changed

7 files changed

+390
-71
lines changed

e2e/tests/plugins/imagery/exampleImagery.e2e.spec.js

+340-36
Large diffs are not rendered by default.

package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@
2525
"eslint": "8.13.0",
2626
"eslint-plugin-compat": "4.0.2",
2727
"eslint-plugin-playwright": "0.9.0",
28-
"eslint-plugin-vue": "9.1.0",
28+
"eslint-plugin-vue": "9.1.1",
2929
"eslint-plugin-you-dont-need-lodash-underscore": "6.12.0",
3030
"eventemitter3": "1.2.0",
3131
"express": "4.13.1",
3232
"file-saver": "2.0.5",
3333
"git-rev-sync": "3.0.2",
3434
"html2canvas": "1.4.1",
3535
"imports-loader": "0.8.0",
36-
"jasmine-core": "4.1.1",
36+
"jasmine-core": "4.2.0",
3737
"jsdoc": "3.5.5",
3838
"karma": "6.3.20",
3939
"karma-chrome-launcher": "3.1.1",
@@ -49,7 +49,7 @@
4949
"lighthouse": "9.6.1",
5050
"location-bar": "3.0.1",
5151
"lodash": "4.17.21",
52-
"mini-css-extract-plugin": "2.6.0",
52+
"mini-css-extract-plugin": "2.6.1",
5353
"moment": "2.29.3",
5454
"moment-duration-format": "2.3.2",
5555
"moment-timezone": "0.5.34",
@@ -70,7 +70,7 @@
7070
"vue-loader": "15.9.8",
7171
"vue-template-compiler": "2.6.14",
7272
"webpack": "5.68.0",
73-
"webpack-cli": "4.9.2",
73+
"webpack-cli": "4.10.0",
7474
"webpack-dev-middleware": "5.3.3",
7575
"webpack-hot-middleware": "2.25.1",
7676
"webpack-merge": "5.8.0"

src/plugins/imagery/components/FilterSettings.vue

+4
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
type="range"
1515
min="0"
1616
max="500"
17+
draggable="true"
18+
@dragstart.stop.prevent
1719
@change="notifyFiltersChanged"
1820
@input="notifyFiltersChanged"
1921
>
@@ -24,6 +26,8 @@
2426
type="range"
2527
min="0"
2628
max="500"
29+
draggable="true"
30+
@dragstart.stop.prevent
2731
@change="notifyFiltersChanged"
2832
@input="notifyFiltersChanged"
2933
>

src/plugins/imagery/components/ImageControls.vue

+5-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@
2121
*****************************************************************************/
2222

2323
<template>
24-
<div class="h-local-controls h-local-controls--overlay-content h-local-controls--menus-aligned c-local-controls--show-on-hover">
24+
<div
25+
class="h-local-controls h-local-controls--overlay-content h-local-controls--menus-aligned c-local-controls--show-on-hover"
26+
role="toolbar"
27+
aria-label="Image controls"
28+
>
2529
<imagery-view-menu-switcher
2630
:icon-class="'icon-brightness'"
2731
:title="'Brightness and contrast'"

src/styles/_constants.scss

+25-27
Large diffs are not rendered by default.

src/styles/_glyphs.scss

+1-3
Original file line numberDiff line numberDiff line change
@@ -241,12 +241,10 @@
241241
.bg-icon-tabular { @include glyphBg($bg-icon-tabular); }
242242
.bg-icon-tabular-lad { @include glyphBg($bg-icon-tabular-lad); }
243243
.bg-icon-tabular-lad-set { @include glyphBg($bg-icon-tabular-lad-set); }
244-
.bg-icon-tabular-realtime { @include glyphBg($bg-icon-tabular-realtime); }
245244
.bg-icon-tabular-scrolling { @include glyphBg($bg-icon-tabular-scrolling); }
246245
.bg-icon-telemetry { @include glyphBg($bg-icon-telemetry); }
247246
.bg-icon-timeline { @include glyphBg($bg-icon-timeline); }
248247
.bg-icon-timer { @include glyphBg($bg-icon-timer); }
249-
.bg-icon-topic { @include glyphBg($bg-icon-topic); }
250248
.bg-icon-box-with-dashed-lines { @include glyphBg($bg-icon-box-with-dashed-lines); }
251249
.bg-icon-summary-widget { @include glyphBg($bg-icon-summary-widget); }
252250
.bg-icon-notebook { @include glyphBg($bg-icon-notebook); }
@@ -264,5 +262,5 @@
264262
.bg-icon-map { @include glyphBg($bg-icon-map); }
265263
.bg-icon-plan { @include glyphBg($bg-icon-plan); }
266264
.bg-icon-timelist { @include glyphBg($bg-icon-timelist); }
267-
.bg-icon-notebook-shift-log { @include glyphBg($bg-icon-notebook-shift-log); }
268265
.bg-icon-plot-scatter { @include glyphBg($bg-icon-plot-scatter); }
266+
.bg-icon-notebook-shift-log { @include glyphBg($bg-icon-notebook-shift-log); }

webpack.dev.js

+11
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,17 @@ const webpack = require('webpack');
66

77
module.exports = merge(common, {
88
mode: 'development',
9+
watchOptions: {
10+
// Since we use require.context, webpack is watching the entire directory.
11+
// We need to exclude any files we don't want webpack to watch.
12+
// See: https://webpack.js.org/configuration/watch/#watchoptions-exclude
13+
ignored: [
14+
'**/{node_modules,dist,docs,e2e}', // All files in node_modules, dist, docs, e2e,
15+
'**/{*.yml,Procfile,webpack*.js,babel*.js,package*.json,tsconfig.json,jsdoc.json}', // Config files
16+
'**/*.{sh,md,png,ttf,woff,svg}', // Non source files
17+
'**/.*' // dotfiles and dotfolders
18+
]
19+
},
920
resolve: {
1021
alias: {
1122
"vue": path.join(__dirname, "node_modules/vue/dist/vue.js")

0 commit comments

Comments
 (0)