Skip to content

Commit 5e8872f

Browse files
committed
Merge branch 'master' into Readme_rework
2 parents 31c87bd + 33c3167 commit 5e8872f

File tree

5 files changed

+71
-53
lines changed

5 files changed

+71
-53
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 16.2.5-rc.1 (2017-01-26)
2+
3+
### Bug Fixes
4+
5+
[Open the list of closed bugs](https://github.com/DevExpress/devextreme-angular/milestone/11?closed=1)
6+
17
## 16.2.4 (2017-01-18)
28

39
### RTM version has been released!

examples/app/app.component.html

Lines changed: 53 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,21 @@ <h2>Angular 2 Forms</h2>
2020
<div class="form-group">
2121

2222
<label for="email">Email</label>
23-
<dx-text-box formControlName="emailControl" [(ngModel)]="formData.email" [isValid]="emailControl.valid || emailControl.pristine" [validationError]="{ message: 'Enter correct email' }"></dx-text-box>
23+
<dx-text-box
24+
formControlName="emailControl"
25+
[(ngModel)]="formData.email"
26+
[isValid]="emailControl.valid || emailControl.pristine"
27+
[validationError]="{ message: 'Enter correct email' }">
28+
</dx-text-box>
2429

2530
<label for="password">Password</label>
26-
<dx-text-box formControlName="passwordControl" [(ngModel)]="formData.password" mode="password" [isValid]="passwordControl.valid || passwordControl.pristine" [validationError]="{ message: 'Password should be greater that six symbols' }"></dx-text-box>
31+
<dx-text-box
32+
formControlName="passwordControl"
33+
[(ngModel)]="formData.password"
34+
mode="password"
35+
[isValid]="passwordControl.valid || passwordControl.pristine"
36+
[validationError]="{ message: 'Password should be greater that six symbols' }">
37+
</dx-text-box>
2738

2839
</div>
2940
<label>Toggle form controls state: </label>
@@ -61,13 +72,13 @@ <h2>dxForm</h2>
6172
#dxForm
6273
[formData]="formData"
6374
labelLocation="top">
64-
<dxi-item
75+
<dxi-item
6576
dataField="email"
6677
editorType="dxTextBox">
6778
<dxi-validation-rule type="required" message="Email is required."></dxi-validation-rule>
6879
<dxi-validation-rule type="email" message="Email is invalid."></dxi-validation-rule>
6980
</dxi-item>
70-
<dxi-item
81+
<dxi-item
7182
dataField="password"
7283
editorType="dxTextBox"
7384
[editorOptions]="{ mode: 'password' }">
@@ -88,7 +99,7 @@ <h2>Editor Widgets</h2>
8899

89100
<dx-text-area placeholder="TextArea" [(value)]="text" valueChangeEvent="keyup"></dx-text-area>
90101

91-
<dx-number-box placeholder="NumberBox" [showSpinButtons]="true" [(value)]="numberValue"></dx-number-box>
102+
<dx-number-box placeholder="NumberBox" [showSpinButtons]="true" [(value)]="numberValue" [min]="0" [max]="100" ></dx-number-box>
92103

93104
<dx-progress-bar [(value)]="numberValue"></dx-progress-bar>
94105

@@ -116,7 +127,7 @@ <h2>Custom Templates</h2>
116127

117128
<h3>dxList</h3>
118129

119-
<dx-list [grouped]="true" [items]="[ { key: 'Notebook', items: [ 'Supernote JG867', 'Ultranote VP334', 'Meganote LS952' ] }, { key: 'Netbook', items: [ 'Supernet HY834', 'Ultranet KN354', 'Meganet ME830' ] } ]">
130+
<dx-list [grouped]="true" [items]="products">
120131
<div *dxTemplate="let t of 'item'">
121132
{{t}}
122133
<dx-button class="float-right" text="Buy" (onClick)="buy(t)"></dx-button>
@@ -138,33 +149,33 @@ <h2>dxPopup</h2>
138149

139150
<h2>dxPopover</h2>
140151

141-
<dx-popover
142-
target="#popoverButton"
143-
width="300"
144-
position="top"
145-
showTitle="true"
152+
<dx-popover
153+
target="#popoverButton"
154+
[width]="300"
155+
position="top"
156+
showTitle="true"
146157
title="Demo of dxPopover">
147158
<div *dxTemplate="let data of 'content'">
148159
<p>Hello from dxPopover</p>
149160
</div>
150161
</dx-popover>
151-
<dx-button
152-
id="popoverButton"
153-
text="Show Popover via method"
162+
<dx-button
163+
id="popoverButton"
164+
text="Show Popover via method"
154165
(onClick)="showPopover()"
155166
></dx-button><br/>
156167

157168
<h2>dxResizable</h2>
158169

159-
<dx-resizable
170+
<dx-resizable
160171
class="resizable"
161172
handles="right bottom"
162-
minHeight="100"
163-
minWidth="200"
164-
maxHeight="400"
165-
maxWidth="300"
166-
width="200"
167-
height="100">
173+
[minHeight]="100"
174+
[minWidth]="200"
175+
[maxHeight]="400"
176+
[maxWidth]="300"
177+
[width]="200"
178+
[height]="100">
168179
<p><b>Resize this element</b></p>
169180
</dx-resizable>
170181

@@ -186,7 +197,7 @@ <h2>dxScrollView</h2>
186197
<p>Quas reprehenderit eveniet ex dicta soluta atque, quae facilis itaque mollitia consequatur consectetur, minima? Aliquid quae inventore eius odit vero ipsam quisquam adipisci harum vitae ad quis, tempora reprehenderit quia.</p>
187198
<p>Labore, temporibus, doloremque? Voluptates aut voluptatum corporis eum, consectetur labore similique quisquam, velit officia soluta nesciunt numquam quo, nostrum. Molestias delectus facilis odio id quae eveniet molestiae nobis sed fugit!</p>
188199
<p>Corporis nam quidem error. Excepturi eos nemo quas at ullam nesciunt quae, ipsam ad ducimus esse voluptatum, vel, sed consectetur. Laboriosam non, ipsam eos, reiciendis fugiat earum facere temporibus voluptas!</p>
189-
<p>Quos maiores, cumque nobis! Quisquam rem quidem, ex necessitatibus at ullam! Excepturi sit asperiores ad quibusdam, eum modi sed iusto perspiciatis vel officia hic nam perferendis ipsa saepe reiciendis non.</p>
200+
<p>Quos maiores, cumque nobis! Quisquam rem quidem, ex necessitatibus at ullam! Excepturi sit asperiores ad quibusdam, eum modi sed iusto perspiciatis vel officia hic nam perferendis ipsa saepe reiciendis non.</p>
190201
</div>
191202
</dx-scroll-view>
192203

@@ -225,11 +236,11 @@ <h3>With data source</h3>
225236
<div class="tabpanel-item">
226237
<div>
227238
<p>
228-
<b>{{company.City}}</b>
239+
<b>{{company.City}}</b>
229240
(<span>{{company.State}}</span>)
230241
</p>
231242
<p>
232-
<span>{{company.Zipcode}}</span>
243+
<span>{{company.Zipcode}}</span>
233244
<span>{{company.Address}}</span>
234245
</p>
235246
</div>
@@ -241,8 +252,8 @@ <h3>With data source</h3>
241252
Fax: <b>{{company.Fax}}</b>
242253
</p>
243254
<p>
244-
Website:
245-
<a href="{{company.Website}}"
255+
Website:
256+
<a href="{{company.Website}}"
246257
target="_blank">
247258
{{company.Website}}
248259
</a>
@@ -291,34 +302,26 @@ <h2>dxChart</h2>
291302

292303
<h2>dxDataGrid</h2>
293304

294-
<dx-data-grid
295-
[columns]='[
296-
"CompanyName",
297-
"City",
298-
"State",
299-
"Fax",
300-
{
301-
dataField: "Phone",
302-
cellTemplate: "phoneCellTemplate"
303-
}
304-
]'
305-
[dataSource]='customers'
306-
[paging]='{
307-
pageSize: 10
308-
}'
309-
[pager]= '{
310-
showPageSizeSelector: true,
311-
allowedPageSizes: [5, 10, 20],
312-
showInfo: true
313-
}'>
305+
<dx-data-grid [dataSource]="customers">
306+
<dxo-paging [pageSize]="10"></dxo-paging>
307+
<dxo-pager
308+
[showPageSizeSelector]="true"
309+
[allowedPageSizes]="[5, 10, 20]"
310+
[showInfo]="true">
311+
</dxo-pager>
312+
<dxi-column dataField="CompanyName"></dxi-column>
313+
<dxi-column dataField="City"></dxi-column>
314+
<dxi-column dataField="State"></dxi-column>
315+
<dxi-column dataField="Fax"></dxi-column>
316+
<dxi-column dataField="Phone" cellTemplate="phoneCellTemplate"></dxi-column>
314317
<div *dxTemplate="let cellData of 'phoneCellTemplate'">
315318
<dx-button (onClick)="callNumber(cellData.value)" [text]="cellData.text"></dx-button>
316319
</div>
317320
</dx-data-grid>
318321

