Skip to content

Commit

Permalink
Recompile dist
Browse files Browse the repository at this point in the history
  • Loading branch information
@kevin-brown
kevin-brown committed Aug 21, 2015
1 parent a86c2e7 commit b69dd82
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 35 deletions.
37 changes: 22 additions & 15 deletions dist/js/select2.full.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1041,7 +1041,7 @@ S2.define('select2/results',[
var data = $highlighted.data('data');

if ($highlighted.attr('aria-selected') == 'true') {
self.trigger('close');
self.trigger('close', {});
} else {
self.trigger('select', {
data: data
Expand Down Expand Up @@ -1163,7 +1163,7 @@ S2.define('select2/results',[
data: data
});
} else {
self.trigger('close');
self.trigger('close', {});
}

return;
Expand Down Expand Up @@ -1746,7 +1746,7 @@ S2.define('select2/selection/allowClear',[

this.$element.val(this.placeholder.id).trigger('change');

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

AllowClear.prototype._handleKeyboardClear = function (_, evt, container) {
Expand Down Expand Up @@ -1966,7 +1966,7 @@ S2.define('select2/selection/search',[
data: item
});

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

this.$search.val(item.text + ' ');
};
Expand Down Expand Up @@ -3574,7 +3574,9 @@ S2.define('select2/data/tokenizer',[
var self = this;

function select (data) {
self.select(data);
self.trigger('select', {
data: data
});
}

params.term = params.term || '';
Expand Down Expand Up @@ -3622,6 +3624,11 @@ S2.define('select2/data/tokenizer',[

var data = createTag(partParams);

if (data == null) {
i++;
continue;
}

callback(data);

// Reset the term to not include the tokenized portion
Expand Down Expand Up @@ -4302,7 +4309,7 @@ S2.define('select2/dropdown/closeOnSelect',[
return;
}

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

return CloseOnSelect;
Expand Down Expand Up @@ -5149,7 +5156,7 @@ S2.define('select2/core',[

this.on('query', function (params) {
if (!self.isOpen()) {
self.trigger('open');
self.trigger('open', {});
}

this.dataAdapter.query(params, function (data) {
Expand Down Expand Up @@ -5179,19 +5186,19 @@ S2.define('select2/core',[

evt.preventDefault();
} else if (key === KEYS.ENTER) {
self.trigger('results:select');
self.trigger('results:select', {});

evt.preventDefault();
} else if ((key === KEYS.SPACE && evt.ctrlKey)) {
self.trigger('results:toggle');
self.trigger('results:toggle', {});

evt.preventDefault();
} else if (key === KEYS.UP) {
self.trigger('results:previous');
self.trigger('results:previous', {});

evt.preventDefault();
} else if (key === KEYS.DOWN) {
self.trigger('results:next');
self.trigger('results:next', {});

evt.preventDefault();
}
Expand All @@ -5214,9 +5221,9 @@ S2.define('select2/core',[
this.close();
}

this.trigger('disable');
this.trigger('disable', {});
} else {
this.trigger('enable');
this.trigger('enable', {});
}
};

Expand Down Expand Up @@ -5278,7 +5285,7 @@ S2.define('select2/core',[
return;
}

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

Select2.prototype.isOpen = function () {
Expand All @@ -5296,7 +5303,7 @@ S2.define('select2/core',[
}

this.$container.addClass('select2-container--focus');
this.trigger('focus');
this.trigger('focus', {});
};

Select2.prototype.enable = function (args) {
Expand Down
6 changes: 3 additions & 3 deletions dist/js/select2.full.min.js
View file

Large diffs are not rendered by default.

37 changes: 22 additions & 15 deletions dist/js/select2.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1041,7 +1041,7 @@ S2.define('select2/results',[
var data = $highlighted.data('data');

if ($highlighted.attr('aria-selected') == 'true') {
self.trigger('close');
self.trigger('close', {});
} else {
self.trigger('select', {
data: data
Expand Down Expand Up @@ -1163,7 +1163,7 @@ S2.define('select2/results',[
data: data
});
} else {
self.trigger('close');
self.trigger('close', {});
}

return;
Expand Down Expand Up @@ -1746,7 +1746,7 @@ S2.define('select2/selection/allowClear',[

this.$element.val(this.placeholder.id).trigger('change');

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

AllowClear.prototype._handleKeyboardClear = function (_, evt, container) {
Expand Down Expand Up @@ -1966,7 +1966,7 @@ S2.define('select2/selection/search',[
data: item
});

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

this.$search.val(item.text + ' ');
};
Expand Down Expand Up @@ -3574,7 +3574,9 @@ S2.define('select2/data/tokenizer',[
var self = this;

function select (data) {
self.select(data);
self.trigger('select', {
data: data
});
}

params.term = params.term || '';
Expand Down Expand Up @@ -3622,6 +3624,11 @@ S2.define('select2/data/tokenizer',[

var data = createTag(partParams);

if (data == null) {
i++;
continue;
}

callback(data);

// Reset the term to not include the tokenized portion
Expand Down Expand Up @@ -4302,7 +4309,7 @@ S2.define('select2/dropdown/closeOnSelect',[
return;
}

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

return CloseOnSelect;
Expand Down Expand Up @@ -5149,7 +5156,7 @@ S2.define('select2/core',[

this.on('query', function (params) {
if (!self.isOpen()) {
self.trigger('open');
self.trigger('open', {});
}

this.dataAdapter.query(params, function (data) {
Expand Down Expand Up @@ -5179,19 +5186,19 @@ S2.define('select2/core',[

evt.preventDefault();
} else if (key === KEYS.ENTER) {
self.trigger('results:select');
self.trigger('results:select', {});

evt.preventDefault();
} else if ((key === KEYS.SPACE && evt.ctrlKey)) {
self.trigger('results:toggle');
self.trigger('results:toggle', {});

evt.preventDefault();
} else if (key === KEYS.UP) {
self.trigger('results:previous');
self.trigger('results:previous', {});

evt.preventDefault();
} else if (key === KEYS.DOWN) {
self.trigger('results:next');
self.trigger('results:next', {});

evt.preventDefault();
}
Expand All @@ -5214,9 +5221,9 @@ S2.define('select2/core',[
this.close();
}

this.trigger('disable');
this.trigger('disable', {});
} else {
this.trigger('enable');
this.trigger('enable', {});
}
};

Expand Down Expand Up @@ -5278,7 +5285,7 @@ S2.define('select2/core',[
return;
}

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

Select2.prototype.isOpen = function () {
Expand All @@ -5296,7 +5303,7 @@ S2.define('select2/core',[
}

this.$container.addClass('select2-container--focus');
this.trigger('focus');
this.trigger('focus', {});
};

Select2.prototype.enable = function (args) {
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 b69dd82

Please sign in to comment.