@progress/kendo-angular-inputs 8.0.8 → 8.0.9-dev.202203231216

package/dist/fesm5/index.js

@@ -514,7 +514,7 @@ var packageMetadata = {
     name: '@progress/kendo-angular-inputs',
     productName: 'Kendo UI for Angular',
     productCodes: ['KENDOUIANGULAR', 'KENDOUICOMPLETE'],
-    publishDate: 1646924118,
+    publishDate: 1648037581,
     version: '',
     licensingDocsUrl: 'https://www.telerik.com/kendo-angular-ui/my-license/?utm_medium=product&utm_source=kendoangular&utm_campaign=kendo-ui-angular-purchase-license-keys-warning'
 };
@@ -1598,9 +1598,13 @@ var RangeSliderComponent = /** @class */ (function (_super) {
         var lastCoords = this.draggedHandle.getBoundingClientRect();
         this.lastHandlePosition = { x: lastCoords.left, y: lastCoords.top };
         this.dragging = { value: true, target: target };
-        var left = args.pageX < this.lastHandlePosition.x;
-        var right = args.pageX > this.lastHandlePosition.x;
-        var up = args.pageY > this.lastHandlePosition.y;
+        var mousePos = {
+            x: (args.pageX - 0.5) - (lastCoords.width / 2),
+            y: (args.pageY - (lastCoords.width / 2))
+        };
+        var left = mousePos.x < this.lastHandlePosition.x;
+        var right = mousePos.x > this.lastHandlePosition.x;
+        var up = mousePos.y > this.lastHandlePosition.y;
         var moveStartHandle = function () { return _this.changeValue([eventValue(args, _this.track.nativeElement, _this.getProps()), _this.value[1]]); };
         var moveEndHandle = function () { return _this.changeValue([_this.value[0], eventValue(args, _this.track.nativeElement, _this.getProps())]); };
         var moveBothHandles = function () { return _this.changeValue([eventValue(args, _this.track.nativeElement, _this.getProps()), eventValue(args, _this.track.nativeElement, _this.getProps())]); };
@@ -1608,8 +1612,8 @@ var RangeSliderComponent = /** @class */ (function (_super) {
         var vertical = this.vertical;
         var horizontal = !vertical;
         var forward = (vertical && up) || (this.reverse ? horizontal && right : horizontal && left);
-        // const forward = (this.reverse ? (!this.vertical && !left) : (!this.vertical && left)) || (this.vertical && up);
-        if (this.value[0] === this.value[1]) {
+        var incorrectValueState = this.value[0] > this.value[1];
+        if (this.value[0] === this.value[1] || incorrectValueState) {
             if (forward) {
                 activeStartHandle ? moveStartHandle() : moveBothHandles();
             }
@@ -4514,7 +4518,6 @@ var MaskedTextBoxComponent = /** @class */ (function () {
          * Determines whether the MaskedTextBox is in its read-only state ([see example]({% slug readonly_maskedtextbox %})).
          */
         this.readonly = false;
-        this.hostClasses = true;
         /**
          * Represents a prompt character for the masked value.
          * @default `_`
@@ -4590,6 +4593,7 @@ var MaskedTextBoxComponent = /** @class */ (function () {
          * Fires each time the value changes.
          */
         this.valueChange = new EventEmitter();
+        this.hostClasses = true;
         this.focusClick = false;
         this.defaultRules = {
             "#": /[\d\s\+\-]/,
@@ -4720,20 +4724,13 @@ var MaskedTextBoxComponent = /** @class */ (function () {
         enumerable: true,
         configurable: true
     });
-    Object.defineProperty(MaskedTextBoxComponent.prototype, "hostDisabledClass", {
+    Object.defineProperty(MaskedTextBoxComponent.prototype, "rules", {
         get: function () {
-            return this.disabled;
+            return this._rules || this.defaultRules;
         },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(MaskedTextBoxComponent.prototype, "rules", {
         /**
          * Exposes the RegExp-based mask validation array ([see example]({% slug masks_maskedtextbox %})).
          */
-        get: function () {
-            return this._rules || this.defaultRules;
-        },
         set: function (value) {
             this._rules = Object.assign({}, this.defaultRules, value);
         },
@@ -4753,6 +4750,13 @@ var MaskedTextBoxComponent = /** @class */ (function () {
         enumerable: true,
         configurable: true
     });
+    Object.defineProperty(MaskedTextBoxComponent.prototype, "hostDisabledClass", {
+        get: function () {
+            return this.disabled;
+        },
+        enumerable: true,
+        configurable: true
+    });
     MaskedTextBoxComponent.prototype.ngOnInit = function () {
         if (this.hostElement) {
             this.renderer.removeAttribute(this.hostElement.nativeElement, "tabindex");
@@ -4830,7 +4834,7 @@ var MaskedTextBoxComponent = /** @class */ (function () {
         var value = e.target.value;
         var _a = this.selection, start = _a[0], end = _a[1];
         if (!this.mask) {
-            this.updateValue(value);
+            this.updateValueWithEvents(value);
             this.isPasted = false;
             return;
         }
@@ -4842,10 +4846,10 @@ var MaskedTextBoxComponent = /** @class */ (function () {
             result = this.service.maskInRange(value.slice(start, to), this.maskedValue, start, end);
         }
         else {
-            result = this.service.maskInput(value, this.maskedValue, e.target.selectionStart);
+            result = this.service.maskInput(value, this.maskedValue || '', e.target.selectionStart);
         }
         this.updateInput(result.value, result.selection);
-        this.updateValue(result.value);
+        this.updateValueWithEvents(result.value);
     };
     /**
      * @hidden
@@ -4861,20 +4865,13 @@ var MaskedTextBoxComponent = /** @class */ (function () {
         }
         var next = this.extractChanges(changes);
         this.updateService(next);
-        if (isChanged('value', changes)) {
-            var maskedValue = this.service.maskRaw(this.value);
-            if (maskedValue !== this.maskedValue) {
-                this.updateInput(maskedValue);
-            }
-        }
-        else if (anyChanged(['promptPlaceholder', 'includeLiterals'], changes)) {
+        var maskedValue = this.service.maskRaw(this.value);
+        this.updateInput(maskedValue, null, true);
+        if (changes.includeLiterals || isChanged('promptPlaceholder', changes)) {
             resolvedPromise.then(function () {
-                _this.updateValue(_this.maskedValue);
+                _this.updateValueWithEvents(_this.maskedValue);
             });
         }
-        else {
-            this.updateInput(this.service.maskRaw(this.value));
-        }
     };
     /**
      * @hidden
@@ -4883,6 +4880,9 @@ var MaskedTextBoxComponent = /** @class */ (function () {
     MaskedTextBoxComponent.prototype.writeValue = function (value) {
         this.value = this.normalizeValue(value);
         this.updateInput(this.service.maskRaw(this.value));
+        if (this.includeLiterals) {
+            this.updateValue(this.maskedValue);
+        }
     };
     /**
      * @hidden
@@ -4933,18 +4933,26 @@ var MaskedTextBoxComponent = /** @class */ (function () {
     /**
      * @hidden
      */
-    MaskedTextBoxComponent.prototype.updateValue = function (maskedValue) {
-        if (this.mask && !this.service.validationValue(maskedValue)) {
+    MaskedTextBoxComponent.prototype.updateValueWithEvents = function (maskedValue) {
+        this.updateValue(maskedValue);
+        if (hasObservers(this.valueChange)) {
+            this.valueChange.emit(this.value);
+        }
+    };
+    MaskedTextBoxComponent.prototype.updateValue = function (value) {
+        if (this.mask && !this.service.validationValue(value) && !this.includeLiterals) {
             this.value = '';
         }
         else {
-            this.value = this.service.rawValue(maskedValue);
+            this.value = this.service.rawValue(value);
         }
         this.onChange(this.value);
-        this.valueChange.emit(this.value);
     };
-    MaskedTextBoxComponent.prototype.updateInput = function (maskedValue, selection) {
+    MaskedTextBoxComponent.prototype.updateInput = function (maskedValue, selection, isFromOnChanges) {
         if (maskedValue === void 0) { maskedValue = ''; }
+        if (isFromOnChanges && maskedValue === this.maskedValue) {
+            return;
+        }
         this.maskedValue = maskedValue;
         var value = this.maskOnFocus && !this.focused && this.emptyMask ? '' : maskedValue;
         this.renderer.setProperty(this.input.nativeElement, "value", value);
@@ -5062,20 +5070,6 @@ var MaskedTextBoxComponent = /** @class */ (function () {
         __metadata("design:type", String),
         __metadata("design:paramtypes", [String])
     ], MaskedTextBoxComponent.prototype, "fillMode", null);
-    __decorate([
-        HostBinding('attr.dir'),
-        __metadata("design:type", String)
-    ], MaskedTextBoxComponent.prototype, "direction", void 0);
-    __decorate([
-        HostBinding('class.k-input'),
-        HostBinding('class.k-maskedtextbox'),
-        __metadata("design:type", Boolean)
-    ], MaskedTextBoxComponent.prototype, "hostClasses", void 0);
-    __decorate([
-        HostBinding('class.k-disabled'),
-        __metadata("design:type", Boolean),
-        __metadata("design:paramtypes", [])
-    ], MaskedTextBoxComponent.prototype, "hostDisabledClass", null);
     __decorate([
         Input(),
         __metadata("design:type", String)
@@ -5130,6 +5124,20 @@ var MaskedTextBoxComponent = /** @class */ (function () {
         Output(),
         __metadata("design:type", EventEmitter)
     ], MaskedTextBoxComponent.prototype, "valueChange", void 0);
+    __decorate([
+        HostBinding('attr.dir'),
+        __metadata("design:type", String)
+    ], MaskedTextBoxComponent.prototype, "direction", void 0);
+    __decorate([
+        HostBinding('class.k-input'),
+        HostBinding('class.k-maskedtextbox'),
+        __metadata("design:type", Boolean)
+    ], MaskedTextBoxComponent.prototype, "hostClasses", void 0);
+    __decorate([
+        HostBinding('class.k-disabled'),
+        __metadata("design:type", Boolean),
+        __metadata("design:paramtypes", [])
+    ], MaskedTextBoxComponent.prototype, "hostDisabledClass", null);
     __decorate([
         ViewChild('input', { static: true }),
         __metadata("design:type", ElementRef)
@@ -5836,8 +5844,9 @@ var MaskedTextBoxModule = /** @class */ (function () {
  * Returns true if the used browser is Safari.
  */
 var isSafari = function (userAgent) {
-    return detectDesktopBrowser(userAgent).safari ||
-        (detectMobileOS(userAgent) && detectMobileOS(userAgent).browser === 'mobilesafari');
+    var desktopBrowser = detectDesktopBrowser(userAgent);
+    var mobileOS$$1 = detectMobileOS(userAgent);
+    return (desktopBrowser && desktopBrowser.safari) || (mobileOS$$1 && mobileOS$$1.browser === 'mobilesafari');
 };
 /**
  * @hidden
@@ -5851,7 +5860,6 @@ var isJapanese = function (input) {
 
 /**
  * Specifies the adornments in the suffix container ([see examples]({% slug adornments_textbox %}#toc-suffixadornments)).
- *  @example
  * ```ts-no-run
  * _@Component({
  * selector: 'my-app',
@@ -7569,8 +7577,7 @@ var TextAreaComponent = /** @class */ (function (_super) {
 }(TextFieldsBase));
 
 /**
- * Specifies the adornments in the suffix container ([see example]({% slug textarea_adornments %}).
- *  @example
+ * Specifies the adornments in the suffix container ([see example]({% slug textarea_adornments %})).
  * ```ts-no-run
  * _@Component({
  * selector: 'my-app',

package/dist/npm/maskedtextbox/maskedtextbox.component.js

@@ -7,11 +7,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var core_1 = require("@angular/core");
 var forms_1 = require("@angular/forms");
+var kendo_angular_common_1 = require("@progress/kendo-angular-common");
 var kendo_angular_l10n_1 = require("@progress/kendo-angular-l10n");
 var kendo_licensing_1 = require("@progress/kendo-licensing");
 var package_metadata_1 = require("../package-metadata");
 var masking_service_1 = require("./masking.service");
-var kendo_angular_common_1 = require("@progress/kendo-angular-common");
 var dom_utils_1 = require("../common/dom-utils");
 var utils_1 = require("../common/utils");
 var resolvedPromise = Promise.resolve(null);
@@ -59,7 +59,6 @@ var MaskedTextBoxComponent = /** @class */ (function () {
          * Determines whether the MaskedTextBox is in its read-only state ([see example]({% slug readonly_maskedtextbox %})).
          */
         this.readonly = false;
-        this.hostClasses = true;
         /**
          * Represents a prompt character for the masked value.
          * @default `_`
@@ -135,6 +134,7 @@ var MaskedTextBoxComponent = /** @class */ (function () {
          * Fires each time the value changes.
          */
         this.valueChange = new core_1.EventEmitter();
+        this.hostClasses = true;
         this.focusClick = false;
         this.defaultRules = {
             "#": /[\d\s\+\-]/,
@@ -265,20 +265,13 @@ var MaskedTextBoxComponent = /** @class */ (function () {
         enumerable: true,
         configurable: true
     });
-    Object.defineProperty(MaskedTextBoxComponent.prototype, "hostDisabledClass", {
+    Object.defineProperty(MaskedTextBoxComponent.prototype, "rules", {
         get: function () {
-            return this.disabled;
+            return this._rules || this.defaultRules;
         },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(MaskedTextBoxComponent.prototype, "rules", {
         /**
          * Exposes the RegExp-based mask validation array ([see example]({% slug masks_maskedtextbox %})).
          */
-        get: function () {
-            return this._rules || this.defaultRules;
-        },
         set: function (value) {
             this._rules = Object.assign({}, this.defaultRules, value);
         },
@@ -298,6 +291,13 @@ var MaskedTextBoxComponent = /** @class */ (function () {
         enumerable: true,
         configurable: true
     });
+    Object.defineProperty(MaskedTextBoxComponent.prototype, "hostDisabledClass", {
+        get: function () {
+            return this.disabled;
+        },
+        enumerable: true,
+        configurable: true
+    });
     MaskedTextBoxComponent.prototype.ngOnInit = function () {
         if (this.hostElement) {
             this.renderer.removeAttribute(this.hostElement.nativeElement, "tabindex");
@@ -375,7 +375,7 @@ var MaskedTextBoxComponent = /** @class */ (function () {
         var value = e.target.value;
         var _a = this.selection, start = _a[0], end = _a[1];
         if (!this.mask) {
-            this.updateValue(value);
+            this.updateValueWithEvents(value);
             this.isPasted = false;
             return;
         }
@@ -387,10 +387,10 @@ var MaskedTextBoxComponent = /** @class */ (function () {
             result = this.service.maskInRange(value.slice(start, to), this.maskedValue, start, end);
         }
         else {
-            result = this.service.maskInput(value, this.maskedValue, e.target.selectionStart);
+            result = this.service.maskInput(value, this.maskedValue || '', e.target.selectionStart);
         }
         this.updateInput(result.value, result.selection);
-        this.updateValue(result.value);
+        this.updateValueWithEvents(result.value);
     };
     /**
      * @hidden
@@ -406,20 +406,13 @@ var MaskedTextBoxComponent = /** @class */ (function () {
         }
         var next = this.extractChanges(changes);
         this.updateService(next);
-        if (kendo_angular_common_1.isChanged('value', changes)) {
-            var maskedValue = this.service.maskRaw(this.value);
-            if (maskedValue !== this.maskedValue) {
-                this.updateInput(maskedValue);
-            }
-        }
-        else if (kendo_angular_common_1.anyChanged(['promptPlaceholder', 'includeLiterals'], changes)) {
+        var maskedValue = this.service.maskRaw(this.value);
+        this.updateInput(maskedValue, null, true);
+        if (changes.includeLiterals || kendo_angular_common_1.isChanged('promptPlaceholder', changes)) {
             resolvedPromise.then(function () {
-                _this.updateValue(_this.maskedValue);
+                _this.updateValueWithEvents(_this.maskedValue);
             });
         }
-        else {
-            this.updateInput(this.service.maskRaw(this.value));
-        }
     };
     /**
      * @hidden
@@ -428,6 +421,9 @@ var MaskedTextBoxComponent = /** @class */ (function () {
     MaskedTextBoxComponent.prototype.writeValue = function (value) {
         this.value = this.normalizeValue(value);
         this.updateInput(this.service.maskRaw(this.value));
+        if (this.includeLiterals) {
+            this.updateValue(this.maskedValue);
+        }
     };
     /**
      * @hidden
@@ -478,18 +474,26 @@ var MaskedTextBoxComponent = /** @class */ (function () {
     /**
      * @hidden
      */
-    MaskedTextBoxComponent.prototype.updateValue = function (maskedValue) {
-        if (this.mask && !this.service.validationValue(maskedValue)) {
+    MaskedTextBoxComponent.prototype.updateValueWithEvents = function (maskedValue) {
+        this.updateValue(maskedValue);
+        if (kendo_angular_common_1.hasObservers(this.valueChange)) {
+            this.valueChange.emit(this.value);
+        }
+    };
+    MaskedTextBoxComponent.prototype.updateValue = function (value) {
+        if (this.mask && !this.service.validationValue(value) && !this.includeLiterals) {
             this.value = '';
         }
         else {
-            this.value = this.service.rawValue(maskedValue);
+            this.value = this.service.rawValue(value);
         }
         this.onChange(this.value);
-        this.valueChange.emit(this.value);
     };
-    MaskedTextBoxComponent.prototype.updateInput = function (maskedValue, selection) {
+    MaskedTextBoxComponent.prototype.updateInput = function (maskedValue, selection, isFromOnChanges) {
         if (maskedValue === void 0) { maskedValue = ''; }
+        if (isFromOnChanges && maskedValue === this.maskedValue) {
+            return;
+        }
         this.maskedValue = maskedValue;
         var value = this.maskOnFocus && !this.focused && this.emptyMask ? '' : maskedValue;
         this.renderer.setProperty(this.input.nativeElement, "value", value);
@@ -607,20 +611,6 @@ var MaskedTextBoxComponent = /** @class */ (function () {
         tslib_1.__metadata("design:type", String),
         tslib_1.__metadata("design:paramtypes", [String])
     ], MaskedTextBoxComponent.prototype, "fillMode", null);
-    tslib_1.__decorate([
-        core_1.HostBinding('attr.dir'),
-        tslib_1.__metadata("design:type", String)
-    ], MaskedTextBoxComponent.prototype, "direction", void 0);
-    tslib_1.__decorate([
-        core_1.HostBinding('class.k-input'),
-        core_1.HostBinding('class.k-maskedtextbox'),
-        tslib_1.__metadata("design:type", Boolean)
-    ], MaskedTextBoxComponent.prototype, "hostClasses", void 0);
-    tslib_1.__decorate([
-        core_1.HostBinding('class.k-disabled'),
-        tslib_1.__metadata("design:type", Boolean),
-        tslib_1.__metadata("design:paramtypes", [])
-    ], MaskedTextBoxComponent.prototype, "hostDisabledClass", null);
     tslib_1.__decorate([
         core_1.Input(),
         tslib_1.__metadata("design:type", String)
@@ -675,6 +665,20 @@ var MaskedTextBoxComponent = /** @class */ (function () {
         core_1.Output(),
         tslib_1.__metadata("design:type", core_1.EventEmitter)
     ], MaskedTextBoxComponent.prototype, "valueChange", void 0);
+    tslib_1.__decorate([
+        core_1.HostBinding('attr.dir'),
+        tslib_1.__metadata("design:type", String)
+    ], MaskedTextBoxComponent.prototype, "direction", void 0);
+    tslib_1.__decorate([
+        core_1.HostBinding('class.k-input'),
+        core_1.HostBinding('class.k-maskedtextbox'),
+        tslib_1.__metadata("design:type", Boolean)
+    ], MaskedTextBoxComponent.prototype, "hostClasses", void 0);
+    tslib_1.__decorate([
+        core_1.HostBinding('class.k-disabled'),
+        tslib_1.__metadata("design:type", Boolean),
+        tslib_1.__metadata("design:paramtypes", [])
+    ], MaskedTextBoxComponent.prototype, "hostDisabledClass", null);
     tslib_1.__decorate([
         core_1.ViewChild('input', { static: true }),
         tslib_1.__metadata("design:type", core_1.ElementRef)

package/dist/npm/package-metadata.js

@@ -11,7 +11,7 @@ exports.packageMetadata = {
     name: '@progress/kendo-angular-inputs',
     productName: 'Kendo UI for Angular',
     productCodes: ['KENDOUIANGULAR', 'KENDOUICOMPLETE'],
-    publishDate: 1646924118,
+    publishDate: 1648037581,
     version: '',
     licensingDocsUrl: 'https://www.telerik.com/kendo-angular-ui/my-license/?utm_medium=product&utm_source=kendoangular&utm_campaign=kendo-ui-angular-purchase-license-keys-warning'
 };

package/dist/npm/rangeslider/rangeslider.component.js

@@ -228,9 +228,13 @@ var RangeSliderComponent = /** @class */ (function (_super) {
         var lastCoords = this.draggedHandle.getBoundingClientRect();
         this.lastHandlePosition = { x: lastCoords.left, y: lastCoords.top };
         this.dragging = { value: true, target: target };
-        var left = args.pageX < this.lastHandlePosition.x;
-        var right = args.pageX > this.lastHandlePosition.x;
-        var up = args.pageY > this.lastHandlePosition.y;
+        var mousePos = {
+            x: (args.pageX - 0.5) - (lastCoords.width / 2),
+            y: (args.pageY - (lastCoords.width / 2))
+        };
+        var left = mousePos.x < this.lastHandlePosition.x;
+        var right = mousePos.x > this.lastHandlePosition.x;
+        var up = mousePos.y > this.lastHandlePosition.y;
         var moveStartHandle = function () { return _this.changeValue([sliders_util_2.eventValue(args, _this.track.nativeElement, _this.getProps()), _this.value[1]]); };
         var moveEndHandle = function () { return _this.changeValue([_this.value[0], sliders_util_2.eventValue(args, _this.track.nativeElement, _this.getProps())]); };
         var moveBothHandles = function () { return _this.changeValue([sliders_util_2.eventValue(args, _this.track.nativeElement, _this.getProps()), sliders_util_2.eventValue(args, _this.track.nativeElement, _this.getProps())]); };
@@ -238,8 +242,8 @@ var RangeSliderComponent = /** @class */ (function (_super) {
         var vertical = this.vertical;
         var horizontal = !vertical;
         var forward = (vertical && up) || (this.reverse ? horizontal && right : horizontal && left);
-        // const forward = (this.reverse ? (!this.vertical && !left) : (!this.vertical && left)) || (this.vertical && up);
-        if (this.value[0] === this.value[1]) {
+        var incorrectValueState = this.value[0] > this.value[1];
+        if (this.value[0] === this.value[1] || incorrectValueState) {
             if (forward) {
                 activeStartHandle ? moveStartHandle() : moveBothHandles();
             }

package/dist/npm/shared/utils.js

@@ -11,8 +11,9 @@ var kendo_common_1 = require("@progress/kendo-common");
  * Returns true if the used browser is Safari.
  */
 exports.isSafari = function (userAgent) {
-    return kendo_common_1.detectDesktopBrowser(userAgent).safari ||
-        (kendo_common_1.detectMobileOS(userAgent) && kendo_common_1.detectMobileOS(userAgent).browser === 'mobilesafari');
+    var desktopBrowser = kendo_common_1.detectDesktopBrowser(userAgent);
+    var mobileOS = kendo_common_1.detectMobileOS(userAgent);
+    return (desktopBrowser && desktopBrowser.safari) || (mobileOS && mobileOS.browser === 'mobilesafari');
 };
 /**
  * @hidden

package/dist/npm/textarea/textarea-suffix.component.js

@@ -7,8 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var core_1 = require("@angular/core");
 /**
- * Specifies the adornments in the suffix container ([see example]({% slug textarea_adornments %}).
- *  @example
+ * Specifies the adornments in the suffix container ([see example]({% slug textarea_adornments %})).
  * ```ts-no-run
  * _@Component({
  * selector: 'my-app',

package/dist/npm/textbox/textbox-suffix.directive.js

@@ -8,7 +8,6 @@ var tslib_1 = require("tslib");
 var core_1 = require("@angular/core");
 /**
  * Specifies the adornments in the suffix container ([see examples]({% slug adornments_textbox %}#toc-suffixadornments)).
- *  @example
  * ```ts-no-run
  * _@Component({
  * selector: 'my-app',