From 024d41b4125cfbc0b479fb1186b1b5ce32e7c063 Mon Sep 17 00:00:00 2001 From: Kevin Brown Date: Fri, 9 Jan 2015 10:04:21 -0500 Subject: [PATCH] Normalize internal select/unselect events Also pull the logic for automatically closing the dropdown into the dropdown adapter, taking it out of the core. The `selected` and `unselected` events are now `select` and `unselect`, which is what many of the other adapters were expecting them to be. Some tests for placeholders have been added. --- dist/js/select2.amd.full.js | 59 +++++++++------------- dist/js/select2.amd.js | 59 +++++++++------------- dist/js/select2.full.js | 59 +++++++++------------- dist/js/select2.full.min.js | 6 +-- dist/js/select2.js | 59 +++++++++------------- dist/js/select2.min.js | 4 +- src/js/select2/core.js | 31 +----------- src/js/select2/dropdown.js | 16 +++++- src/js/select2/results.js | 8 +-- src/js/select2/selection/multiple.js | 2 +- src/js/select2/selection/search.js | 2 +- tests/selection/placeholder-tests.js | 74 ++++++++++++++++++++++++++++ tests/selection/placeholder.html | 26 ++++++++++ 13 files changed, 215 insertions(+), 190 deletions(-) create mode 100644 tests/selection/placeholder-tests.js create mode 100644 tests/selection/placeholder.html diff --git a/dist/js/select2.amd.full.js b/dist/js/select2.amd.full.js index 8bd8e4b4..45ef997a 100644 --- a/dist/js/select2.amd.full.js +++ b/dist/js/select2.amd.full.js @@ -445,11 +445,11 @@ define('select2/results',[ var data = $highlighted.data('data'); if ($highlighted.attr('aria-selected') == 'true') { - self.trigger('unselected', { + self.trigger('unselect', { data: data }); } else { - self.trigger('selected', { + self.trigger('select', { data: data }); } @@ -567,7 +567,7 @@ define('select2/results',[ var data = $this.data('data'); if ($this.attr('aria-selected') === 'true') { - self.trigger('unselected', { + self.trigger('unselect', { originalEvent: evt, data: data }); @@ -575,7 +575,7 @@ define('select2/results',[ return; } - self.trigger('selected', { + self.trigger('select', { originalEvent: evt, data: data }); @@ -936,7 +936,7 @@ define('select2/selection/multiple',[ var data = $selection.data('data'); - self.trigger('unselected', { + self.trigger('unselect', { originalEvent: evt, data: data }); @@ -1194,7 +1194,7 @@ define('select2/selection/search',[ }; Search.prototype.searchRemoveChoice = function (decorated, item) { - this.trigger('unselected', { + this.trigger('unselect', { data: item }); @@ -2867,7 +2867,21 @@ define('select2/dropdown',[ }; Dropdown.prototype.bind = function (container, $container) { - // Can be implemented in subclasses + container.on('select', function (params) { + self._onSelect(params); + }); + + container.on('unselect', function (params) { + self._onUnSelect(params); + }); + }; + + Dropdown.prototype._onSelect = function () { + self.trigger('close'); + }; + + Dropdown.prototype._onUnSelect = function () { + self.trigger('close'); }; return Dropdown; @@ -3884,24 +3898,12 @@ define('select2/core',[ Select2.prototype._registerSelectionEvents = function () { var self = this; - var nonRelayEvents = ['open', 'close', 'toggle', 'unselected']; + var nonRelayEvents = ['toggle']; - this.selection.on('open', function () { - self.open(); - }); - this.selection.on('close', function () { - self.close(); - }); this.selection.on('toggle', function () { self.toggleDropdown(); }); - this.selection.on('unselected', function (params) { - self.trigger('unselect', params); - - self.close(); - }); - this.selection.on('*', function (name, params) { if (nonRelayEvents.indexOf(name) !== -1) { return; @@ -3921,25 +3923,8 @@ define('select2/core',[ Select2.prototype._registerResultsEvents = function () { var self = this; - var nonRelayEvents = ['selected', 'unselected']; - - this.results.on('selected', function (params) { - self.trigger('select', params); - - self.close(); - }); - - this.results.on('unselected', function (params) { - self.trigger('unselect', params); - - self.close(); - }); this.results.on('*', function (name, params) { - if (nonRelayEvents.indexOf(name) !== -1) { - return; - } - self.trigger(name, params); }); }; diff --git a/dist/js/select2.amd.js b/dist/js/select2.amd.js index 4365f28d..40de21e8 100644 --- a/dist/js/select2.amd.js +++ b/dist/js/select2.amd.js @@ -445,11 +445,11 @@ define('select2/results',[ var data = $highlighted.data('data'); if ($highlighted.attr('aria-selected') == 'true') { - self.trigger('unselected', { + self.trigger('unselect', { data: data }); } else { - self.trigger('selected', { + self.trigger('select', { data: data }); } @@ -567,7 +567,7 @@ define('select2/results',[ var data = $this.data('data'); if ($this.attr('aria-selected') === 'true') { - self.trigger('unselected', { + self.trigger('unselect', { originalEvent: evt, data: data }); @@ -575,7 +575,7 @@ define('select2/results',[ return; } - self.trigger('selected', { + self.trigger('select', { originalEvent: evt, data: data }); @@ -936,7 +936,7 @@ define('select2/selection/multiple',[ var data = $selection.data('data'); - self.trigger('unselected', { + self.trigger('unselect', { originalEvent: evt, data: data }); @@ -1194,7 +1194,7 @@ define('select2/selection/search',[ }; Search.prototype.searchRemoveChoice = function (decorated, item) { - this.trigger('unselected', { + this.trigger('unselect', { data: item }); @@ -2867,7 +2867,21 @@ define('select2/dropdown',[ }; Dropdown.prototype.bind = function (container, $container) { - // Can be implemented in subclasses + container.on('select', function (params) { + self._onSelect(params); + }); + + container.on('unselect', function (params) { + self._onUnSelect(params); + }); + }; + + Dropdown.prototype._onSelect = function () { + self.trigger('close'); + }; + + Dropdown.prototype._onUnSelect = function () { + self.trigger('close'); }; return Dropdown; @@ -3884,24 +3898,12 @@ define('select2/core',[ Select2.prototype._registerSelectionEvents = function () { var self = this; - var nonRelayEvents = ['open', 'close', 'toggle', 'unselected']; + var nonRelayEvents = ['toggle']; - this.selection.on('open', function () { - self.open(); - }); - this.selection.on('close', function () { - self.close(); - }); this.selection.on('toggle', function () { self.toggleDropdown(); }); - this.selection.on('unselected', function (params) { - self.trigger('unselect', params); - - self.close(); - }); - this.selection.on('*', function (name, params) { if (nonRelayEvents.indexOf(name) !== -1) { return; @@ -3921,25 +3923,8 @@ define('select2/core',[ Select2.prototype._registerResultsEvents = function () { var self = this; - var nonRelayEvents = ['selected', 'unselected']; - - this.results.on('selected', function (params) { - self.trigger('select', params); - - self.close(); - }); - - this.results.on('unselected', function (params) { - self.trigger('unselect', params); - - self.close(); - }); this.results.on('*', function (name, params) { - if (nonRelayEvents.indexOf(name) !== -1) { - return; - } - self.trigger(name, params); }); }; diff --git a/dist/js/select2.full.js b/dist/js/select2.full.js index 204baad7..8df47cec 100644 --- a/dist/js/select2.full.js +++ b/dist/js/select2.full.js @@ -9980,11 +9980,11 @@ define('select2/results',[ var data = $highlighted.data('data'); if ($highlighted.attr('aria-selected') == 'true') { - self.trigger('unselected', { + self.trigger('unselect', { data: data }); } else { - self.trigger('selected', { + self.trigger('select', { data: data }); } @@ -10102,7 +10102,7 @@ define('select2/results',[ var data = $this.data('data'); if ($this.attr('aria-selected') === 'true') { - self.trigger('unselected', { + self.trigger('unselect', { originalEvent: evt, data: data }); @@ -10110,7 +10110,7 @@ define('select2/results',[ return; } - self.trigger('selected', { + self.trigger('select', { originalEvent: evt, data: data }); @@ -10471,7 +10471,7 @@ define('select2/selection/multiple',[ var data = $selection.data('data'); - self.trigger('unselected', { + self.trigger('unselect', { originalEvent: evt, data: data }); @@ -10729,7 +10729,7 @@ define('select2/selection/search',[ }; Search.prototype.searchRemoveChoice = function (decorated, item) { - this.trigger('unselected', { + this.trigger('unselect', { data: item }); @@ -12402,7 +12402,21 @@ define('select2/dropdown',[ }; Dropdown.prototype.bind = function (container, $container) { - // Can be implemented in subclasses + container.on('select', function (params) { + self._onSelect(params); + }); + + container.on('unselect', function (params) { + self._onUnSelect(params); + }); + }; + + Dropdown.prototype._onSelect = function () { + self.trigger('close'); + }; + + Dropdown.prototype._onUnSelect = function () { + self.trigger('close'); }; return Dropdown; @@ -13419,24 +13433,12 @@ define('select2/core',[ Select2.prototype._registerSelectionEvents = function () { var self = this; - var nonRelayEvents = ['open', 'close', 'toggle', 'unselected']; + var nonRelayEvents = ['toggle']; - this.selection.on('open', function () { - self.open(); - }); - this.selection.on('close', function () { - self.close(); - }); this.selection.on('toggle', function () { self.toggleDropdown(); }); - this.selection.on('unselected', function (params) { - self.trigger('unselect', params); - - self.close(); - }); - this.selection.on('*', function (name, params) { if (nonRelayEvents.indexOf(name) !== -1) { return; @@ -13456,25 +13458,8 @@ define('select2/core',[ Select2.prototype._registerResultsEvents = function () { var self = this; - var nonRelayEvents = ['selected', 'unselected']; - - this.results.on('selected', function (params) { - self.trigger('select', params); - - self.close(); - }); - - this.results.on('unselected', function (params) { - self.trigger('unselect', params); - - self.close(); - }); this.results.on('*', function (name, params) { - if (nonRelayEvents.indexOf(name) !== -1) { - return; - } - self.trigger(name, params); }); }; diff --git a/dist/js/select2.full.min.js b/dist/js/select2.full.min.js index c1d0bb96..a8c345be 100644 --- a/dist/js/select2.full.min.js +++ b/dist/js/select2.full.min.js @@ -1,5 +1,5 @@ window.$=window.$||{},function(){$&&$.fn&&$.fn.select2&&$.fn.select2.amd&&(c=$.fn.select2.amd.define,b=$.fn.select2.amd.require);var a,b,c;!function(d){function e(a,b){return u.call(a,b)}function f(a,b){var c,d,e,f,g,h,i,j,k,l,m,n=b&&b.split("/"),o=s.map,p=o&&o["*"]||{};if(a&&"."===a.charAt(0))if(b){for(n=n.slice(0,n.length-1),a=a.split("/"),g=a.length-1,s.nodeIdCompat&&w.test(a[g])&&(a[g]=a[g].replace(w,"")),a=n.concat(a),k=0;k0&&(a.splice(k-1,2),k-=2)}a=a.join("/")}else 0===a.indexOf("./")&&(a=a.substring(2));if((n||p)&&o){for(c=a.split("/"),k=c.length;k>0;k-=1){if(d=c.slice(0,k).join("/"),n)for(l=n.length;l>0;l-=1)if(e=o[n.slice(0,l).join("/")],e&&(e=e[d])){f=e,h=k;break}if(f)break;!i&&p&&p[d]&&(i=p[d],j=k)}!f&&i&&(f=i,h=j),f&&(c.splice(0,h,f),a=c.join("/"))}return a}function g(a,b){return function(){return n.apply(d,v.call(arguments,0).concat([a,b]))}}function h(a){return function(b){return f(b,a)}}function i(a){return function(b){q[a]=b}}function j(a){if(e(r,a)){var b=r[a];delete r[a],t[a]=!0,m.apply(d,b)}if(!e(q,a)&&!e(t,a))throw new Error("No "+a);return q[a]}function k(a){var b,c=a?a.indexOf("!"):-1;return c>-1&&(b=a.substring(0,c),a=a.substring(c+1,a.length)),[b,a]}function l(a){return function(){return s&&s.config&&s.config[a]||{}}}var m,n,o,p,q={},r={},s={},t={},u=Object.prototype.hasOwnProperty,v=[].slice,w=/\.js$/;o=function(a,b){var c,d=k(a),e=d[0];return a=d[1],e&&(e=f(e,b),c=j(e)),e?a=c&&c.normalize?c.normalize(a,h(b)):f(a,b):(a=f(a,b),d=k(a),e=d[0],a=d[1],e&&(c=j(e))),{f:e?e+"!"+a:a,n:a,pr:e,p:c}},p={require:function(a){return g(a)},exports:function(a){var b=q[a];return"undefined"!=typeof b?b:q[a]={}},module:function(a){return{id:a,uri:"",exports:q[a],config:l(a)}}},m=function(a,b,c,f){var h,k,l,m,n,s,u=[],v=typeof c;if(f=f||a,"undefined"===v||"function"===v){for(b=!b.length&&c.length?["require","exports","module"]:b,n=0;n0&&b-1 in a}function e(a,b,c){if(bb.isFunction(b))return bb.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return bb.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(ib.test(b))return bb.filter(b,a,c);b=bb.filter(b,a)}return bb.grep(a,function(a){return V.call(b,a)>=0!==c})}function f(a,b){for(;(a=a[b])&&1!==a.nodeType;);return a}function g(a){var b=pb[a]={};return bb.each(a.match(ob)||[],function(a,c){b[c]=!0}),b}function h(){_.removeEventListener("DOMContentLoaded",h,!1),a.removeEventListener("load",h,!1),bb.ready()}function i(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=bb.expando+Math.random()}function j(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(vb,"-$1").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:ub.test(c)?bb.parseJSON(c):c}catch(e){}tb.set(a,b,c)}else c=void 0;return c}function k(){return!0}function l(){return!1}function m(){try{return _.activeElement}catch(a){}}function n(a,b){return bb.nodeName(a,"table")&&bb.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function o(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function p(a){var b=Lb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function q(a,b){for(var c=0,d=a.length;d>c;c++)sb.set(a[c],"globalEval",!b||sb.get(b[c],"globalEval"))}function r(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(sb.hasData(a)&&(f=sb.access(a),g=sb.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)bb.event.add(b,e,j[e][c])}tb.hasData(a)&&(h=tb.access(a),i=bb.extend({},h),tb.set(b,i))}}function s(a,b){var c=a.getElementsByTagName?a.getElementsByTagName(b||"*"):a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&bb.nodeName(a,b)?bb.merge([a],c):c}function t(a,b){var c=b.nodeName.toLowerCase();"input"===c&&zb.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}function u(b,c){var d=bb(c.createElement(b)).appendTo(c.body),e=a.getDefaultComputedStyle?a.getDefaultComputedStyle(d[0]).display:bb.css(d[0],"display");return d.detach(),e}function v(a){var b=_,c=Pb[a];return c||(c=u(a,b),"none"!==c&&c||(Ob=(Ob||bb("