From 89ae701691f16ca6a83e81ec7c554f42b0c4efc7 Mon Sep 17 00:00:00 2001 From: Marchenko Alexandr Date: Tue, 21 Jan 2014 12:17:58 +0200 Subject: [PATCH] merge --- select2.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/select2.js b/select2.js index fe79b4f4..ea44e676 100644 --- a/select2.js +++ b/select2.js @@ -2275,7 +2275,7 @@ the specific language governing permissions and limitations under the Apache Lic if (noHighlightUpdate !== false) { if (initial === true && selected >= 0) { // By default, the selected item is displayed inside the result list from a single select - // User can provide an implementation for 'hideSelectionFromResult' and hide it + // User can provide an implementation for 'hideSelectionFromResult' and hide it if(this.opts.hideSelectionFromResult !== undefined && selectedElm !== null) { if(this.opts.hideSelectionFromResult(selectedElm)) selectedElm.addClass("select2-selected"); @@ -3329,11 +3329,8 @@ the specific language governing permissions and limitations under the Apache Lic adaptContainerCssClass: function(c) { return c; }, adaptDropdownCssClass: function(c) { return null; }, nextSearchTerm: function(selectedObject, currentSearchTerm) { return undefined; }, -<<<<<<< HEAD + hideSelectionFromResult: function(selectedObject) { return undefined; }, searchInputPlaceholder: '' -======= - hideSelectionFromResult: function(selectedObject) { return undefined; } ->>>>>>> master }; $.fn.select2.ajaxDefaults = {