Addressing comments

tiliev · Jun 22, 2017 · bcfc6cf · bcfc6cf
1 parent 2d65b94
commit bcfc6cf
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 80 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,4 @@
+// Place your settings in this file to overwrite default and user settings.
+{
+	"editor.insertSpaces": false
+}
diff --git a/build/packages/combined-files.js b/build/packages/combined-files.js
@@ -107,16 +107,16 @@ module.exports = {
             },
             dest: "./dist/js/infragistics.core-lite.js",
             src: [
-                    "./dist/js/i18n/infragistics-en.js",
-                    "./dist/js/modules/infragistics.util.js",
-                    "./dist/js/modules/infragistics.util.jquery.js",
-                    "./dist/js/modules/infragistics.util.jquerydeferred.js",
-                    "./dist/js/modules/infragistics.datasource.js",
-                    "./dist/js/modules/infragistics.templating.js",
-					"./dist/js/modules/infragistics.ui.widget.js",
-                    "./dist/js/modules/infragistics.ui.shared.js",
-                    "./dist/js/modules/infragistics.ui.scroll.js"
-                ]
+				"./dist/js/i18n/infragistics-en.js",
+				"./dist/js/modules/infragistics.util.js",
+				"./dist/js/modules/infragistics.util.jquery.js",
+				"./dist/js/modules/infragistics.util.jquerydeferred.js",
+				"./dist/js/modules/infragistics.datasource.js",
+				"./dist/js/modules/infragistics.templating.js",
+				"./dist/js/modules/infragistics.ui.widget.js",
+				"./dist/js/modules/infragistics.ui.shared.js",
+				"./dist/js/modules/infragistics.ui.scroll.js"
+			]
         }, 
         lob: { 
             options: {

diff --git a/src/js/infragistics.loader.js b/src/js/infragistics.loader.js
@@ -882,7 +882,6 @@ $.ig.dependencies = [
 	{
 		widget: "igCombo",
 		dependency: [
-			{ name: "igWidget" },
 			{ name: "igWidget" },
 			{ name: "igDataSource" },
 			{ name: "igTemplating" },

diff --git a/src/js/modules/infragistics.ui.combo.js b/src/js/modules/infragistics.ui.combo.js
@@ -13,6 +13,7 @@
 * infragistics.util.js
 * infragistics.util.jquery.js
 * infragistics.dataSource.js
+* infragistics.ui.widget.js
 *
 * Example to use:
 *   <script type="text/javascript">
@@ -28,10 +29,6 @@
 
 		// AMD. Register as an anonymous module.
 		define( [
-			"jquery",
-			"jquery-ui",
-			"./infragistics.util",
-			"./infragistics.util.jquery",
 			"./infragistics.ui.widget",
 			"./infragistics.templating",
 			"./infragistics.datasource",
@@ -1620,15 +1617,15 @@
                 inputInput: $.proxy(this._inputInputHandler, this)
             };
 
-            this._analyzeOptions();
+			this._analyzeOptions();
 
 			// Options related to localization
 			this._changeLocale();
-            this._analyzeInitialElem();
-            this._render();
-            this.validator();
-            this._attachEvents();
-            this.dataBind();
+			this._analyzeInitialElem();
+			this._render();
+			this.validator();
+			this._attachEvents();
+			this.dataBind();
 
             // P.P 07-Mar-2016 #212238: Incorrect confirmation of Japanese symbols using IME
             this._initCompositionObject();

diff --git a/src/js/modules/infragistics.ui.dialog.js b/src/js/modules/infragistics.ui.dialog.js
@@ -15,6 +15,8 @@
 * jquery.ui.resizable.js
 * infragistics.util.js
 * infragistics.util.jquery.js
+* infragistics.ui.widget.js
+*
 * Example to use:
 *	<script type="text/javascript">
 *	$(function () {
@@ -29,10 +31,6 @@
 
 		// AMD. Register as an anonymous module.
 		define( [
-			"jquery",
-			"jquery-ui",
-			"./infragistics.util",
-			"./infragistics.util.jquery",
 			"./infragistics.ui.widget"
 		], factory );
 	} else {

diff --git a/src/js/modules/infragistics.ui.editors.js b/src/js/modules/infragistics.ui.editors.js
@@ -10,6 +10,7 @@
  *	jquery.ui-1.9.0.js
  *	infragistics.util.js
  *  infragistics.util.jquery.js
+ *  infragistics.ui.widget.js
  *	infragistics.ui.scroll.js
  *	infragistics.ui.validator.js
  */
@@ -19,10 +20,7 @@
 
 		// AMD. Register as an anonymous module.
 		define( [
-			"jquery",
-			"jquery-ui",
-			"./infragistics.util",
-			"./infragistics.util.jquery",
+			"./infragistics.ui.widget",
 			"./infragistics.ui.scroll",
 			"./infragistics.ui.validator"
 		], factory );
@@ -4519,7 +4517,8 @@
 					if (delta % 1 !== 0) {
 						fractional = delta.toString().substring(delta.toString().indexOf(".") + 1);
 						if (fractional.toString().length > this.options.maxDecimals) {
-							throw new Error($.ig.util.stringFormat(this._getLocaleValue("spinDeltaContainsExceedsMaxDecimals"),
+							throw new Error($.ig.util.stringFormat(
+								this._getLocaleValue("spinDeltaContainsExceedsMaxDecimals"),
 								this.options.maxDecimals));
 						}
 					}
@@ -5179,7 +5178,7 @@
 
 					// Raise Warning level 2
 					this._sendNotification("warning",
-						$.ig.util.stringFormat(this._getLocaleValue("maxValExceedSetErrMsg"),
+						$.ig.util.stringFormat(this._getLocaleValue("minValExceedSetErrMsg"),
 							this.options.minValue));
 				}
 
@@ -5249,22 +5248,6 @@
 				this._updateValue(newValue);
 			}
 		},
-		_getRegionalOption: function (key) {
-			var regional = this.options.regional;
-			if (this.options[ key ]) {
-				return this.options[ key ];
-			}
-			if (typeof regional === "string") {
-				regional = $.ig.regional[ regional ];
-			}
-			if (regional && regional[ key ]) {
-				return regional[ key ];
-			} else {
-
-				// return defaults
-				return $.ig.regional.defaults[ key ];
-			}
-		},
 		_convertScientificToNumeric: function (num) {
 			var stringValue = num.toString(),
 				scientificPrecision = stringValue
@@ -5754,7 +5737,7 @@
 
 							// Raise Warning level 2
 							this._sendNotification("warning",
-								$.ig.util.stringFormat(this._getLocaleValue("maxValExceedSetErrMsg"),
+								$.ig.util.stringFormat(this._getLocaleValue("minValExceedSetErrMsg"),
 									this.options.value));
 						}
 					}
@@ -6075,7 +6058,7 @@
 
 					//Notify
 					this._sendNotification("warning",
-						$.ig.util.stringFormat(this._getLocaleValue("maxValExceedSetErrMsg"),
+						$.ig.util.stringFormat(this._getLocaleValue("minValExceedSetErrMsg"),
 						this.options.minValue));
 				}
 

diff --git a/src/js/modules/infragistics.ui.tree.js b/src/js/modules/infragistics.ui.tree.js
@@ -13,9 +13,10 @@
  *	jquery.ui.draggable.js
  *	jquery.ui.droppable.js
  *	infragistics.templating.js
-  *	infragistics.util.js
+ *	infragistics.util.js
  *  infragistics.util.jquery.js
  *	infragistics.dataSource.js
+ *  infragistics.ui.widget.js
  *	infragistics.ui.tree-en.js
  */
 
@@ -24,10 +25,6 @@
 
 		// AMD. Register as an anonymous module.
 		define( [
-			"jquery",
-			"jquery-ui",
-			"./infragistics.util",
-			"./infragistics.util.jquery",
 			"./infragistics.ui.widget",
 			"./infragistics.datasource",
 			"./infragistics.templating",
@@ -1740,7 +1737,12 @@
 			nodeDropped: "nodeDropped"
 		},
 		_createWidget: function (options) {
-			this._changeLocale(options);
+			/* !Strip dummy objects from options, because they are defined for documentation purposes only! */
+			this.options.bindings = null;
+
+			if (options && options.dragAndDrop) {
+				this._changeLocale();
+			}
 			$.Widget.prototype._createWidget.apply(this, arguments);
 		},
 		_create: function () {
@@ -1880,28 +1882,24 @@
 				break;
 			}
 		},
-		_changeLocale: function (options) {
-			/* !Strip dummy objects from options, because they are defined for documentation purposes only! */
-			this.options.bindings = null;
-			options = options || this.options;
-			if (options && options.dragAndDrop) {
-				this.options.dragAndDropSettings.moveToMarkup =
-					"<div><p><span></span>" + this._getLocaleValue("moveTo") + "</p></div>";
-				this.options.dragAndDropSettings.moveBetweenMarkup =
-					"<div><p><span></span>" + this._getLocaleValue("moveBetween") + "</p></div>";
-				this.options.dragAndDropSettings.moveAfterMarkup =
-					"<div><p><span></span>" + this._getLocaleValue("moveAfter") + "</p></div>";
-				this.options.dragAndDropSettings.moveBeforeMarkup =
-					"<div><p><span></span>" + this._getLocaleValue("moveBefore") + "</p></div>";
-				this.options.dragAndDropSettings.copyToMarkup =
-					"<div><p><span></span>" + this._getLocaleValue("copyTo") + "</p></div>";
-				this.options.dragAndDropSettings.copyBetweenMarkup =
-					"<div><p><span></span>" + this._getLocaleValue("copyBetween") + "</p></div>";
-				this.options.dragAndDropSettings.copyAfterMarkup =
-					"<div><p><span></span>" + this._getLocaleValue("copyAfter") + "</p></div>";
-				this.options.dragAndDropSettings.copyBeforeMarkup =
-					"<div><p><span></span>" + this._getLocaleValue("copyBefore") + "</p></div>";
-			}
+		_changeLocale: function () {
+			this._super();
+			this.options.dragAndDropSettings.moveToMarkup =
+				"<div><p><span></span>" + this._getLocaleValue("moveTo") + "</p></div>";
+			this.options.dragAndDropSettings.moveBetweenMarkup =
+				"<div><p><span></span>" + this._getLocaleValue("moveBetween") + "</p></div>";
+			this.options.dragAndDropSettings.moveAfterMarkup =
+				"<div><p><span></span>" + this._getLocaleValue("moveAfter") + "</p></div>";
+			this.options.dragAndDropSettings.moveBeforeMarkup =
+				"<div><p><span></span>" + this._getLocaleValue("moveBefore") + "</p></div>";
+			this.options.dragAndDropSettings.copyToMarkup =
+				"<div><p><span></span>" + this._getLocaleValue("copyTo") + "</p></div>";
+			this.options.dragAndDropSettings.copyBetweenMarkup =
+				"<div><p><span></span>" + this._getLocaleValue("copyBetween") + "</p></div>";
+			this.options.dragAndDropSettings.copyAfterMarkup =
+				"<div><p><span></span>" + this._getLocaleValue("copyAfter") + "</p></div>";
+			this.options.dragAndDropSettings.copyBeforeMarkup =
+				"<div><p><span></span>" + this._getLocaleValue("copyBefore") + "</p></div>";
 		},
 		_removeCheckboxes: function () {
 			this.element.find("span[data-role=checkbox]").remove();

diff --git a/src/js/modules/infragistics.ui.widget.js b/src/js/modules/infragistics.ui.widget.js
@@ -1,5 +1,5 @@
 /*!@license
- * Infragistics.Web.ClientUI Toolbar <build_number>
+ * Infragistics.Web.ClientUI Base Widget <build_number>
  *
  * Copyright (c) 2011-<year> Infragistics Inc.
  * <Licensing info>
@@ -37,7 +37,7 @@
     $.widget("ui.igWidget", {
 		localeWidgetName: null,
         options: {
-            /* type="string" Set/Get the locale setting for the widget.
+            /* type="string|object" Set/Get the locale setting for the widget.
             ```
                  //Initialize
                 $(".selector").igWidget({
@@ -66,7 +66,7 @@
                 $(".selector").igWidget("option", "regional", "ja");
             ```
             */
-            regional: "en-US"
+			regional: "en-US"
 		},
 		_setOption: function (option, value) {
 			var prevValue = this.options[ option ];
@@ -86,6 +86,22 @@
 				break;
 			}
 		},
+		_getRegionalOption: function (key) {
+			var regional = this.options.regional;
+			if (this.options[ key ]) {
+				return this.options[ key ];
+			}
+			if (typeof regional === "string") {
+				regional = $.ig.regional[ regional ];
+			}
+			if (regional && regional[ key ]) {
+				return regional[ key ];
+			} else {
+
+				// return defaults
+				return $.ig.regional.defaults[ key ];
+			}
+		},
 		_getLocaleValue: function (key) {
 			var locale = this.options.locale,
 				widgetName = this.localeWidgetName || this.widgetName.split("ig")[ 1 ];