Skip to content

Commit a45e995

Browse files
committed
BS5: migrate remaining dropdowns
1 parent 710ed6c commit a45e995

File tree

3 files changed

+8
-12
lines changed

3 files changed

+8
-12
lines changed

assets/src/components/FeatureToolbar.js

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,12 @@ export default class FeatureToolbar extends HTMLElement {
5757
5858
${this.isFeatureExportable
5959
? html`<div class="btn-group feature-export">
60-
<button type="button" class="btn btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false" data-bs-toggle="tooltip" data-bs-title="${lizDict['attributeLayers.toolbar.btn.data.export.title']}">
60+
<button type="button" class="btn btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false" title="${lizDict['attributeLayers.toolbar.btn.data.export.title']}">
6161
<i class="icon-download"></i>
62-
<span class="caret"></span>
6362
</button>
64-
<ul class="dropdown-menu pull-right" role="menu">
63+
<ul class="dropdown-menu">
6564
${this._downloadFormats.map((format) =>
66-
html`<li><a href="#" @click=${() => this.export(format)}>${format}</a></li>`)}
65+
html`<li><a class="dropdown-item" href="#" @click=${() => this.export(format)}>${format}</a></li>`)}
6766
</ul>
6867
</div>`
6968
: ''
@@ -104,13 +103,12 @@ export default class FeatureToolbar extends HTMLElement {
104103
${this.editableChildrenLayers.length
105104
? html`
106105
<div class="btn-group feature-create-child" style="margin-left: 0px;">
107-
<button type="button" class="btn btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false" data-bs-title="${lizDict['attributeLayers.toolbar.btn.data.createFeature.title']}">
106+
<button type="button" class="btn btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false" title="${lizDict['attributeLayers.toolbar.btn.data.createFeature.title']}">
108107
<i class="icon-plus-sign"></i>
109-
<span class="caret"></span>
110108
</button>
111-
<ul class="dropdown-menu" role="menu">
109+
<ul class="dropdown-menu">
112110
${this.editableChildrenLayers.map((child) =>
113-
html`<li><a data-child-layer-id="${child.layerId}" @click=${() => this.createChild(child)}>${child.title}</a></li>`)}
111+
html`<li><a class="dropdown-item" href="#" data-child-layer-id="${child.layerId}" @click=${() => this.createChild(child)}>${child.title}</a></li>`)}
114112
</ul>
115113
</div>
116114
`

assets/src/components/SelectionTool.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ export default class SelectionTool extends HTMLElement {
8686
<div class="btn-group dropup selectiontool-export" role="group" title="${mainLizmap.selectionTool.isExportable ? '' : lizDict['switcher.layer.export.warn']}">
8787
<button type="button" class="btn btn-sm dropdown-toggle" ?disabled=${ !mainLizmap.selectionTool.isExportable } data-bs-toggle="dropdown" aria-expanded="false">
8888
${lizDict['switcher.layer.export.title']}
89-
<span class="caret"></span>
9089
</button>
9190
<ul class="selectiontool-export-formats dropdown-menu dropdown-menu-right" role="menu">
9291
<li><a href="#" class="btn-export-selection dropdown-item">GeoJSON</a></li>

assets/src/legacy/attributeTable.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1144,7 +1144,7 @@ var lizAttributeTable = function() {
11441144
childCreateButtonItems.push(childButtonItem);
11451145

11461146
// Link parent with the selected features of the child
1147-
layerLinkButtonItems.push('<li><a href="#' + lizMap.cleanName(isNToM ? pivotConfig[0] : childLayerName) + '" class="btn-linkFeatures-attributeTable">' + (isNToM ? pivotConfig[1].title : childLayerConfig.title) +'</a></li>' );
1147+
layerLinkButtonItems.push('<li><a href="#' + lizMap.cleanName(isNToM ? pivotConfig[0] : childLayerName) + '" class="btn-linkFeatures-attributeTable dropdown-item">' + (isNToM ? pivotConfig[1].title : childLayerConfig.title) +'</a></li>' );
11481148
}
11491149
}
11501150
}
@@ -1163,9 +1163,8 @@ var lizAttributeTable = function() {
11631163
layerLinkButton+= '&nbsp;<div class="btn-group" role="group" >';
11641164
layerLinkButton+= ' <button type="button" class="btn btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">';
11651165
layerLinkButton+= lizDict['attributeLayers.toolbar.btn.data.linkFeatures.title'];
1166-
layerLinkButton+= ' <span class="caret"></span>';
11671166
layerLinkButton+= ' </button>';
1168-
layerLinkButton+= ' <ul class="dropdown-menu" role="menu">';
1167+
layerLinkButton+= ' <ul class="dropdown-menu">';
11691168
for( var i in layerLinkButtonItems){
11701169
var li = layerLinkButtonItems[i];
11711170
layerLinkButton+= li;

0 commit comments

Comments
 (0)