SelectWrapper overwrites previous options

muratcakir · muratcakir · commit cb07710c46c6 · 2018-03-16T23:42:42.000+01:00
diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs
@@ -304,9 +304,9 @@ public static MvcHtmlString DatePickerDropDowns(this HtmlHelper html,
             monthsList.Attributes.Add("class", "date-part form-control noskin");
             yearsList.Attributes.Add("class", "date-part form-control noskin");
 
-			daysList.Attributes.Add("data-select-min-results-for-search", "100");
-			monthsList.Attributes.Add("data-select-min-results-for-search", "100");
-			//yearsList.Attributes.Add("data-select-min-results-for-search", "100");
+			daysList.Attributes.Add("data-minimum-results-for-search", "100");
+			monthsList.Attributes.Add("data-minimum-results-for-search", "100");
+			//yearsList.Attributes.Add("data-minimum-results-for-search", "100");
 
 			if (disabled)
 			{
diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Shared/EditorTemplates/Html.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Shared/EditorTemplates/Html.cshtml
@@ -27,13 +27,6 @@
 	{
 		Html.AddScriptParts(true, locFile.VirtualPath);
 	}
-
-	// Find summernote ImageAttributes plugin localization file
-	locFile = base.ResolveLocalizationFile(WorkContext.WorkingLanguage.LanguageCulture, "~/Content/editors/summernote/plugin/image/lang", "*.js", null);
-	if (locFile != null)
-	{
-		Html.AddScriptParts(true, locFile.VirtualPath);
-	}
 }
 
 @if (lazy)
diff --git a/src/Presentation/SmartStore.Web/Scripts/smartstore.selectwrapper.js b/src/Presentation/SmartStore.Web/Scripts/smartstore.selectwrapper.js
@@ -5,6 +5,14 @@
 ;
 (function ($, window, document, undefined) {
 
+	// Customize select2 defaults
+	$.extend($.fn.select2.defaults.defaults, {
+		minimumResultsForSearch: 12,
+		theme: 'bootstrap',
+		width: 'style', // 'resolve',
+		dropdownAutoWidth: false
+	});
+
 	var lists = [];
 
 	function load(url, selectedId, callback) {
@@ -121,7 +129,7 @@
     		lists[options.resetDataUrl] = null;
     		return this.each(function () { });
 		}
-		
+
 		options = options || {};
 
         return this.each(function () {
@@ -139,30 +147,6 @@
             	}
             }
 
-			if (!options.lazy && sel.data("select-url")) {
-				options.lazy = {
-					url: sel.data("select-url"),
-					loaded: sel.data("select-loaded")
-				}
-			}
-
-			if (!options.init && sel.data("select-init-text") && sel.data("select-selected-id")) {
-				options.init = {
-					id: sel.data("select-selected-id"),
-					text: sel.data("select-init-text")
-				}
-			}
-
-            var autoWidth = sel.hasClass("autowidth"),
-                minResultsForSearch = sel.data("select-min-results-for-search"),
-                minInputLength = sel.data("select-min-input-length"),
-				noCache = sel.data("select-nocache"), // future use
-				lazy = options.lazy,
-				url = options.lazy ? options.lazy.url : null,
-				loaded = options.lazy ? options.lazy.loaded : null,
-				initText = options.init ? options.init.text : null,
-				selectedId = options.init ? options.init.id : null;
-
 			var placeholder = getPlaceholder();
 
             // following code only applicable to select boxes (not input:hidden)
@@ -210,15 +194,10 @@
             }
 
             var opts = {
-            	width: 'style', // 'resolve',
-            	dropdownAutoWidth: false,
                 allowClear: !!(placeholder), // assuming that a placeholder indicates nullability
                 placeholder: placeholder,
-                minimumResultsForSearch: _.isNumber(minResultsForSearch) ? minResultsForSearch : 8,
-                minimumInputLength: _.isNumber(minInputLength) ? minInputLength : 0,
                 templateResult: renderSelectItem,
                 templateSelection: renderSelectItem,
-				theme: 'bootstrap',
 				closeOnSelect: !(sel.prop('multiple') || sel.data("tags")),
 				adaptContainerCssClass: function (c) {
 					if (c.startsWith("select-"))
@@ -234,11 +213,25 @@
 				}
 			};
 
+			if (!options.lazy && sel.data("select-url")) {
+				opts.lazy = {
+					url: sel.data("select-url"),
+					loaded: sel.data("select-loaded")
+				}
+			}
+
+			if (!options.init && sel.data("select-init-text") && sel.data("select-selected-id")) {
+				opts.init = {
+					id: sel.data("select-selected-id"),
+					text: sel.data("select-init-text")
+				}
+			}
+
 			if ($.isPlainObject(options)) {
 				opts = $.extend({}, opts, options);
 			}
 
-			if (url) {
+			if (opts.lazy && opts.lazy.url) {
 				// url specified: load data remotely (lazily on first open)...
 				opts.dataAdapter = $.fn.select2.amd.require('select2/data/lazyAdapter');
 			}
@@ -249,7 +242,7 @@
 
 			sel.select2(opts);
 
-            if (autoWidth) {
+			if (sel.hasClass("autowidth")) {
                 // move special "autowidth" class to plugin container,
             	// so we are able to omit min-width per css
                 sel.data("select2").$container.addClass("autowidth");

Original file line number	Diff line number	Diff line change
`@@ -27,13 +27,6 @@`
`27`	`27`	`{`
`28`	`28`	`Html.AddScriptParts(true, locFile.VirtualPath);`
`29`	`29`	`}`
`30`		`-`
`31`		`- // Find summernote ImageAttributes plugin localization file`
`32`		`- locFile = base.ResolveLocalizationFile(WorkContext.WorkingLanguage.LanguageCulture, "~/Content/editors/summernote/plugin/image/lang", "*.js", null);`
`33`		`- if (locFile != null)`
`34`		`- {`
`35`		`- Html.AddScriptParts(true, locFile.VirtualPath);`
`36`		`- }`
`37`	`30`	`}`
`38`	`31`
`39`	`32`	`@if (lazy)`