Skip to content

Commit e2831e8

Browse files
mpavlinovmpavlinov
authored
Merge pull request #79 from dkamburov/master
Use AngularJS build 1.5.8 into the samples
2 parents 1f04af1 + 47c9c15 commit e2831e8

22 files changed

+36
-39
lines changed

‎index.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ <h2>Try it out...</h2>
9292
<div class="col-sm-8">
9393
<ig-grid id="employees-grid"
9494
data-source="employees"
95-
primary-key="ProductID"
95+
primary-key="EmployeeID"
9696
auto-generate-columns="false">
9797
<columns>
9898
<column key="EmployeeID" header-text="ID" data-type="number"></column>
@@ -105,7 +105,7 @@ <h2>Try it out...</h2>
105105
<h4>Code</h4>
106106
<pre>&lt;ig-grid id=&quot;employees-grid&quot;
107107
data-source=&quot;employees&quot;
108-
primary-key=&quot;productID&quot;
108+
primary-key=&quot;employeeID&quot;
109109
auto-generate-columns=&quot;false&quot;&gt;
110110
&lt;columns&gt;
111111
&lt;column key=&quot;employeeID&quot; header-text=&quot;ID&quot; width=&quot;65px&quot; data-type=&quot;number&quot;&gt;&lt;/column&gt;
@@ -186,8 +186,8 @@ <h2>Samples</h2>
186186
<script src="http://code.jquery.com/jquery-1.10.2.min.js"></script>
187187
<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/jquery-ui.min.js"></script>
188188
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
189-
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.2.3/angular.min.js"></script>
190-
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.2.3/angular-route.min.js"></script>
189+
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.8/angular.min.js"></script>
190+
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.8/angular-route.min.js"></script>
191191

192192
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/infragistics.core.js"></script>
193193
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/infragistics.lob.js"></script>

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"bower": "",
2929
"shelljs": "",
3030
"istanbul-coveralls": "",
31-
"karma": "",
31+
"karma": "0.13.22",
3232
"karma-jasmine": "",
3333
"karma-coverage": "",
3434
"karma-chrome-launcher": "",

‎samples/grid/master-detail/index.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,10 +167,10 @@ <h1 class="push-down-md">igGrid Master/Detail</h1>
167167
<script src="http://code.jquery.com/jquery-1.10.2.min.js"></script>
168168
<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/jquery-ui.min.js"></script>
169169
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
170-
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.2.3/angular.min.js"></script>
170+
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.8/angular.min.js"></script>
171171

172-
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.2.3/angular-resource.min.js"></script>
173-
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.2.3/angular-mocks.js"></script>
172+
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.8/angular-resource.min.js"></script>
173+
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.8/angular-mocks.js"></script>
174174

175175
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/infragistics.core.js"></script>
176176
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/infragistics.lob.js"></script>

‎samples/igCombo.html‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,26 +58,28 @@ <h1 class="push-down-md"><a href="http://igniteui.com/combo/overview" target="_b
5858
<input id="product-id" class="form-control" type="text" ng-model="combo.value1"/>
5959
<div class="text-sm text-muted text-right">values: 1 - 20</div>
6060
</div>
61-
<div class="col-sm-3 col-md-2">
61+
<div class="col-sm-3">
6262

6363
<ig-combo id="combo1"
6464
data-source="northwind"
6565
value-key-type="number"
6666
value-key="ProductID"
6767
text-key-type="string"
6868
text-key="ProductName"
69+
width="100%"
6970
ng-model="combo.value1">
7071
</ig-combo>
7172

7273
</div>
73-
<div class="col-sm-3 col-md-2">
74+
<div class="col-sm-3">
7475

7576
<ig-combo id="combo2"
7677
data-source="northwind"
7778
value-key-type="number"
7879
value-key="ProductID"
7980
text-key-type="string"
8081
text-key="ProductName"
82+
width="100%"
8183
ng-model="combo.value1">
8284
</ig-combo>
8385

@@ -107,13 +109,14 @@ <h2 class="h3">Edit Product Name</h2>
107109
<script src="http://code.jquery.com/jquery-1.10.2.min.js"></script>
108110
<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/jquery-ui.min.js"></script>
109111
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
110-
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.2.3/angular.min.js"></script>
112+
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.8/angular.min.js"></script>
111113

