Merge pull request #46 from dkamburov/master

kdinev · kdinev · commit 50b615c9ace9 · 2016-06-04T13:27:28.000+03:00
Avoid circular reference when cloning options
diff --git a/index.html b/index.html
@@ -20,7 +20,7 @@
 	<script src="https://npmcdn.com/typescript@1.8.10/lib/typescript.js"></script>
 	<script src="https://npmcdn.com/reflect-metadata@0.1.3"></script>
 	<script src="https://npmcdn.com/systemjs@0.19.27/dist/system.src.js"></script>
-	<script src="./../systemjs.config.js"></script>
+	<script src="./systemjs.config.js"></script>
 
 	<!-- Ignite UI Required Combined JavaScript Files -->
 	<script src="http://cdn-na.infragistics.com/igniteui/latest/js/infragistics.core.js"></script>
@@ -32,7 +32,7 @@
 	<script src="http://netdna.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
 
 	<script>
-		System.import('app/boot')
+		System.import('app/boot.ts')
 			.then(null, console.error.bind(console));
 	</script>
 	
diff --git a/samples/igCombo/igCombo.html b/samples/igCombo/igCombo.html
@@ -12,7 +12,7 @@
 	<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" type="text/css" />
 	<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css" type="text/css"
 	/>
-	<link rel="stylesheet" href="/samples/sample.css" />
+	<link rel="stylesheet" href="../sample.css" />
 
 	<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.validator.css"
 		rel="stylesheet" />
diff --git a/samples/igGrid-TopLevelOpts/igGrid-TopLevelOpts.html b/samples/igGrid-TopLevelOpts/igGrid-TopLevelOpts.html
@@ -8,7 +8,7 @@
 	<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css" type="text/css" />
 	<link href="http://cdn-na.infragistics.com/igniteui/latest/css/themes/infragistics/infragistics.theme.css" rel="stylesheet" type="text/css" />
 	<link href="http://cdn-na.infragistics.com/igniteui/latest/css/structure/infragistics.css" rel="stylesheet" type="text/css" />
-	<link rel="stylesheet" href="/samples/sample.css" />
+	<link rel="stylesheet" href="../sample.css" />
 
 </head>
 <body class="container">
diff --git a/samples/igGrid/igGrid.html b/samples/igGrid/igGrid.html
@@ -8,7 +8,7 @@
 	<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css" type="text/css" />
 	<link href="http://cdn-na.infragistics.com/igniteui/latest/css/themes/infragistics/infragistics.theme.css" rel="stylesheet" type="text/css" />
 	<link href="http://cdn-na.infragistics.com/igniteui/latest/css/structure/infragistics.css" rel="stylesheet" type="text/css" />
-	<link rel="stylesheet" href="/samples/sample.css" />
+	<link rel="stylesheet" href="../sample.css" />
 
 </head>
 <body class="container">
diff --git a/samples/igHierarchicalGrid/igHierarchicalGrid.html b/samples/igHierarchicalGrid/igHierarchicalGrid.html
@@ -8,7 +8,7 @@
 	<link type="text/css" href="http://cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.shared.css" rel="stylesheet" />
 	<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" type="text/css" />
 	<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css" type="text/css" />
-	<link rel="stylesheet" href="/samples/sample.css" />
+	<link rel="stylesheet" href="../sample.css" />
 	
 <link type="text/css" href="http://cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.grid.css" rel="stylesheet" />
 <link type="text/css" href="http://cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.editors.css" rel="stylesheet" />
diff --git a/samples/igPivotGrid-FlatDataSource/igPivotGrid-FlatDataSource.html b/samples/igPivotGrid-FlatDataSource/igPivotGrid-FlatDataSource.html
@@ -8,7 +8,7 @@
 	<link href="http://cdn-na.infragistics.com/igniteui/latest/css/structure/infragistics.css" rel="stylesheet" />
 	<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" type="text/css" />
 	<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css" type="text/css" />
-	<link rel="stylesheet" href="/samples/sample.css" />
+	<link rel="stylesheet" href="../sample.css" />
 	
 
 	<style>
diff --git a/samples/igPivotGrid-XmlaDataSource/igPivotGrid-XmlaDataSource.html b/samples/igPivotGrid-XmlaDataSource/igPivotGrid-XmlaDataSource.html
@@ -8,7 +8,7 @@
 	<link type="text/css" href="http://cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.shared.css" rel="stylesheet" />
 	<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" type="text/css" />
 	<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css" type="text/css" />
-	<link rel="stylesheet" href="/samples/sample.css" />
+	<link rel="stylesheet" href="../sample.css" />
 	
 	<link type="text/css" href="http://cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.grid.css" rel="stylesheet" />    
 	<link type="text/css" href="http://cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.pivot.css" rel="stylesheet" />
diff --git a/samples/igTreeGrid/igTreeGrid.html b/samples/igTreeGrid/igTreeGrid.html
@@ -8,7 +8,7 @@
 	<link type="text/css" href="http://cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.shared.css" rel="stylesheet" />
 	<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" type="text/css" />
 	<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css" type="text/css" />
-	<link rel="stylesheet" href="/samples/sample.css" />
+	<link rel="stylesheet" href="../sample.css" />
 
 	<link type="text/css" href="http://cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.grid.css" rel="stylesheet" />
 	<link type="text/css" href="http://cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.treegrid.css" rel="stylesheet" />
diff --git a/src/igniteui.angular2.ts b/src/igniteui.angular2.ts
@@ -199,7 +199,7 @@ export class IgControlBase<Model> implements DoCheck {
 			}
 
 			if (!this.equalsDiff(opts, this._opts, diff)) {
-				this._opts = JSON.parse(JSON.stringify(opts));
+				this._opts = jQuery.extend(true, {}, opts);
 				for (i = 0; i < diff.length; i++) {
 					option = diff[i].key;
 					if (jQuery.ui[this._widgetName] &&

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ export class IgControlBase<Model> implements DoCheck {`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`if (!this.equalsDiff(opts, this._opts, diff)) {`
`202`		`- this._opts = JSON.parse(JSON.stringify(opts));`
	`202`	`+ this._opts = jQuery.extend(true, {}, opts);`
`203`	`203`	`for (i = 0; i < diff.length; i++) {`
`204`	`204`	`option = diff[i].key;`
`205`	`205`	`if (jQuery.ui[this._widgetName] &&`