Code improvements and clean-up

OutSystems · Feb 27, 2024 · 7974d58 · 7974d58
1 parent 4ade74d
commit 7974d58
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/src/OSFramework/Maps/Event/Marker/MarkerEventsManager.ts b/src/OSFramework/Maps/Event/Marker/MarkerEventsManager.ts
@@ -72,6 +72,8 @@ namespace OSFramework.Maps.Event.Marker {
 				// The following events are being deprecated. They should get removed soon.
 				switch (eventType) {
 					case MarkerEventType.Initialized:
+					case MarkerEventType.OnMouseout:
+					case MarkerEventType.OnMouseover:
 						handlerEvent.trigger(
 							this._marker.map.widgetId, // Id of Map block that was initialized
 							this._marker.widgetId || this._marker.uniqueId, // Id of Marker block that was initialized
@@ -87,14 +89,6 @@ namespace OSFramework.Maps.Event.Marker {
 							...args // Coordinates retrieved from the marker event that got triggered
 						);
 						break;
-					case MarkerEventType.OnMouseout:
-					case MarkerEventType.OnMouseover:
-						handlerEvent.trigger(
-							this._marker.map.widgetId, // Id of Map block that was clicked
-							this._marker.widgetId || this._marker.uniqueId, // Id of Marker block that was clicked
-							this._marker.index // Index of Marker block that was clicked
-						);
-						break;
 					case MarkerEventType.OnEventTriggered:
 						handlerEvent.trigger(
 							this._marker.map.widgetId, // Id of Map block that triggered the event

diff --git a/src/OutSystems/Maps/MapAPI/MarkerManager.Events.ts b/src/OutSystems/Maps/MapAPI/MarkerManager.Events.ts
@@ -60,12 +60,11 @@ namespace OutSystems.Maps.MapAPI.MarkerManager.Events {
 	 * @export
 	 * @param {string} markerId Marker where the events will get attached
 	 * @param {OSFramework.Maps.Event.Marker.MarkerEventType} eventName name of the event to get attached
-	 * @param {OSFramework.Maps.Callbacks.Marker.ClickEvent} callback to be invoked when the event occurs
+	 * @param {OSFramework.Maps.Callbacks.Marker.Event} callback to be invoked when the event occurs
 	 */
 	export function Subscribe(
 		markerId: string,
 		eventName: OSFramework.Maps.Event.Marker.MarkerEventType,
-		// eslint-disable-next-line
 		callback: OSFramework.Maps.Callbacks.Marker.Event
 	): string {
 		const responseObj = {
@@ -93,7 +92,7 @@ namespace OutSystems.Maps.MapAPI.MarkerManager.Events {
 	 * @export
 	 * @param {string} eventUniqueId Id of the Event to be attached
 	 * @param {OSFramework.Maps.Event.Map.MapEventType} eventName name fo the event to be attached
-	 * @param {MapAPI.Callbacks.OSMap.Event} callback callback to be invoked when the event occurs
+	 * @param {OSFramework.Maps.Callbacks.Marker.Event} callback callback to be invoked when the event occurs
 	 */
 	export function SubscribeByUniqueId(
 		eventUniqueId: string,
@@ -150,12 +149,11 @@ namespace OutSystems.Maps.MapAPI.MarkerManager.Events {
 	 * @export
 	 * @param {string} eventUniqueId Map where the event will be removed
 	 * @param {OSFramework.Maps.Event.Map.MapEventType} eventName name of the event to be removed
-	 * @param {MapAPI.Callbacks.OSMap.Event} callback callback that will be removed
+	 * @param {OSFramework.Maps.Callbacks.Marker.Event} callback callback that will be removed
 	 */
 	export function Unsubscribe(
 		eventUniqueId: string,
 		eventName: OSFramework.Maps.Event.Marker.MarkerEventType,
-		// eslint-disable-next-line
 		callback: OSFramework.Maps.Callbacks.Marker.Event
 	): void {
 		const markerId = GetMarkerIdByEventUniqueId(eventUniqueId);