RetailCRM-Mirror/select2
1
0
Fork 0
mirror of synced 2024-11-22 04:56:08 +03:00
Code Issues Projects Releases Wiki Activity

perform deep merge for Defaults.set()

Browse Source
This commit is contained in:
nobodyman 2016-05-18 15:42:07 -07:00 committed by alexweissman
parent 6ff10680a6
commit 8398788069
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/select2/defaults.js vendored
View File

@ -387,7 +387,7 @@ define([
var convertedData = Utils._convertData(data);
$.extend(this.defaults, convertedData);
$.extend(true, this.defaults, convertedData);
};
var defaults = new Defaults();

18
tests/options/ajax-tests.js
View File

@ -30,3 +30,21 @@ test('options are merged recursively with default options', function (assert) {
defaults.reset();
});
test('more than one default option can be changed via set()', function(assert) {
var defaults = require('select2/defaults');
var ajaxDelay = 123;
var dataDataType = 'xml'
defaults.set('ajax--delay', ajaxDelay);
defaults.set('ajax--dataType', dataDataType);
assert.equal(
defaults.defaults.ajax.delay,
ajaxDelay
'Both ajax.delay and ajax.dataType present in defaults');
assert.equal(
defaults.defaults.ajax.dataType,
dataDataType,
'Both ajax.delay and ajax.dataType present in defaults');
defaults.reset();
});