Merge pull request #105 from dkamburov/master

Fix for internal issue #234087. Remove configuration attributes from …

Author: mpavlinov

src/igniteui-angular.js

@@ -724,10 +724,6 @@
 						if (context) {
 							var options = scope.$eval(attrs[ controlName ]) ||
 								extractOptions(controlName, context, {}, element, scope);
-							/* removing the width and height attributes on the placeholder, because they affect the control dimensions */
-							if (element.removeAttr) {
-								element.removeAttr("width").removeAttr("height");
-							}
 
 							if (attrs.source) {
 								options.dataSource = scope.$eval(attrs.source);
@@ -753,7 +749,22 @@
 								}
 							});
 
+							/* removing the width and height attributes on the placeholder, because they affect the control dimensions
+								remove other attributes too, they may confront with some html5 attributes for example draggable
+								D.K. fix for bug #234087
+							*/
+							for (var a in attrs) {
+								if (a !== "id" &&
+										!a.startsWith("$") &&
+										!a.startsWith("data-") &&
+										!a.startsWith("ng-") &&
+										element.removeAttr) {
+									element.removeAttr(a.replace(/([A-Z])/g, "-$1").toLowerCase());
+								}
+							}
+
 							element[ controlName ](options);
+
 						}
 					}
 				};

test/e2e/scenarios.js

@@ -572,6 +572,14 @@ describe("my app", function() {
 			//the other values should be preserved
 			expect(util.getResult('$("#grid1 tbody tr:eq(1) td")[2].innerHTML'))
 				.toBe(util.getResult('angular.element("#grid1").scope().northwind[1].UnitsOnOrder.toString()'));
+			expect(util.getResult('$("#grid1").attr("width")'))
+				.toBe(null);
+			expect(util.getResult('$("#grid1").attr("height")'))
+				.toBe(null);
+			expect(util.getResult('$("#grid1").attr("auto-commit")'))
+				.toBe(null);
+			expect(util.getResult('$("#grid1").attr("primary-key")'))
+				.toBe(null);
 		});
 
 		it("should apply column template correctly", function () {

test/unit/directiveSpecs.js

@@ -61,7 +61,7 @@ describe("Ignite directives", function() {
 	}));
 
 	it("should create dialog", inject(function($compile, $rootScope) {
-		var dialogTpl ='<ig-dialog id="dialog1" header-text="Foo" height="325px"><content>' +
+		var dialogTpl ='<ig-dialog id="dialog1" header-text="Foo" height="325px" draggable="true"><content>' +
 		'<p><img style="width: 220px" src="http://www.igniteui.com/images/samples/dialog-window/content.jpg" /></p><input style="margin: 5px" /></content>' +
 		'</ig-dialog>';
 		var dialog = angular.element('<div ng-app="my-app"><div ng-controller="NorthwindCtrl">' + dialogTpl + '</div>');
@@ -73,6 +73,8 @@ describe("Ignite directives", function() {
 		expect(img.length).toBe(1);
 		expect(dialogElement.length).toBe(1);
 		expect(dialogElement.data("igDialog")).not.toBeUndefined();
+		expect(dialogElement.attr("draggable")).toBeUndefined();
+		expect(dialogElement.attr("height")).toBeUndefined();
 	}));
 
 	it("should create dialog with nested controls", inject(function($compile, $rootScope) {