Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

widget-core upgrade #269

Merged
merged 1 commit into from
Aug 9, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/calendar/tests/unit/CalendarCell.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ registerSuite({
});

widget.expectRender(v('td', {
afterCreate: widget.listener,
afterUpdate: widget.listener,
key: 'root',
role: 'gridcell',
'aria-selected': 'false',
Expand All @@ -49,8 +47,6 @@ registerSuite({
});

widget.expectRender(v('td', {
afterCreate: widget.listener,
afterUpdate: widget.listener,
key: 'root',
role: 'gridcell',
'aria-selected': 'true',
Expand Down
8 changes: 0 additions & 8 deletions src/calendar/tests/unit/MonthPicker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ const compareId = compareProperty((value: any) => {

const monthRadios = function(widget: any, open?: boolean) {
return DEFAULT_MONTHS.map((monthName, i) => v('label', {
afterCreate: widget.listener,
afterUpdate: widget.listener,
key: <any> compareId,
classes: widget.classes(css.monthRadio, i === 5 ? css.monthRadioChecked : null)
}, [
Expand All @@ -49,8 +47,6 @@ const monthRadios = function(widget: any, open?: boolean) {

const expectedPopup = function(widget: any, open?: boolean) {
return v('div', {
afterCreate: widget.listener,
afterUpdate: widget.listener,
'aria-hidden': open ? 'false' : 'true',
'aria-labelledby': <any> compareId, // widget._buttonId,
classes: widget.classes(css.monthPopup, open ? null : css.monthPopupHidden),
Expand All @@ -70,8 +66,6 @@ const expectedPopup = function(widget: any, open?: boolean) {
onclick: widget.listener
}, [ '2016' ]),
v('div', {
afterCreate: widget.listener,
afterUpdate: widget.listener,
key: 'year-spinner',
id: <any> compareId, // widget._yearSpinnerId,
classes: widget.classes(css.spinner),
Expand Down Expand Up @@ -101,8 +95,6 @@ const expected = function(widget: any, open = false) {
classes: widget.classes(css.header)
}, [
v('button', {
afterCreate: widget.listener,
afterUpdate: widget.listener,
key: 'button',
'aria-controls': <any> compareId,
'aria-describedby': <any> compareId,
Expand Down
2 changes: 1 addition & 1 deletion src/combobox/ComboBox.ts
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ export default class ComboBox extends ComboBoxBase<ComboBoxProperties> {
classes: this.classes(clearable ? css.clearable : null),
controls: menuId,
disabled,
extraClasses: css,
extraClasses: css as any,
invalid,
onBlur: this._onInputBlur,
onFocus: this._onInputFocus,
Expand Down
24 changes: 0 additions & 24 deletions src/slidepane/tests/unit/SlidePane.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,13 @@ registerSuite({
ontouchstart: widget.listener
}, [
v('div', {
afterCreate: widget.listener,
afterUpdate: widget.listener,
classes: widget.classes(css.underlay, css.underlayVisible),
enterAnimation: animations.fadeIn,
exitAnimation: animations.fadeOut,
key: 'underlay'
}),
v('div', {
key: 'content',
afterCreate: widget.listener,
afterUpdate: widget.listener,
classes: widget.classes(
css.pane,
css.paneFixed,
Expand Down Expand Up @@ -110,8 +106,6 @@ registerSuite({
null,
v('div', {
key: 'content',
afterCreate: widget.listener,
afterUpdate: widget.listener,
classes: widget.classes(
css.pane,
css.paneFixed,
Expand Down Expand Up @@ -162,17 +156,13 @@ registerSuite({
classes: widget.classes(css.root)
}, [
v('div', {
afterCreate: widget.listener,
afterUpdate: widget.listener,
classes: widget.classes(css.underlay),
enterAnimation: animations.fadeIn,
exitAnimation: animations.fadeOut,
key: 'underlay'
}),
v('div', {
key: 'content',
afterCreate: widget.listener,
afterUpdate: widget.listener,
classes: widget.classes(
css.pane,
css.paneFixed,
Expand Down Expand Up @@ -212,8 +202,6 @@ registerSuite({
null,
v('div', {
key: 'content',
afterCreate: widget.listener,
afterUpdate: widget.listener,
classes: widget.classes(
css.pane,
css.paneFixed,
Expand Down Expand Up @@ -506,17 +494,13 @@ registerSuite({
classes: widget.classes(css.root)
}, [
open ? v('div', {
afterCreate: widget.listener,
afterUpdate: widget.listener,
classes: widget.classes(css.underlay),
enterAnimation: animations.fadeIn,
exitAnimation: animations.fadeOut,
key: 'underlay'
}) : null,
v('div', {
key: 'content',
afterCreate: widget.listener,
afterUpdate: widget.listener,
classes: widget.classes(
css.pane,
css.paneFixed,
Expand Down Expand Up @@ -574,17 +558,13 @@ registerSuite({
classes: widget.classes(css.root)
}, [
closed ? null : v('div', {
afterCreate: widget.listener,
afterUpdate: widget.listener,
classes: widget.classes(css.underlay),
enterAnimation: animations.fadeIn,
exitAnimation: animations.fadeOut,
key: 'underlay'
}),
v('div', {
key: 'content',
afterCreate: widget.listener,
afterUpdate: widget.listener,
classes: swipeState.classes || widget.classes(
css.pane,
css.paneFixed,
Expand Down Expand Up @@ -671,17 +651,13 @@ registerSuite({
classes: widget.classes(css.root)
}, [
closed ? null : v('div', {
afterCreate: widget.listener,
afterUpdate: widget.listener,
classes: widget.classes(css.underlay),
enterAnimation: animations.fadeIn,
exitAnimation: animations.fadeOut,
key: 'underlay'
}),
v('div', {
key: 'content',
afterCreate: widget.listener,
afterUpdate: widget.listener,
classes: swipeState.classes || widget.classes(
css.pane,
css.paneFixed,
Expand Down
16 changes: 0 additions & 16 deletions src/splitpane/tests/unit/SplitPane.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,30 +31,22 @@ registerSuite({

'Should construct SplitPane with passed properties'() {
widget.expectRender(v('div', {
afterCreate: widget.listener,
afterUpdate: widget.listener,
classes: widget.classes(css.root, css.rootFixed, css.row, css.rowFixed),
key: 'root'
}, [
v('div', {
afterCreate: widget.listener,
afterUpdate: widget.listener,
classes: widget.classes(css.leading, css.leadingFixed),
key: 'leading',
styles: { width: '100px' }
}, [ null ]),
v('div', {
afterCreate: widget.listener,
afterUpdate: widget.listener,
classes: widget.classes(css.divider, css.dividerFixed),
key: 'divider',
onmousedown: widget.listener,
ontouchend: widget.listener,
ontouchstart: widget.listener
}),
v('div', {
afterCreate: widget.listener,
afterUpdate: widget.listener,
classes: widget.classes(css.trailing, css.trailingFixed),
key: 'trailing'
}, [ null ])
Expand All @@ -71,30 +63,22 @@ registerSuite({
});

widget.expectRender(v('div', {
afterCreate: widget.listener,
afterUpdate: widget.listener,
classes: widget.classes(css.root, css.rootFixed, css.column, css.columnFixed),
key: 'root'
}, [
v('div', {
afterCreate: widget.listener,
afterUpdate: widget.listener,
classes: widget.classes(css.leading, css.leadingFixed),
key: 'leading',
styles: { height: '200px' }
}, [ 'abc' ]),
v('div', {
afterCreate: widget.listener,
afterUpdate: widget.listener,
classes: widget.classes(css.divider, css.dividerFixed),
key: 'divider',
onmousedown: widget.listener,
ontouchend: widget.listener,
ontouchstart: widget.listener
}),
v('div', {
afterCreate: widget.listener,
afterUpdate: widget.listener,
classes: widget.classes(css.trailing, css.trailingFixed),
key: 'trailing'
}, [ 'def' ])
Expand Down
12 changes: 0 additions & 12 deletions src/timepicker/tests/unit/TimePicker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -172,14 +172,10 @@ registerSuite({
useNativeElement: true
});
picker.expectRender(v('span', {
afterCreate: picker.listener,
afterUpdate: picker.listener,
classes: picker.classes(css.root),
key: 'root'
}, [
v('input', {
afterCreate: picker.listener,
afterUpdate: picker.listener,
'aria-describedby': undefined,
'aria-invalid': null,
'aria-readonly': null,
Expand Down Expand Up @@ -229,14 +225,10 @@ registerSuite({
});

picker.expectRender(v('span', {
afterCreate: picker.listener,
afterUpdate: picker.listener,
classes: picker.classes(css.root),
key: 'root'
}, [
v('input', {
afterCreate: picker.listener,
afterUpdate: picker.listener,
'aria-describedby': 'Some descriptive text',
'aria-invalid': 'true',
'aria-readonly': 'true',
Expand Down Expand Up @@ -269,8 +261,6 @@ registerSuite({
useNativeElement: true
});
picker.expectRender(v('span', {
afterCreate: picker.listener,
afterUpdate: picker.listener,
classes: picker.classes(css.root),
key: 'root'
}, [
Expand All @@ -281,8 +271,6 @@ registerSuite({
label: 'foo'
}, [
v('input', {
afterCreate: picker.listener,
afterUpdate: picker.listener,
'aria-describedby': undefined,
'aria-invalid': null,
'aria-readonly': null,
Expand Down
4 changes: 0 additions & 4 deletions src/titlepane/tests/unit/TitlePane.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@ registerSuite({
v('div', {
'aria-hidden': null,
'aria-labelledby': isNonEmptyString,
afterCreate: titlePane.listener,
afterUpdate: titlePane.listener,
classes: titlePane.classes(css.content),
id: <any> isNonEmptyString,
key: 'content'
Expand Down Expand Up @@ -118,8 +116,6 @@ registerSuite({
v('div', {
'aria-hidden': 'true',
'aria-labelledby': isNonEmptyString,
afterCreate: titlePane.listener,
afterUpdate: titlePane.listener,
classes: titlePane.classes(css.content),
id: <any> isNonEmptyString,
key: 'content'
Expand Down