Skip to content

Commit 72228b6

Browse files
dennisfranciseszkadev
authored andcommitted
browser: context-menus: don't preselect the first entry
Signed-off-by: Dennis Francis <dennis.francis@collabora.com> Change-Id: Id225258dc2f24343d05c9991e27f168d8574e6dc
1 parent 55cb54a commit 72228b6

7 files changed

Lines changed: 15 additions & 1 deletion

File tree

browser/src/canvas/sections/CommentSection.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1170,6 +1170,8 @@ export class Comment extends CanvasSectionObject {
11701170
callback,
11711171
'',
11721172
false,
1173+
false,
1174+
true,
11731175
);
11741176
}
11751177

browser/src/control/Control.Header.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ export class Header extends CanvasSectionObject {
175175
'',
176176
false,
177177
true,
178+
true,
178179
);
179180
}
180181
}

browser/src/control/Control.PartsPreview.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,8 @@ window.L.Control.PartsPreview = window.L.Control.extend({
316316
callback,
317317
'',
318318
false,
319+
false,
320+
true,
319321
);
320322
}, this);
321323

@@ -448,6 +450,8 @@ window.L.Control.PartsPreview = window.L.Control.extend({
448450
callback,
449451
'',
450452
false,
453+
false,
454+
true,
451455
);
452456
}, this);
453457

browser/src/control/Control.Tabs.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,8 @@ window.L.Control.Tabs = window.L.Control.extend({
405405
callback,
406406
'bottom',
407407
false,
408+
false,
409+
true,
408410
);
409411
},
410412

browser/src/control/HRuler.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1195,6 +1195,8 @@ class HRuler extends Ruler {
11951195
callback,
11961196
'',
11971197
false,
1198+
false,
1199+
true,
11981200
);
11991201
}
12001202

browser/src/control/jsdialog/Control.ContextMenu.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@ class ContextMenuControl extends JSControl {
223223
'',
224224
false,
225225
true /* earlyCallbackCall? */,
226+
true /* noDefaultSelection? */,
226227
);
227228
}
228229

browser/src/control/jsdialog/Util.Dropdown.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ JSDialog.OpenDropdown = function (
3333
popupAnchor: string,
3434
isSubmenu: boolean,
3535
earlyCallbackCall?: boolean,
36+
noDefaultSelection?: boolean,
3637
) {
3738
const json = {
3839
id: _createDropdownId(id),
@@ -87,7 +88,7 @@ JSDialog.OpenDropdown = function (
8788
}
8889

8990
const shouldSelectFirstEntry =
90-
entries.length > 0
91+
!noDefaultSelection && entries.length > 0
9192
? !entries.some((entry) => entry.selected === true)
9293
: false;
9394
let initialSelectedId;
@@ -223,6 +224,7 @@ JSDialog.OpenDropdown = function (
223224
'top-end',
224225
true,
225226
earlyCallbackCall,
227+
noDefaultSelection,
226228
);
227229
lastSubMenuOpened = subMenuId;
228230

0 commit comments

Comments
 (0)