From e10f3b7dae44915af6adaf28695ecd30752d14da Mon Sep 17 00:00:00 2001 From: Brankub Date: Tue, 24 Mar 2015 14:44:23 +0200 Subject: [PATCH 1/3] fixes #3169 --- src/js/select2/dropdown/selectOnClose.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/js/select2/dropdown/selectOnClose.js b/src/js/select2/dropdown/selectOnClose.js index d8e368e0..fe77a6b2 100644 --- a/src/js/select2/dropdown/selectOnClose.js +++ b/src/js/select2/dropdown/selectOnClose.js @@ -8,19 +8,24 @@ define([ decorated.call(this, container, $container); - container.on('close', function () { - self._handleSelectOnClose(); + container.on('close', function (evt) { + self._handleSelectOnClose(evt); }); }; - SelectOnClose.prototype._handleSelectOnClose = function () { + SelectOnClose.prototype._handleSelectOnClose = function (evt) { + var self = this; + var $highlightedResults = this.getHighlightedResults(); if ($highlightedResults.length < 1) { return; } - $highlightedResults.trigger('mouseup'); + self.trigger('select', { + originalEvent: evt, + data: $highlightedResults.data('data') + }); }; return SelectOnClose; From 2b9c8b00a7320d9ebf4e286da711765ce9bf280d Mon Sep 17 00:00:00 2001 From: Brankub Date: Tue, 24 Mar 2015 15:14:32 +0200 Subject: [PATCH 2/3] remove evt --- src/js/select2/dropdown/selectOnClose.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/js/select2/dropdown/selectOnClose.js b/src/js/select2/dropdown/selectOnClose.js index fe77a6b2..95a88421 100644 --- a/src/js/select2/dropdown/selectOnClose.js +++ b/src/js/select2/dropdown/selectOnClose.js @@ -8,12 +8,12 @@ define([ decorated.call(this, container, $container); - container.on('close', function (evt) { - self._handleSelectOnClose(evt); + container.on('close', function () { + self._handleSelectOnClose(); }); }; - SelectOnClose.prototype._handleSelectOnClose = function (evt) { + SelectOnClose.prototype._handleSelectOnClose = function () { var self = this; var $highlightedResults = this.getHighlightedResults(); @@ -23,7 +23,6 @@ define([ } self.trigger('select', { - originalEvent: evt, data: $highlightedResults.data('data') }); }; From 010cf299026c44202b589400920d37ba2c8c8822 Mon Sep 17 00:00:00 2001 From: Brankub Date: Wed, 25 Mar 2015 10:07:55 +0200 Subject: [PATCH 3/3] switched back to this instead of self --- src/js/select2/dropdown/selectOnClose.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/js/select2/dropdown/selectOnClose.js b/src/js/select2/dropdown/selectOnClose.js index 95a88421..763d18a2 100644 --- a/src/js/select2/dropdown/selectOnClose.js +++ b/src/js/select2/dropdown/selectOnClose.js @@ -14,15 +14,13 @@ define([ }; SelectOnClose.prototype._handleSelectOnClose = function () { - var self = this; - var $highlightedResults = this.getHighlightedResults(); if ($highlightedResults.length < 1) { return; } - self.trigger('select', { + this.trigger('select', { data: $highlightedResults.data('data') }); };