Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support passing in a selector for dropdownParent option #5622

Merged
merged 2 commits into from Aug 28, 2019
Merged

Support passing in a selector for dropdownParent option #5622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
357c2a1
Allow passing non-jQuery objects as dropdownParent
mlt Sep 25, 2018
01e68f4
Test for dropdownParent option
mlt Sep 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/js/select2/dropdown/attachBody.js
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@ define([
'../utils'
], function ($, Utils) {
function AttachBody (decorated, $element, options) {
this.$dropdownParent = options.get('dropdownParent') || $(document.body);
this.$dropdownParent = $(options.get('dropdownParent') || document.body);

decorated.call(this, $element, options);
}
Expand Down
83 changes: 83 additions & 0 deletions tests/dropdown/dropdownParent-tests.js
View file
Open in desktop
@@ -0,0 +1,83 @@
module('Dropdown - attachBody - dropdownParent option');

test('can be a selector string', function (assert) {
assert.expect(1);

var $ = require('jquery');

var $select = $('<select></select>');
var $parent = $('<div id="parent"></div>');

$('#qunit-fixture').append($parent);

var Utils = require('select2/utils');
var Options = require('select2/options');

var Dropdown = require('select2/dropdown');
var AttachBody = require('select2/dropdown/attachBody');

var DropdownAdapter = Utils.Decorate(Dropdown, AttachBody);

var dropdown = new DropdownAdapter($select, new Options({
dropdownParent: '#parent'
}));

assert.equal(
dropdown.$dropdownParent[0],
$parent[0],
'Should be parsed using the selector as a jQuery object'
);
});

test('can be a jQuery object', function (assert) {
assert.expect(1);

var $ = require('jquery');

var $select = $('<select></select>');
var $parent = $('<div id="parent"></div>');

$('#qunit-fixture').append($parent);

var Utils = require('select2/utils');
var Options = require('select2/options');

var Dropdown = require('select2/dropdown');
var AttachBody = require('select2/dropdown/attachBody');

var DropdownAdapter = Utils.Decorate(Dropdown, AttachBody);

var dropdown = new DropdownAdapter($select, new Options({
dropdownParent: $parent
}));

assert.equal(
dropdown.$dropdownParent[0],
$parent[0],
'Should just take the passed in jQuery object'
);
});

test('defaults to the document body', function (assert) {
assert.expect(1);

var $ = require('jquery');

var $select = $('<select></select>');

var Utils = require('select2/utils');
var Options = require('select2/options');

var Dropdown = require('select2/dropdown');
var AttachBody = require('select2/dropdown/attachBody');

var DropdownAdapter = Utils.Decorate(Dropdown, AttachBody);

var dropdown = new DropdownAdapter($select, new Options({}));

assert.equal(
dropdown.$dropdownParent[0],
document.body,
'Should default to wrapping document.body'
);
});
1 change: 1 addition & 0 deletions tests/unit-jq1.html
View file
Open in desktop
Expand Up @@ -70,6 +70,7 @@
<script src="data/minimumInputLength-tests.js" type="text/javascript"></script>

<script src="dropdown/dropdownCss-tests.js" type="text/javascript"></script>
<script src="dropdown/dropdownParent-tests.js" type="text/javascript"></script>
<script src="dropdown/positioning-tests.js" type="text/javascript"></script>
<script src="dropdown/search-a11y-tests.js" type="text/javascript"></script>
<script src="dropdown/selectOnClose-tests.js" type="text/javascript"></script>
Expand Down
1 change: 1 addition & 0 deletions tests/unit-jq2.html
View file
Open in desktop
Expand Up @@ -70,6 +70,7 @@
<script src="data/minimumInputLength-tests.js" type="text/javascript"></script>

<script src="dropdown/dropdownCss-tests.js" type="text/javascript"></script>
<script src="dropdown/dropdownParent-tests.js" type="text/javascript"></script>
<script src="dropdown/positioning-tests.js" type="text/javascript"></script>
<script src="dropdown/search-a11y-tests.js" type="text/javascript"></script>
<script src="dropdown/selectOnClose-tests.js" type="text/javascript"></script>
Expand Down
1 change: 1 addition & 0 deletions tests/unit-jq3.html
View file
Open in desktop
Expand Up @@ -70,6 +70,7 @@
<script src="data/minimumInputLength-tests.js" type="text/javascript"></script>

<script src="dropdown/dropdownCss-tests.js" type="text/javascript"></script>
<script src="dropdown/dropdownParent-tests.js" type="text/javascript"></script>
<script src="dropdown/positioning-tests.js" type="text/javascript"></script>
<script src="dropdown/search-a11y-tests.js" type="text/javascript"></script>
<script src="dropdown/selectOnClose-tests.js" type="text/javascript"></script>
Expand Down