Merge pull request #59 from dkamburov/master

Update the model with a stored value, when a new data source is applied

Author: kdinev

src/igniteui-angular.js

@@ -23,7 +23,7 @@
         if (!model) {
             return;
         }
-        var controlName = attrs["data-ig-control-name"], unbinder;
+        var controlName = attrs["data-ig-control-name"], unbinder, comboItems;
         /**
          * Support both versions igCombo value methods before and after 15.1 
          */
@@ -36,6 +36,7 @@
             }
         }
         function setControlValue(value) {
+            comboItems = value;
             if (typeof value === "string") {
                 // in case view value is changed from text field (default Array.toString representation is comma separated)
                 value = value.split(",");
@@ -67,6 +68,8 @@
             items = comboValue(combo);
             angular.copy(newValue, newDataSource);
             combo._setOption("dataSource", newDataSource);
+            //if the items were not in the old data source, use stored values
+            items = items.length !== 0 ? items : comboItems;
             combo.value(items);
         }, true);
         markWatcher(scope, controlName, attrs);

test/e2e/scenarios.js

@@ -609,6 +609,13 @@ describe("my app", function() {
 			expect(browser.driver.sleep(250)).toBe(undefined); //util.getResult(combo + '.igCombo("option", "delayInputChangeProcessing");')
         	expect(util.getResult(scope + ".combo.value1")).toBe(2);
 		});
+
+		it("should update the ng-model when the data has been changed", function () {
+			util.executeScript(scope + ".northwind = [{'ProductID': 21, 'ProductName': 'Strawberry'}];");
+			util.executeScript(scope + ".combo.value2 = [21];");
+			util.executeScript(scope + ".$apply();");
+			expect(util.getResult('$("#combo2").val()')).toBe("Strawberry");
+		});
 	});
 
 	describe("HTML Editor", function() {