319322
<h2>dxScheduler</h2>
320323

321-
<dx-scheduler
324+
<dx-scheduler
322325
style="height: 500px; display: block"
323326
[dataSource]="appointments"
324327
[currentDate]="currentDate"
@@ -327,8 +330,8 @@ <h2>dxScheduler</h2>
327330
textExpr="Text"
328331
[views]="['agenda','month','week','workWeek','day']"
329332
currentView="week"
330-
firstDayOfWeek="0"
331-
startDayHour=8
332-
endDayHour=19
333+
[firstDayOfWeek]="0"
334+
[startDayHour]="8"
335+
[endDayHour]="19"
333336
[resources]="resources"
334337
></dx-scheduler>

examples/app/app.component.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ import{
5555
display: block;
5656
}
5757
.resizable {
58-
display: block;
58+
display: block;
5959
background-color: #ccc;
6060
}
6161
.tab-content {
@@ -114,6 +114,15 @@ export class AppComponent implements OnInit {
114114
customers: Customer[];
115115
appointments: Appointment[];
116116
resources: any[];
117+
products = [
118+
{
119+
key: 'Notebook',
120+
items: [ 'Supernote JG867', 'Ultranote VP334', 'Meganote LS952' ]
121+
}, {
122+
key: 'Netbook',
123+
items: [ 'Supernet HY834', 'Ultranet KN354', 'Meganet ME830' ]
124+
}
125+
];
117126
tabs = [
118127
{
119128
id: 0,

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "devextreme-angular",
3-
"version": "16.2.4",
3+
"version": "16.2.5-rc.1",
44
"description": "Angular 2 UI and visualization components based on DevExtreme widgets",
55
"repository": {
66
"type": "git",

tests/src/core/component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export class DxTestWidgetComponent extends DxComponent implements AfterViewInit,
8383
template: ''
8484
})
8585
export class TestContainerComponent {
86-
visible: boolean = true;
86+
visible = true;
8787
testOption: string;
8888
@ViewChildren(DxTestWidgetComponent) innerWidgets: QueryList<DxTestWidgetComponent>;
8989
testMethod() {

0 commit comments

Comments
 (0)