RetailCRM-Mirror/select2
1
0
Fork 0
mirror of synced 2025-02-04 06:09:23 +03:00
Code Issues Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Marchenko Alexandr 2014-01-21 12:17:58 +02:00
parent 2e901f79a1
commit 89ae701691
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
select2.js
View File

@ -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 = {