Skip to content

Commit ad5e4c8

Browse files
nboisteaultrldhont
authored andcommitted
BS5: migrate remaining dropdowns
1 parent 89bb779 commit ad5e4c8

File tree

3 files changed

+8
-13
lines changed

3 files changed

+8
-13
lines changed

assets/src/components/FeatureToolbar.js

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,13 @@ export default class FeatureToolbar extends HTMLElement {
111111
class="btn btn-sm dropdown-toggle"
112112
data-bs-toggle="dropdown"
113113
aria-expanded="false"
114-
data-bs-toggle="tooltip"
115-
data-bs-title="${lizDict['attributeLayers.toolbar.btn.data.export.title']}"
114+
title="${lizDict['attributeLayers.toolbar.btn.data.export.title']}"
116115
>
117116
<i class="icon-download"></i>
118-
<span class="caret"></span>
119117
</button>
120-
<ul class="dropdown-menu pull-right" role="menu">
118+
<ul class="dropdown-menu">
121119
${this._downloadFormats.map((format) =>
122-
html`<li><a href="#" @click=${() => this.export(format)}>${format}</a></li>`)}
120+
html`<li><a class="dropdown-item" href="#" @click=${() => this.export(format)}>${format}</a></li>`)}
123121
</ul>
124122
</div>`
125123
: ''
@@ -196,16 +194,15 @@ export default class FeatureToolbar extends HTMLElement {
196194
class="btn btn-sm dropdown-toggle"
197195
data-bs-toggle="dropdown"
198196
aria-expanded="false"
199-
data-bs-title="${lizDict['attributeLayers.toolbar.btn.data.createFeature.title']}"
197+
title="${lizDict['attributeLayers.toolbar.btn.data.createFeature.title']}"
200198
>
201199
<i class="icon-plus-sign"></i>
202-
<span class="caret"></span>
203200
</button>
204-
<ul class="dropdown-menu" role="menu">
201+
<ul class="dropdown-menu">
205202
${this.editableChildrenLayers.map((child) =>
206203
html`
207204
<li>
208-
<a
205+
<a href="#" class="dropdown-item"
209206
data-child-layer-id="${child.layerId}"
210207
@click=${() => this.createChild(child)}
211208
>${child.title}

assets/src/components/SelectionTool.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ export default class SelectionTool extends HTMLElement {
138138
?disabled=${ !mainLizmap.selectionTool.isExportable }
139139
>
140140
${lizDict['switcher.layer.export.title']}
141-
<span class="caret"></span>
142141
</button>
143142
<ul class="selectiontool-export-formats dropdown-menu dropdown-menu-right" role="menu">
144143
<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
@@ -1073,7 +1073,7 @@ var lizAttributeTable = function() {
10731073
childCreateButtonItems.push(childButtonItem);
10741074

10751075
// Link parent with the selected features of the child
1076-
layerLinkButtonItems.push('<li><a href="#' + lizMap.cleanName(isNToM ? pivotConfig[0] : childLayerName) + '" class="btn-linkFeatures-attributeTable">' + (isNToM ? pivotConfig[1].title : childLayerConfig.title) +'</a></li>' );
1076+
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>' );
10771077
}
10781078
}
10791079
}
@@ -1092,9 +1092,8 @@ var lizAttributeTable = function() {
10921092
layerLinkButton+= '&nbsp;<div class="btn-group" role="group" >';
10931093
layerLinkButton+= ' <button type="button" class="btn btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">';
10941094
layerLinkButton+= lizDict['attributeLayers.toolbar.btn.data.linkFeatures.title'];
1095-
layerLinkButton+= ' <span class="caret"></span>';
10961095
layerLinkButton+= ' </button>';
1097-
layerLinkButton+= ' <ul class="dropdown-menu" role="menu">';
1096+
layerLinkButton+= ' <ul class="dropdown-menu">';
10981097
for( var i in layerLinkButtonItems){
10991098
var li = layerLinkButtonItems[i];
11001099
layerLinkButton+= li;

0 commit comments

Comments
 (0)