Skip to content

Commit 4b2ace6

Browse files
AndreyChaykoAndreyChayko
committed
Updated angular material version to 1.1.4 and material design lite to version 1.3.0
1 parent 52db8e0 commit 4b2ace6

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

Diff for: ‎demo/fixed-header/angular-md-grid.html

+11-11
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<title>Angular Data Grid - Fix Header Table</title>
66
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
77
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700,400italic">
8-
<link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/angular_material/1.0.0/angular-material.min.css">
9-
<link rel="stylesheet" href="https://storage.googleapis.com/code.getmdl.io/1.0.6/material.indigo-blue.min.css">
8+
<link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/angular_material/1.1.4/angular-material.min.css">
9+
<link rel="stylesheet" href="https://storage.googleapis.com/code.getmdl.io/1.3.0/material.indigo-blue.min.css">
1010
<link rel="stylesheet" href="../../demo/material/css/angular-data-grid.material.css">
1111
<link rel="stylesheet" href="../../dist/css/fixedHeader/fixed-header.css">
1212
<link rel="stylesheet" href="css/fixed-header.material.css">
@@ -158,10 +158,10 @@ <h4>Using Stand-alone Directive</h4>
158158
<md-input-container flex-offset-gt-xs="5" class="items-per-page">
159159
<md-select
160160
ng-model="paginationOptions.itemsPerPage" ng-change="reloadGrid()">
161-
<md-option>10</md-option>
162-
<md-option>25</md-option>
163-
<md-option>50</md-option>
164-
<md-option>75</md-option>
161+
<md-option ng-value="10">10</md-option>
162+
<md-option ng-value="25">25</md-option>
163+
<md-option ng-value="50">50</md-option>
164+
<md-option ng-value="75">75</md-option>
165165
</md-select>
166166
</md-input-container>
167167
</div>
@@ -222,10 +222,10 @@ <h4>Using Stand-alone Directive</h4>
222222
<md-input-container flex-offset-gt-xs="5" class="items-per-page">
223223
<md-select ng-model="paginationOptions.itemsPerPage"
224224
ng-change="reloadGrid()">
225-
<md-option>10</md-option>
226-
<md-option>25</md-option>
227-
<md-option>50</md-option>
228-
<md-option>75</md-option>
225+
<md-option ng-value="10">10</md-option>
226+
<md-option ng-value="25">25</md-option>
227+
<md-option ng-value="50">50</md-option>
228+
<md-option ng-value="75">75</md-option>
229229
</md-select>
230230
</md-input-container>
231231
</div>
@@ -250,7 +250,7 @@ <h4>Using Stand-alone Directive</h4>
250250
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular-animate.min.js"></script>
251251
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular-aria.min.js"></script>
252252
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular-messages.min.js"></script>
253-
<script src="http://ajax.googleapis.com/ajax/libs/angular_material/1.0.0/angular-material.min.js"></script>
253+
<script src="http://ajax.googleapis.com/ajax/libs/angular_material/1.1.4/angular-material.min.js"></script>
254254
<script src="../../dist/pagination.min.js"></script>
255255
<script src="../../dist/dataGrid.min.js"></script>
256256
<script src="../../dist/dataGridUtils.min.js"></script>

Diff for: ‎demo/material/index.html

+11-11
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<title>Angular Data Grid - Material Design</title>
66
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
77
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700,400italic">
8-
<link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/angular_material/1.0.0/angular-material.min.css">
9-
<link rel="stylesheet" href="https://storage.googleapis.com/code.getmdl.io/1.0.6/material.indigo-blue.min.css">
8+
<link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/angular_material/1.1.4/angular-material.min.css">
9+
<link rel="stylesheet" href="https://storage.googleapis.com/code.getmdl.io/1.3.0/material.indigo-blue.min.css">
1010
<link rel="stylesheet" href="css/angular-data-grid.material.css">
1111
</head>
1212
<body ng-app="myApp" ng-controller="myAppController" ng-cloak>
@@ -106,10 +106,10 @@ <h4>Additional Demos</h4>
106106
items-per-page="paginationOptions.itemsPerPage"></grid-pagination>
107107
<md-input-container flex-offset-gt-xs="5" class="items-per-page">
108108
<md-select ng-init="paginationOptions.itemsPerPage = '10'" ng-model="paginationOptions.itemsPerPage" ng-change="reloadGrid()">
109-
<md-option>10</md-option>
110-
<md-option>25</md-option>
111-
<md-option>50</md-option>
112-
<md-option>75</md-option>
109+
<md-option ng-value="10">10</md-option>
110+
<md-option ng-value="25">25</md-option>
111+
<md-option ng-value="50">50</md-option>
112+
<md-option ng-value="75">75</md-option>
113113
</md-select>
114114
</md-input-container>
115115
</div>
@@ -169,10 +169,10 @@ <h4>Additional Demos</h4>
169169
items-per-page="paginationOptions.itemsPerPage"></grid-pagination>
170170
<md-input-container flex-offset-gt-xs="5" class="items-per-page">
171171
<md-select ng-init="paginationOptions.itemsPerPage = '10'" ng-model="paginationOptions.itemsPerPage" ng-change="reloadGrid()">
172-
<md-option>10</md-option>
173-
<md-option>25</md-option>
174-
<md-option>50</md-option>
175-
<md-option>75</md-option>
172+
<md-option ng-value="10">10</md-option>
173+
<md-option ng-value="25">25</md-option>
174+
<md-option ng-value="50">50</md-option>
175+
<md-option ng-value="75">75</md-option>
176176
</md-select>
177177
</md-input-container>
178178
</div>
@@ -195,7 +195,7 @@ <h4>Additional Demos</h4>
195195
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular-animate.min.js"></script>
196196
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular-aria.min.js"></script>
197197
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular-messages.min.js"></script>
198-
<script src="http://ajax.googleapis.com/ajax/libs/angular_material/1.0.0/angular-material.min.js"></script>
198+
<script src="http://ajax.googleapis.com/ajax/libs/angular_material/1.1.4/angular-material.min.js"></script>
199199
<script src="../../dist/pagination.min.js"></script>
200200
<script src="../../dist/dataGrid.min.js"></script>
201201
<script src="js/demoApp.js"></script>

0 commit comments

Comments
 (0)