Skip to content

Commit 7567128

Browse files
authored
Merge pull request #128 from OutSystems/rc1.6.4
Merge release 1.6.4
2 parents 660525b + 1ebbabe commit 7567128

6 files changed

Lines changed: 18 additions & 13 deletions

File tree

.vscode/settings.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
2-
"5diffEditor.ignoreTrimWhitespace": true,
2+
"diffEditor.ignoreTrimWhitespace": true,
33
"files.autoSave": "off",
44
"editor.minimap.maxColumn": 170,
55
"editor.wordWrapColumn": 170,
6-
"editor.formatOnSave": false,
6+
"editor.formatOnSave": true,
77
"editor.codeActionsOnSave": {
88
"source.fixAll.eslint": true
99
},
1010
"css.lint.fontFaceProperties": "ignore",
11+
"scss.lint.fontFaceProperties": "ignore",
1112
"editor.defaultFormatter": "esbenp.prettier-vscode",
1213
"[html]": {
1314
"editor.defaultFormatter": "vscode.html-language-features"
@@ -21,7 +22,10 @@
2122
"[json]": {
2223
"editor.defaultFormatter": "vscode.json-language-features"
2324
},
25+
"[scss]": {
26+
"editor.defaultFormatter": "esbenp.prettier-vscode"
27+
},
2428
"[jsonc]": {
2529
"editor.defaultFormatter": "vscode.json-language-features"
2630
}
27-
}
31+
}

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
@gnbm @joselrio @BenOsodrac @bmarcelino-fe @rugoncalves @JoaoFerreira-FrontEnd @OS-giulianasilva
1+
* @gnbm @joselrio @BenOsodrac @bmarcelino-fe @rugoncalves @JoaoFerreira-FrontEnd @OS-giulianasilva

jobs/azure-pipelines-reactive.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ stages:
1818
- bash: |
1919
declare BRANCH
2020
BRANCH=$(system.pullRequest.sourceBranch)
21-
echo "Map_Regressions_${BRANCH//[-]/}"
22-
echo "##vso[task.setvariable variable=branch;]Map_Regressions_${BRANCH//[-]/}"
23-
echo "##vso[task.setvariable variable=module;isoutput=true]Map_Regressions_${BRANCH//[-]/}"
21+
echo "Maps_Automation_${BRANCH//[-]/}"
22+
echo "##vso[task.setvariable variable=branch;]Maps_Automation_${BRANCH//[-]/}"
23+
echo "##vso[task.setvariable variable=module;isoutput=true]Maps_Automation_${BRANCH//[-]/}"
2424
name: branch_name
2525
2626
#Ping sample test page

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "outsystems-maps",
3-
"version": "1.6.3",
3+
"version": "1.6.4",
44
"description": "Outsystems Maps",
55
"license": "Apache v2.0",
66
"scripts": {

src/OSFramework/Maps/Constants.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// eslint-disable-next-line @typescript-eslint/no-unused-vars
22
namespace OSFramework.Maps.Constants {
33
/* OutSystems Maps Version */
4-
export const OSMapsVersion = '1.6.3';
4+
export const OSMapsVersion = '1.6.4';
5+
56
}

src/Providers/Maps/Google/Marker/Marker.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ namespace Provider.Maps.Google.Marker {
8282
OSFramework.Maps.Enum.ErrorCodes.LIB_FailedGeocodingMarker,
8383
`Location of the Marker can't be empty.`
8484
);
85-
return;
8685
} else {
8786
// Let's return a promise that will be resolved or rejected according to the result
8887
return new Promise((resolve, reject) => {
@@ -201,6 +200,9 @@ namespace Provider.Maps.Google.Marker {
201200
map: this.map.provider
202201
});
203202

203+
// Call this method so icon respects the sizes that are on config
204+
this._setIconSize();
205+
204206
// We can only set the events on the provider after its creation
205207
this._setMarkerEvents();
206208

@@ -255,14 +257,12 @@ namespace Provider.Maps.Google.Marker {
255257
case OSFramework.Maps.Enum.OS_Config_Marker.allowDrag:
256258
return this._provider.setDraggable(value);
257259
case OSFramework.Maps.Enum.OS_Config_Marker.iconHeight:
260+
case OSFramework.Maps.Enum.OS_Config_Marker.iconWidth:
258261
this._setIconSize();
259262
return;
260263
case OSFramework.Maps.Enum.OS_Config_Marker.iconUrl:
261264
this._setIcon(value);
262265
return;
263-
case OSFramework.Maps.Enum.OS_Config_Marker.iconWidth:
264-
this._setIconSize();
265-
return;
266266
case OSFramework.Maps.Enum.OS_Config_Marker.label:
267267
return this._provider.setLabel(value);
268268
case OSFramework.Maps.Enum.OS_Config_Marker.title:

0 commit comments

Comments
 (0)