Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2025-02-25 20:07:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3233 from samme/samme-patch-1

Browse source 
Fix wrong Extend target in MergeXHRSettings
This commit is contained in:
Richard Davey 2018-02-15 13:59:21 +00:00 • committed by GitHub
commit 39c415424d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/loader/MergeXHRSettings.js
View file

@ -23,7 +23,7 @@ var XHRSettings = require('./XHRSettings');
*/ */
var MergeXHRSettings = function (global, local) var MergeXHRSettings = function (global, local)
{ {
var output = (global === undefined) ? XHRSettings() : Extend(global); var output = (global === undefined) ? XHRSettings() : Extend({}, global);
if (local) if (local)
{ {