Skip to content

Commit

Permalink
Recompiled dist
Browse files Browse the repository at this point in the history
  • Loading branch information
@kevin-brown
kevin-brown committed Nov 23, 2015
1 parent dc516e7 commit e2b745e
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 24 deletions.
2 changes: 1 addition & 1 deletion dist/js/i18n/hr.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions dist/js/i18n/sr-Cyrl.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/js/i18n/sr.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 16 additions & 9 deletions dist/js/select2.full.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,8 @@ S2.define('select2/results',[
this.hideLoading();

var $message = $(
'<li role="treeitem" class="select2-results__option"></li>'
'<li role="treeitem" aria-live="assertive"' +
' class="select2-results__option"></li>'
);

var message = this.options.get('translations').get(params.message);
Expand Down Expand Up @@ -1236,7 +1237,7 @@ S2.define('select2/results',[
var template = this.options.get('templateResult');
var escapeMarkup = this.options.get('escapeMarkup');

var content = template(result);
var content = template(result, container);

if (content == null) {
container.style.display = 'none';
Expand Down Expand Up @@ -1293,7 +1294,7 @@ S2.define('select2/selection/base',[
BaseSelection.prototype.render = function () {
var $selection = $(
'<span class="select2-selection" role="combobox" ' +
'aria-autocomplete="list" aria-haspopup="true" aria-expanded="false">' +
' aria-haspopup="true" aria-expanded="false">' +
'</span>'
);

Expand Down Expand Up @@ -1801,7 +1802,7 @@ S2.define('select2/selection/search',[
'<li class="select2-search select2-search--inline">' +
'<input class="select2-search__field" type="search" tabindex="-1"' +
' autocomplete="off" autocorrect="off" autocapitalize="off"' +
' spellcheck="false" role="textbox" />' +
' spellcheck="false" role="textbox" aria-autocomplete="list" />' +
'</li>'
);

Expand All @@ -1826,6 +1827,7 @@ S2.define('select2/selection/search',[

container.on('close', function () {
self.$search.val('');
self.$search.removeAttr('aria-activedescendant');
self.$search.trigger('focus');
});

Expand All @@ -1843,6 +1845,10 @@ S2.define('select2/selection/search',[
self.$search.trigger('focus');
});

container.on('results:focus', function (params) {
self.$search.attr('aria-activedescendant', params.id);
});

this.$selection.on('focusin', '.select2-search--inline', function (evt) {
self.trigger('focus', evt);
});
Expand Down Expand Up @@ -1982,9 +1988,8 @@ S2.define('select2/selection/search',[
data: item
});

this.trigger('open', {});

this.$search.val(item.text + ' ');
this.$search.val(item.text);
this.handleSearch();
};

Search.prototype.resizeSearch = function () {
Expand Down Expand Up @@ -4109,7 +4114,8 @@ S2.define('select2/dropdown/attachBody',[
this.$dropdownContainer.detach();
};

AttachBody.prototype._attachPositioningHandler = function (container) {
AttachBody.prototype._attachPositioningHandler =
function (decorated, container) {
var self = this;

var scrollEvent = 'scroll.select2.' + container.id;
Expand All @@ -4136,7 +4142,8 @@ S2.define('select2/dropdown/attachBody',[
});
};

AttachBody.prototype._detachPositioningHandler = function (container) {
AttachBody.prototype._detachPositioningHandler =
function (decorated, container) {
var scrollEvent = 'scroll.select2.' + container.id;
var resizeEvent = 'resize.select2.' + container.id;
var orientationEvent = 'orientationchange.select2.' + container.id;
Expand Down
4 changes: 2 additions & 2 deletions dist/js/select2.full.min.js
View file

Large diffs are not rendered by default.

25 changes: 16 additions & 9 deletions dist/js/select2.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,8 @@ S2.define('select2/results',[
this.hideLoading();

var $message = $(
'<li role="treeitem" class="select2-results__option"></li>'
'<li role="treeitem" aria-live="assertive"' +
' class="select2-results__option"></li>'
);

var message = this.options.get('translations').get(params.message);
Expand Down Expand Up @@ -1236,7 +1237,7 @@ S2.define('select2/results',[
var template = this.options.get('templateResult');
var escapeMarkup = this.options.get('escapeMarkup');

var content = template(result);
var content = template(result, container);

if (content == null) {
container.style.display = 'none';
Expand Down Expand Up @@ -1293,7 +1294,7 @@ S2.define('select2/selection/base',[
BaseSelection.prototype.render = function () {
var $selection = $(
'<span class="select2-selection" role="combobox" ' +
'aria-autocomplete="list" aria-haspopup="true" aria-expanded="false">' +
' aria-haspopup="true" aria-expanded="false">' +
'</span>'
);

Expand Down Expand Up @@ -1801,7 +1802,7 @@ S2.define('select2/selection/search',[
'<li class="select2-search select2-search--inline">' +
'<input class="select2-search__field" type="search" tabindex="-1"' +
' autocomplete="off" autocorrect="off" autocapitalize="off"' +
' spellcheck="false" role="textbox" />' +
' spellcheck="false" role="textbox" aria-autocomplete="list" />' +
'</li>'
);

Expand All @@ -1826,6 +1827,7 @@ S2.define('select2/selection/search',[

container.on('close', function () {
self.$search.val('');
self.$search.removeAttr('aria-activedescendant');
self.$search.trigger('focus');
});

Expand All @@ -1843,6 +1845,10 @@ S2.define('select2/selection/search',[
self.$search.trigger('focus');
});

container.on('results:focus', function (params) {
self.$search.attr('aria-activedescendant', params.id);
});

this.$selection.on('focusin', '.select2-search--inline', function (evt) {
self.trigger('focus', evt);
});
Expand Down Expand Up @@ -1982,9 +1988,8 @@ S2.define('select2/selection/search',[
data: item
});

this.trigger('open', {});

this.$search.val(item.text + ' ');
this.$search.val(item.text);
this.handleSearch();
};

Search.prototype.resizeSearch = function () {
Expand Down Expand Up @@ -4109,7 +4114,8 @@ S2.define('select2/dropdown/attachBody',[
this.$dropdownContainer.detach();
};

AttachBody.prototype._attachPositioningHandler = function (container) {
AttachBody.prototype._attachPositioningHandler =
function (decorated, container) {
var self = this;

var scrollEvent = 'scroll.select2.' + container.id;
Expand All @@ -4136,7 +4142,8 @@ S2.define('select2/dropdown/attachBody',[
});
};

AttachBody.prototype._detachPositioningHandler = function (container) {
AttachBody.prototype._detachPositioningHandler =
function (decorated, container) {
var scrollEvent = 'scroll.select2.' + container.id;
var resizeEvent = 'resize.select2.' + container.id;
var orientationEvent = 'orientationchange.select2.' + container.id;
Expand Down
4 changes: 2 additions & 2 deletions dist/js/select2.min.js
View file

Large diffs are not rendered by default.

0 comments on commit e2b745e

Please sign in to comment.