Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
cto
g1
Commits
f56ced36
Commit
f56ced36
authored
Jul 20, 2018
by
Tejesh
🖖
Browse files
use deepmerge properly
parent
08c6f51e
Pipeline
#55358
passed with stage
in 2 minutes and 29 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/mapviewer.js
View file @
f56ced36
...
...
@@ -5,8 +5,8 @@ import fetch from 'unfetch' // To do Ajax requests with browser na
import
'
regenerator-runtime/runtime
'
// To support async polyfill by babel
import
{
scale
}
from
'
./scale.js
'
import
deepmerge
from
'
deepmerge
'
import
deepclone
from
'
lodash/cloneDeep
'
;
import
isPlainObject
from
"
is-plain-object
"
;
import
deepclone
from
'
lodash/cloneDeep
'
import
isPlainObject
from
"
is-plain-object
"
// To add to window
...
...
@@ -47,7 +47,7 @@ export var MapViewer = class MapViewer {
self
.
mapDiv
=
typeof
(
self
.
options
.
id
)
===
'
string
'
?
document
.
getElementById
(
self
.
options
.
id
)
:
self
.
options
.
id
// Apply defaults to the configuration
deepmerge
(
defaults
,
self
.
options
,
{
self
.
options
=
deepmerge
(
defaults
,
self
.
options
,
{
isMergeableObject
:
isPlainObject
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment