1
0
mirror of synced 2024-11-22 21:16:10 +03:00

Merge pull request #3024 from th3byrdm4n/select2-ng

IE7/8 Compatability fixes
This commit is contained in:
Kevin Brown 2015-02-08 13:32:46 -05:00
commit b1c016584b
10 changed files with 25 additions and 24 deletions

1
dist/js/i18n/ca.js vendored Normal file
View File

@ -0,0 +1 @@
(function(){if(window.define)var e=window.define;if(window.require)var t=window.require;if(window.jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd.define,t=jQuery.fn.select2.amd.require;e("select2/i18n/ca",[],function(){return{errorLoading:function(){return"La càrrega ha fallat"},inputTooLong:function(e){var t=e.input.length-e.maximum,n="Si us plau, elimina "+t+" car";return t==1?n+="àcter":n+="àcters",n},inputTooShort:function(e){var t=e.minimum-e.input.length,n="Si us plau, introdueix "+remainingChars+" car";return remainingChars==1?n+="àcter":n+="àcters",n},loadingMore:function(){return"Carregant més resultats…"},maximumSelection:function(e){var t="Només es pot seleccionar "+e.maximum+" element";return e.maximum!=1&&(t+="s"),t},noResults:function(){return"No s'han trobat resultats"},searching:function(){return"Cercant…"}}}),t("jquery.select2"),jQuery.fn.select2.amd={define:e,require:t}})();

View File

@ -1369,7 +1369,7 @@ define('select2/selection/eventRelay',[
container.on('*', function (name, params) {
// Ignore events that should not be relayed
if (relayEvents.indexOf(name) === -1) {
if ($.inArray(name, relayEvents) === -1) {
return;
}
@ -1384,7 +1384,7 @@ define('select2/selection/eventRelay',[
self.$element.trigger(evt);
// Only handle preventable events if it was one
if (preventableEvents.indexOf(name) === -1) {
if ($.inArray(name, preventableEvents) === -1) {
return;
}
@ -2636,7 +2636,7 @@ define('select2/data/array',[
var item = this._normalizeItem(data[d]);
// Skip items which were pre-loaded, only merge the data
if (existingIds.indexOf(item.id) >= 0) {
if ($.inArray(item.id, existingIds) >= 0) {
var $existingOption = $existing.filter(onlyItem(item));
var existingData = this.item($existingOption);
@ -4315,7 +4315,7 @@ define('select2/core',[
});
this.selection.on('*', function (name, params) {
if (nonRelayEvents.indexOf(name) !== -1) {
if ($.inArray(name, nonRelayEvents) !== -1) {
return;
}

View File

@ -1369,7 +1369,7 @@ define('select2/selection/eventRelay',[
container.on('*', function (name, params) {
// Ignore events that should not be relayed
if (relayEvents.indexOf(name) === -1) {
if ($.inArray(name, relayEvents) === -1) {
return;
}
@ -1384,7 +1384,7 @@ define('select2/selection/eventRelay',[
self.$element.trigger(evt);
// Only handle preventable events if it was one
if (preventableEvents.indexOf(name) === -1) {
if ($.inArray(name, preventableEvents) === -1) {
return;
}
@ -2636,7 +2636,7 @@ define('select2/data/array',[
var item = this._normalizeItem(data[d]);
// Skip items which were pre-loaded, only merge the data
if (existingIds.indexOf(item.id) >= 0) {
if ($.inArray(item.id, existingIds) >= 0) {
var $existingOption = $existing.filter(onlyItem(item));
var existingData = this.item($existingOption);
@ -4315,7 +4315,7 @@ define('select2/core',[
});
this.selection.on('*', function (name, params) {
if (nonRelayEvents.indexOf(name) !== -1) {
if ($.inArray(name, nonRelayEvents) !== -1) {
return;
}

View File

@ -1807,7 +1807,7 @@ define('select2/selection/eventRelay',[
container.on('*', function (name, params) {
// Ignore events that should not be relayed
if (relayEvents.indexOf(name) === -1) {
if ($.inArray(name, relayEvents) === -1) {
return;
}
@ -1822,7 +1822,7 @@ define('select2/selection/eventRelay',[
self.$element.trigger(evt);
// Only handle preventable events if it was one
if (preventableEvents.indexOf(name) === -1) {
if ($.inArray(name, preventableEvents) === -1) {
return;
}
@ -3074,7 +3074,7 @@ define('select2/data/array',[
var item = this._normalizeItem(data[d]);
// Skip items which were pre-loaded, only merge the data
if (existingIds.indexOf(item.id) >= 0) {
if ($.inArray(item.id, existingIds) >= 0) {
var $existingOption = $existing.filter(onlyItem(item));
var existingData = this.item($existingOption);
@ -4753,7 +4753,7 @@ define('select2/core',[
});
this.selection.on('*', function (name, params) {
if (nonRelayEvents.indexOf(name) !== -1) {
if ($.inArray(name, nonRelayEvents) !== -1) {
return;
}

File diff suppressed because one or more lines are too long

8
dist/js/select2.js vendored
View File

@ -1807,7 +1807,7 @@ define('select2/selection/eventRelay',[
container.on('*', function (name, params) {
// Ignore events that should not be relayed
if (relayEvents.indexOf(name) === -1) {
if ($.inArray(name, relayEvents) === -1) {
return;
}
@ -1822,7 +1822,7 @@ define('select2/selection/eventRelay',[
self.$element.trigger(evt);
// Only handle preventable events if it was one
if (preventableEvents.indexOf(name) === -1) {
if ($.inArray(name, preventableEvents) === -1) {
return;
}
@ -3074,7 +3074,7 @@ define('select2/data/array',[
var item = this._normalizeItem(data[d]);
// Skip items which were pre-loaded, only merge the data
if (existingIds.indexOf(item.id) >= 0) {
if ($.inArray(item.id, existingIds) >= 0) {
var $existingOption = $existing.filter(onlyItem(item));
var existingData = this.item($existingOption);
@ -4753,7 +4753,7 @@ define('select2/core',[
});
this.selection.on('*', function (name, params) {
if (nonRelayEvents.indexOf(name) !== -1) {
if ($.inArray(name, nonRelayEvents) !== -1) {
return;
}

File diff suppressed because one or more lines are too long

View File

@ -216,7 +216,7 @@ define([
});
this.selection.on('*', function (name, params) {
if (nonRelayEvents.indexOf(name) !== -1) {
if ($.inArray(name, nonRelayEvents) !== -1) {
return;
}

View File

@ -46,7 +46,7 @@ define([
var item = this._normalizeItem(data[d]);
// Skip items which were pre-loaded, only merge the data
if (existingIds.indexOf(item.id) >= 0) {
if ($.inArray(item.id, existingIds) >= 0) {
var $existingOption = $existing.filter(onlyItem(item));
var existingData = this.item($existingOption);

View File

@ -18,7 +18,7 @@ define([
container.on('*', function (name, params) {
// Ignore events that should not be relayed
if (relayEvents.indexOf(name) === -1) {
if ($.inArray(name, relayEvents) === -1) {
return;
}
@ -33,7 +33,7 @@ define([
self.$element.trigger(evt);
// Only handle preventable events if it was one
if (preventableEvents.indexOf(name) === -1) {
if ($.inArray(name, preventableEvents) === -1) {
return;
}