Orasund/elm-ui-widgets
1
1
Fork 0
mirror of https://github.com/Orasund/elm-ui-widgets.git synced 2024-11-22 04:58:49 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #81 from orus-io/explorer-relative-url-in-flags

Browse Source 
explorer: fix loading null settings from localStorage
This commit is contained in:
Orasund 2021-06-14 18:48:38 +02:00 committed by GitHub
commit bb7538e413
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 91 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
docs/3.0.0/main.js
View File

@ -17032,7 +17032,10 @@ var $author$project$UIExplorer$Settings = function (dark) {
};
var $elm$json$Json$Decode$bool = _Json_decodeBool;
var $elm$json$Json$Decode$decodeString = _Json_runOnString;
var $author$project$UIExplorer$decodeSettings = A2(
var $author$project$UIExplorer$decodeSettings = $elm$json$Json$Decode$oneOf(
_List_fromArray(
[
A2(
$elm$json$Json$Decode$field,
'settings',
A2(
@ -17043,17 +17046,26 @@ var $author$project$UIExplorer$decodeSettings = A2(
A2(
$elm$json$Json$Decode$map,
$author$project$UIExplorer$Settings,
A2($elm$json$Json$Decode$field, 'dark', $elm$json$Json$Decode$bool)),
$elm$json$Json$Decode$oneOf(
_List_fromArray(
[
A2($elm$json$Json$Decode$field, 'dark', $elm$json$Json$Decode$bool),
$elm$json$Json$Decode$succeed(true)
]))),
s);
if (!_v0.$) {
var settings = _v0.a;
return $elm$json$Json$Decode$succeed(settings);
} else {
return $elm$json$Json$Decode$succeed(
{a1: false});
var err = _v0.a;
return $elm$json$Json$Decode$fail(
$elm$json$Json$Decode$errorToString(err));
}
},
$elm$json$Json$Decode$string));
$elm$json$Json$Decode$string)),
$elm$json$Json$Decode$succeed(
{a1: false})
]));
var $author$project$Main$decodeFlags = A3(
$elm$json$Json$Decode$map2,
$author$project$Main$Flags,

22
docs/main.js
View File

@ -17032,7 +17032,10 @@ var $author$project$UIExplorer$Settings = function (dark) {
};
var $elm$json$Json$Decode$bool = _Json_decodeBool;
var $elm$json$Json$Decode$decodeString = _Json_runOnString;
var $author$project$UIExplorer$decodeSettings = A2(
var $author$project$UIExplorer$decodeSettings = $elm$json$Json$Decode$oneOf(
_List_fromArray(
[
A2(
$elm$json$Json$Decode$field,
'settings',
A2(
@ -17043,17 +17046,26 @@ var $author$project$UIExplorer$decodeSettings = A2(
A2(
$elm$json$Json$Decode$map,
$author$project$UIExplorer$Settings,
A2($elm$json$Json$Decode$field, 'dark', $elm$json$Json$Decode$bool)),
$elm$json$Json$Decode$oneOf(
_List_fromArray(
[
A2($elm$json$Json$Decode$field, 'dark', $elm$json$Json$Decode$bool),
$elm$json$Json$Decode$succeed(true)
]))),
s);
if (!_v0.$) {
var settings = _v0.a;
return $elm$json$Json$Decode$succeed(settings);
} else {
return $elm$json$Json$Decode$succeed(
{a1: false});
var err = _v0.a;
return $elm$json$Json$Decode$fail(
$elm$json$Json$Decode$errorToString(err));
}
},
$elm$json$Json$Decode$string));
$elm$json$Json$Decode$string)),
$elm$json$Json$Decode$succeed(
{a1: false})
]));
var $author$project$Main$decodeFlags = A3(
$elm$json$Json$Decode$map2,
$author$project$Main$Flags,

15
explorer/src/UIExplorer.elm
View File

@ -69,23 +69,30 @@ type alias Settings =
decodeSettings : Decode.Decoder Settings
decodeSettings =
Decode.string
Decode.oneOf
[ Decode.string
|> Decode.andThen
(\s ->
case
Decode.decodeString
(Decode.map Settings
(Decode.field "dark" Decode.bool)
(Decode.oneOf
[ Decode.field "dark" Decode.bool
, Decode.succeed True
]
)
)
s
of
Ok settings ->
Decode.succeed settings
Err _ ->
Decode.succeed { dark = False }
Err err ->
Decode.fail <| Decode.errorToString err
)
|> Decode.field "settings"
, Decode.succeed { dark = False }
]
saveSettings : Settings -> Cmd msg