Merging master

Author: kdinev

src/igniteui-angular.js

@@ -667,4 +667,4 @@
 			module.directive(control, igniteElementDirectiveConstructor);
 		}
 	}
-}(angular, jQuery));
+}(angular, jQuery));

test/app/index.html

@@ -89,6 +89,8 @@ <h1>igCombo</h1>
 		<ig-combo id="combo2" data-source="northwind" value-key-type="number" value-key="ProductID" text-key-type="string" text-Key="ProductName" ng-model="combo.value2">
             <multi-selection enabled="true"></multi-selection>
 		</ig-combo>
+		<ig-combo id="combo3" data-source="northwind" allow-custom-value="true" value-key="ProductID" text-key="ProductName" ng-model="combo.value1">
+    </ig-combo>
 		<br/>
 		<ul id="combomodel">
 			<li ng-repeat="record in northwind">

test/e2e/scenarios.js

@@ -562,7 +562,8 @@ describe("my app", function() {
 	describe("Combo", function() {
 		var scope = 'angular.element("#combo1").scope()',
 		combo = '$("#combo1")',
-		combo2 = '$("#combo2")';
+		combo2 = '$("#combo2")',
+		combo3 = '$("#combo3")';
 
 		it("should be initialized", function () {
 			util.resetNorthwindScope();
@@ -609,6 +610,14 @@ 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 combo value when allowCustomValue is true", function(){
+			util.executeScript(combo3 + ".focus();");
+			expect(util.getResult('typeInInputWrap("customValue1", ' + combo3 + ', "combo.value1");')).toBe(false);
+			expect(browser.driver.sleep(250)).toBe(undefined);
+			util.executeScript(combo3 + ".igCombo('comboWrapper').find('.ui-igcombo-button').click();");
+			expect(util.getResult(combo3 + '.igCombo("value")[0]')).toBe("customValue1");
+		});
 
 		it("should update the ng-model when the data has been changed", function () {
 			util.executeScript(scope + ".northwind = [{'ProductID': 21, 'ProductName': 'Strawberry'}];");
@@ -705,4 +714,4 @@ describe("my app", function() {
 			expect(util.getResult(textInModel)).toBe("newText");
 		});
 	});
-});
+});