Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fleetbase/ember-ui",
"version": "0.3.1",
"version": "0.3.2",
"description": "Fleetbase UI provides all the interface components, helpers, services and utilities for building a Fleetbase extension into the Console.",
"keywords": [
"fleetbase-ui",
Expand Down Expand Up @@ -186,7 +186,8 @@
},
"pnpm": {
"patchedDependencies": {
"ember-gridstack@4.0.0": "patches/ember-gridstack@4.0.0.patch"
"ember-gridstack@4.0.0": "patches/ember-gridstack@4.0.0.patch",
"ember-leaflet": "patches/ember-leaflet.patch"
}
}
}
45 changes: 45 additions & 0 deletions patches/ember-leaflet.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
diff --git a/addon/components/marker-layer.js b/addon/components/marker-layer.js
index 132bc4876f0c2847e732fd66e79b06dedf0ea470..ae87f033f1b12301a9a892ced7e408659d76d672 100644
--- a/addon/components/marker-layer.js
+++ b/addon/components/marker-layer.js
@@ -264,13 +264,15 @@ export default class MarkerLayer extends InteractiveLayer {
arg: 'icon',
// there was an old leaflet bug where draggability is lost on icon change
updateFn(layer, value) {
- let enabled = layer.dragging.enabled();
layer.setIcon(value);
-
- if (enabled) {
- layer.dragging.enable();
- } else {
- layer.dragging.disable();
+
+ if (layer.dragging) {
+ let enabled = layer.dragging.enabled();
+ if (enabled) {
+ layer.dragging.enable();
+ } else {
+ layer.dragging.disable();
+ }
}
}
}
diff --git a/addon/components/popup-layer.js b/addon/components/popup-layer.js
index 960ca419a96bed894a420c629f43501265adc4dd..122a3cd9f0e0ac6e17595514513ee097ebff38c2 100644
--- a/addon/components/popup-layer.js
+++ b/addon/components/popup-layer.js
@@ -134,7 +134,13 @@ export default class PopupLayer extends DivOverlayLayer {
*/
@action
closePopup() {
- this._layer._close ? this._layer._close() : this._layer.close();
+ if (this._layer) {
+ if (typeof this._layer._close === 'function') {
+ this._layer._close()
+ } else if (typeof this._layer.close === 'function') {
+ this._layer.close()
+ }
+ }
}

@action
7 changes: 5 additions & 2 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading