Quellcode durchsuchen

Fixed multiple selection placeholders

Due to a change in 7edf0e3ebe700850a0f68c8c25f3381509d78f03 that
made the rendered selection take up the full width of the selection
container, the placeholder was not being automatically displayed.
The calculations were always turning out negative, which has been
fixed by not trying to automatically calculate the best possible
width.
Kevin Brown vor 10 Jahren
Ursprung
Commit
a6c4215976

+ 1 - 5
dist/js/select2.amd.full.js

@@ -1211,11 +1211,7 @@ define('select2/selection/search',[
     var width = '';
 
     if (this.$search.attr('placeholder') !== '') {
-      width = this.$selection.innerWidth();
-      width -= this.$selection.find('.select2-selection__rendered')
-                              .innerWidth();
-
-      width = width + 'px';
+      width = this.$selection.find('.select2-selection__rendered').innerWidth();
     } else {
       var minimumWidth = this.$search.val().length + 1;
 

+ 1 - 5
dist/js/select2.amd.js

@@ -1211,11 +1211,7 @@ define('select2/selection/search',[
     var width = '';
 
     if (this.$search.attr('placeholder') !== '') {
-      width = this.$selection.innerWidth();
-      width -= this.$selection.find('.select2-selection__rendered')
-                              .innerWidth();
-
-      width = width + 'px';
+      width = this.$selection.find('.select2-selection__rendered').innerWidth();
     } else {
       var minimumWidth = this.$search.val().length + 1;
 

+ 1 - 5
dist/js/select2.full.js

@@ -10746,11 +10746,7 @@ define('select2/selection/search',[
     var width = '';
 
     if (this.$search.attr('placeholder') !== '') {
-      width = this.$selection.innerWidth();
-      width -= this.$selection.find('.select2-selection__rendered')
-                              .innerWidth();
-
-      width = width + 'px';
+      width = this.$selection.find('.select2-selection__rendered').innerWidth();
     } else {
       var minimumWidth = this.$search.val().length + 1;
 

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/js/select2.full.min.js


+ 1 - 5
dist/js/select2.js

@@ -1639,11 +1639,7 @@ define('select2/selection/search',[
     var width = '';
 
     if (this.$search.attr('placeholder') !== '') {
-      width = this.$selection.innerWidth();
-      width -= this.$selection.find('.select2-selection__rendered')
-                              .innerWidth();
-
-      width = width + 'px';
+      width = this.$selection.find('.select2-selection__rendered').innerWidth();
     } else {
       var minimumWidth = this.$search.val().length + 1;
 

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/js/select2.min.js


+ 1 - 5
src/js/select2/selection/search.js

@@ -118,11 +118,7 @@ define([
     var width = '';
 
     if (this.$search.attr('placeholder') !== '') {
-      width = this.$selection.innerWidth();
-      width -= this.$selection.find('.select2-selection__rendered')
-                              .innerWidth();
-
-      width = width + 'px';
+      width = this.$selection.find('.select2-selection__rendered').innerWidth();
     } else {
       var minimumWidth = this.$search.val().length + 1;
 

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.