Merge 6bc0949 into d9df85e

IgniteUI · Sep 28, 2020 · e916040 · e916040
2 parents d9df85e + 6bc0949
commit e916040
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,17 +1,14 @@
 sudo: required
-dist: trusty
+dist: xenial
 language: node_js
 node_js:
 - '10.13.0'
+addons:
+  chrome: stable
+services:
+  - xvfb
 before_install:
-- export NG_CLI_ANALYTICS=false
-- export CHROME_BIN=/usr/bin/google-chrome
 - export DISPLAY=:99.0
-- sh -e /etc/init.d/xvfb start
-- sudo apt-get -qq update
-- sudo apt-get install -y libappindicator1 fonts-liberation
-- wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-- sudo dpkg -i google-chrome*.deb
 - sleep 3
 
 script:

diff --git a/projects/igniteui-angular-wrappers/src/lib/igcombo/igcombo.component.ts b/projects/igniteui-angular-wrappers/src/lib/igcombo/igcombo.component.ts
@@ -43,7 +43,12 @@ export class IgComboComponent extends IgControlBase<IgCombo> implements ControlV
         if (this._model) {
             if (this.options.allowCustomValue) {
                 jQuery(this._el).on("input", function (evt) {
-                    that._model.viewToModelUpdate(evt.target.value);
+                    // D.K. #324 Do not override the model value if the text value is representing the same model value
+                    let item = jQuery(that._el).data("igCombo").itemsFromValue(that._model.model);
+                    if (!item ||
+                        item.data && item.data[that.options.textKey] !== evt.target.value) {
+                        that._model.viewToModelUpdate(evt.target.value);
+                    }
                 });
 
                 jQuery(this._el).closest(".ui-igcombo-wrapper").find(".ui-igcombo-clear").on("click", function() {