Skip to content

Commit

Permalink
Compare direct types
Browse files Browse the repository at this point in the history
  • Loading branch information
cmdcolin committed Jul 30, 2018
1 parent 7c9173a commit 7c94d3e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/JBrowse/ConfigManager.js
Expand Up @@ -282,10 +282,10 @@ _mergeConfigs: function( a, b ) {
&& ("object" == typeof a[prop]) ) {
a[prop] = Util.deepUpdate( a[prop], b[prop] );
} else if(prop == 'dataRoot') {
if(typeof a[prop] == 'undefined' || a[prop] == 'data' && typeof b[prop] != 'undefined' ){
if(a[prop] === undefined || a[prop] == 'data' && b[prop] !== undefined ){
a[prop] = b[prop];
}
} else if( typeof a[prop] == 'undefined' || typeof b[prop] != 'undefined' ){
} else if( a[prop] === undefined || b[prop] !== undefined ){
a[prop] = b[prop];
}
}
Expand Down

0 comments on commit 7c94d3e

Please sign in to comment.