112114
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.util.js"></script>
113115
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.datasource.js"></script>
114116
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.shared.js"></script>
115117
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.combo.js"></script>
116118
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.validator.js"></script>
119+
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.templating.js"></script>
117120
<script src="../src/igniteui-angular.js"></script>
118121
<script src="js/igniteui-sample.js"></script>
119122
<script src="js/data/northwind.js"></script>

‎samples/igDataChart.html‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ <h1 class="push-down-md"><a href="http://igniteui.com/data-chart/overview" targe
7979
</series>
8080
</series>
8181
</ig-data-chart>
82-
<ig-zoombar target="#datachart1"></ig-zoombar>
82+
<ig-zoombar id="zoombar1" target="#datachart1"></ig-zoombar>
8383
</div>
8484
</div>
8585
</div>
@@ -95,10 +95,9 @@ <h1 class="push-down-md"><a href="http://igniteui.com/data-chart/overview" targe
9595

9696
<script src="http://code.jquery.com/jquery-1.10.2.min.js"></script>
9797
<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/jquery-ui.min.js"></script>
98-
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
99-
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.2.3/angular.min.js"></script>
100-
101-
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.util.js"></script>
98+
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.8/angular.min.js"></script>
99+
100+
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.util.js"></script>
102101
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.shared.js"></script>
103102
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.datasource.js"></script>
104103
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.dv.core.js"></script>

‎samples/igDialog.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ <h1 class="push-down-md"><a href="http://igniteui.com/dialog-window/overview" ta
7575
<script src="http://code.jquery.com/jquery-1.10.2.min.js"></script>
7676
<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/jquery-ui.min.js"></script>
7777
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
78-
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.2.3/angular.min.js"></script>
78+
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.8/angular.min.js"></script>
7979

8080
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.util.js"></script>
8181
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.datasource.js"></script>

‎samples/igEditors.html‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,6 @@ <h1 class="push-down-md"><a href="http://igniteui.com/editors/overview" target="
7272
<td><input class="form-control" type="text" ng-model="editors.date" /></td>
7373
<td><ig-date-editor class="form-control" ng-model="editors.date"></ig-date-editor></td>
7474
</tr>
75-
<tr>
76-
<td>igEditor</td>
77-
<td><input class="form-control" class="form-control" type="text" ng-model="editors.editor" /></td>
78-
<td><ig-editor class="form-control" class="form-control" ng-model="editors.editor"></ig-editor></td>
79-
</tr>
8075
<tr>
8176
<td>igMaskEditor</td>
8277
<td><input class="form-control" type="text" ng-model="editors.mask" /></td>
@@ -118,7 +113,7 @@ <h1 class="push-down-md"><a href="http://igniteui.com/editors/overview" target="
118113
<script src="http://code.jquery.com/jquery-1.10.2.min.js"></script>
119114
<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/jquery-ui.min.js"></script>
120115
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
121-
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.2.3/angular.min.js"></script>
116+
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.8/angular.min.js"></script>
122117

123118
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.util.js"></script>
124119
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.datasource.js"></script>

‎samples/igGrid-controller.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ <h3>Add Product</h3>
108108
<script src="http://code.jquery.com/jquery-1.10.2.min.js"></script>
109109
<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/jquery-ui.min.js"></script>
110110
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
111-
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.2.3/angular.min.js"></script>
111+
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.8/angular.min.js"></script>
112112

113113
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.util.js"></script>
114114
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.datasource.js"></script>

‎samples/igGrid.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ <h3>Add Product</h3>
145145
<script src="http://code.jquery.com/jquery-1.10.2.min.js"></script>
146146
<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/jquery-ui.min.js"></script>
147147
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
148-
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.2.3/angular.min.js"></script>
148+
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.8/angular.min.js"></script>
149149

150150
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.util.js"></script>
151151
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.datasource.js"></script>

‎samples/igHierarchicalGrid.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ <h1 class="push-down-md"><a href="http://igniteui.com/hierarchical-grid/overview
9292
<script src="http://code.jquery.com/jquery-1.10.2.min.js"></script>
9393
<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/jquery-ui.min.js"></script>
9494
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
95-
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.2.3/angular.min.js"></script>
95+
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.8/angular.min.js"></script>
9696

9797
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.util.js"></script>
9898
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.datasource.js"></script>

0 commit comments

Comments
 (0)