Skip to content

Commit 5f1744d

Browse files
committed
Merge branch 'test'
2 parents 7a5fbe4 + 81b1d63 commit 5f1744d

1 file changed

Lines changed: 10 additions & 3 deletions

File tree

www/googlemaps-cdv-plugin.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2015,7 +2015,7 @@ function HTMLColor2RGBA(colorStr, defaultOpacity) {
20152015
return rgb;
20162016
}
20172017

2018-
return null;
2018+
return [0, 0, 0, defaultOpacity];
20192019
}
20202020

20212021
/**
@@ -2186,8 +2186,8 @@ externalService.launchNavigation = function(params) {
21862186
if (typeof params.to === "object" && "toUrlValue" in params.to ) {
21872187
params.to = params.to.toUrlValue();
21882188
}
2189-
params.from = params.from.replace(/\s+/g, "%20");
2190-
params.to = params.to.replace(/\s+/g, "%20");
2189+
//params.from = params.from.replace(/\s+/g, "%20");
2190+
//params.to = params.to.replace(/\s+/g, "%20");
21912191
cordova.exec(null, null, "External", 'launchNavigation', [params]);
21922192
};
21932193
/*****************************************************************************
@@ -2494,6 +2494,7 @@ const HTML_COLORS = {
24942494
"darkdyan" : "#008b8b",
24952495
"darkgoldenrod" : "#b8860b",
24962496
"darkgray" : "#a9a9a9",
2497+
"darkgrey" : "#a9a9a9",
24972498
"darkgreen" : "#006400",
24982499
"darkkhaki" : "#bdb76b",
24992500
"darkmagenta" : "#8b008b",
@@ -2505,11 +2506,13 @@ const HTML_COLORS = {
25052506
"darkseagreen" : "#8fbd8f",
25062507
"darkslateblue" : "#483d8b",
25072508
"darkslategray" : "#2f4f4f",
2509+
"darkslategrey" : "#2f4f4f",
25082510
"darkturquoise" : "#00ded1",
25092511
"darkviolet" : "#9400d3",
25102512
"deeppink" : "#ff1493",
25112513
"deepskyblue" : "#00bfff",
25122514
"dimgray" : "#696969",
2515+
"dimgrey" : "#696969",
25132516
"dodgerblue" : "#1e90ff",
25142517
"firebridk" : "#b22222",
25152518
"floralwhite" : "#fffaf0",
@@ -2520,6 +2523,7 @@ const HTML_COLORS = {
25202523
"gold" : "#ffd700",
25212524
"goldenrod" : "#daa520",
25222525
"gray" : "#808080",
2526+
"grey" : "#808080",
25232527
"green" : "#008000",
25242528
"greenyellow" : "#adff2f",
25252529
"honeydew" : "#f0fff0",
@@ -2537,12 +2541,14 @@ const HTML_COLORS = {
25372541
"lightdyan" : "#e0ffff",
25382542
"lightgoldenrodyellow" : "#fafad2",
25392543
"lightgray" : "#d3d3d3",
2544+
"lightgrey" : "#d3d3d3",
25402545
"lightgreen" : "#90ee90",
25412546
"lightpink" : "#ffb6d1",
25422547
"lightsalmon" : "#ffa07a",
25432548
"lightseagreen" : "#20b2aa",
25442549
"lightskyblue" : "#87defa",
25452550
"lightslategray" : "#778899",
2551+
"lightslategrey" : "#778899",
25462552
"lightsteelblue" : "#b0d4de",
25472553
"lightyellow" : "#ffffe0",
25482554
"lime" : "#00ff00",
@@ -2596,6 +2602,7 @@ const HTML_COLORS = {
25962602
"skyblue" : "#87deeb",
25972603
"slateblue" : "#6a5add",
25982604
"slategray" : "#708090",
2605+
"slategrey" : "#708090",
25992606
"snow" : "#fffafa",
26002607
"springgreen" : "#00ff7f",
26012608
"steelblue" : "#4682b4",

0 commit comments

Comments
 (0)