1
0
mirror of synced 2025-02-04 06:09:23 +03:00

Fixed missing jQuery import

Now we are using `jQuery.noConflict()` in tests, so it should be
slightly easier to detect when this happens next time. Tests just
need to be written for the component.

This closes https://github.com/select2/select2/issues/2985.
This commit is contained in:
Kevin Brown 2015-01-29 08:11:18 -05:00
parent 36cfc26cc1
commit 01461813d8
11 changed files with 29 additions and 9 deletions

View File

@ -1,4 +1,6 @@
define(['jquery'], function ($) {define('select2/utils',[], function () {
define(['jquery'], function ($) {define('select2/utils',[
'jquery'
], function ($) {
var Utils = {};
Utils.Extend = function (ChildClass, SuperClass) {

View File

@ -1,4 +1,6 @@
define(['jquery'], function ($) {define('select2/utils',[], function () {
define(['jquery'], function ($) {define('select2/utils',[
'jquery'
], function ($) {
var Utils = {};
Utils.Extend = function (ChildClass, SuperClass) {

View File

@ -436,7 +436,9 @@ define('jquery',[],function () {
return _$;
});
define('select2/utils',[], function () {
define('select2/utils',[
'jquery'
], function ($) {
var Utils = {};
Utils.Extend = function (ChildClass, SuperClass) {

File diff suppressed because one or more lines are too long

4
dist/js/select2.js vendored
View File

@ -436,7 +436,9 @@ define('jquery',[],function () {
return _$;
});
define('select2/utils',[], function () {
define('select2/utils',[
'jquery'
], function ($) {
var Utils = {};
Utils.Extend = function (ChildClass, SuperClass) {

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,6 @@
define([], function () {
define([
'jquery'
], function ($) {
var Utils = {};
Utils.Extend = function (ChildClass, SuperClass) {

View File

@ -1,5 +1,7 @@
module('Dropdown - selectOnClose');
var $ = require('jquery');
var Utils = require('select2/utils');
var Options = require('select2/options');

View File

@ -1,6 +1,10 @@
// Restore the require/define
var require = $.fn.select2.amd.require;
var define = $.fn.select2.amd.define;
// Disable jQuery's binding to $
jQuery.noConflict();
var Utils = require('select2/utils');
function MockContainer () {

View File

@ -1,5 +1,7 @@
module('Options - Attributes');
var $ = require('jquery');
var Options = require('select2/options');
test('no nesting', function (assert) {

View File

@ -1,5 +1,7 @@
module('Options - Width');
var $ = require('jquery');
var Select2 = require('select2/core');
var select = new Select2($('<select></select>'));