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.

Sign up for GitHub

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

Jump to bottom

ui: Select by class instead of (multiple) id #1370

Merged
merged 2 commits into from
Sep 25, 2018
Merged

ui: Select by class instead of (multiple) id #1370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f04c38
ui: Select by class instead of (multiple) id
rzr Aug 3, 2018
0c3ea5f
ui: Prevent duplicated id
rzr Sep 24, 2018
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
2 changes: 1 addition & 1 deletion src/test/browser/page-object/thing-detail-page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class BrightnessPropertySection extends InputPropertySection {
class LevelPropertySection extends InputPropertySection {
constructor(browser, rootElement) {
super(browser, rootElement);
this.defineElement('slider', '#slider');
this.defineElement('slider', '#slider-level-6');
}

async setValue(value) {
Expand Down
6 changes: 4 additions & 2 deletions static/js/components/capability/label.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,10 @@ class LabelCapability extends BaseComponent {
constructor() {
super(template);

this._value = this.shadowRoot.querySelector('#value');
this._unit = this.shadowRoot.querySelector('#unit');
this._value = this.shadowRoot.querySelector(
'.webthing-label-capability-value');
this._unit = this.shadowRoot.querySelector(
'.webthing-label-capability-unit');
this._precision = 0;
this._level = 0;
}
Expand Down
10 changes: 6 additions & 4 deletions static/js/components/capability/multi-level-switch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,12 @@ const ON_BLANK = 'white';
class MultiLevelSwitchCapability extends BaseComponent {
constructor() {
super(template);

this._container = this.shadowRoot.querySelector('#container');
this._bar = this.shadowRoot.querySelector('#bar');
this._label = this.shadowRoot.querySelector('#label');
this._container = this.shadowRoot.querySelector(
'.webthing-multi-level-switch-capability-container');
this._bar = this.shadowRoot.querySelector(
'.webthing-multi-level-switch-capability-bar');
this._label = this.shadowRoot.querySelector(
'.webthing-multi-level-switch-capability-label');
this._on = false;
this._level = 0;
this._onClick = this.__onClick.bind(this);
Expand Down
23 changes: 12 additions & 11 deletions static/js/components/property/action.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@

const BaseComponent = require('../base-component');

const template = document.createElement('template');
template.innerHTML = `
class Action extends BaseComponent {
constructor() {
const template = document.createElement('template');
template.innerHTML = `
<style>
:host {
display: inline-block;
Expand Down Expand Up @@ -77,20 +79,19 @@ template.innerHTML = `
display: inline-block;
}
</style>
<div id="container" class="webthing-action-container">
<div id="contents" class="webthing-action-contents">
<button id="button" type="button" class="webthing-action-button"></button>
<div id="container-${BaseComponent.count}" class="webthing-action-container">
<div id="contents-${BaseComponent.count}" class="webthing-action-contents">
<button id="button-${BaseComponent.count}" type="button" class="webthing-action-button"></button>
</div>
</div>
<div id="name" class="webthing-action-name"></div>
<div id="name-${BaseComponent.count}" class="webthing-action-name"></div>
`;

class Action extends BaseComponent {
constructor() {
super(template);

this._button = this.shadowRoot.querySelector('#button');
this._name = this.shadowRoot.querySelector('#name');
this._button = this.shadowRoot.querySelector(
'.webthing-action-button');
this._name = this.shadowRoot.querySelector(
'.webthing-action-name');
this._href = null;

this._onClick = this.__onClick.bind(this);
Expand Down
8 changes: 4 additions & 4 deletions static/js/components/property/boolean.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,17 +72,17 @@ class BooleanProperty extends BaseComponent {
display: inline-block;
}
</style>
<div id="container" class="webthing-boolean-property-container">
<div id="contents" class="webthing-boolean-property-contents">
<form id="form" class="webthing-boolean-property-form">
<div id="container-${BaseComponent.count}" class="webthing-boolean-property-container">
<div id="contents-${BaseComponent.count}" class="webthing-boolean-property-contents">
<form id="form-${BaseComponent.count}" class="webthing-boolean-property-form">
<input type="checkbox" id="checkbox-${BaseComponent.count}"
class="webthing-boolean-property-checkbox"/>
<label class="webthing-boolean-property-label" for='checkbox-${BaseComponent.count}'>
</label>
</form>
</div>
</div>
<div id="name" class="webthing-boolean-property-name"></div>
<div id="name-${BaseComponent.count}" class="webthing-boolean-property-name"></div>
`;
super(template);
this._input =
Expand Down
23 changes: 12 additions & 11 deletions static/js/components/property/color.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@

const BaseComponent = require('../base-component');

const template = document.createElement('template');
template.innerHTML = `
class ColorProperty extends BaseComponent {
constructor() {
const template = document.createElement('template');
template.innerHTML = `
<style>
:host {
display: inline-block;
Expand Down Expand Up @@ -46,20 +48,19 @@ template.innerHTML = `
display: inline-block;
}
</style>
<div id="container" class="webthing-color-property-container">
<div id="contents" class="webthing-color-property-contents">
<input type="color" id="color" class="webthing-color-property-color">
<div id="container-${BaseComponent.count}" class="webthing-color-property-container">
<div id="contents-${BaseComponent.count}" class="webthing-color-property-contents">
<input type="color" id="color-${BaseComponent.count}" class="webthing-color-property-color">
</div>
</div>
<div id="name" class="webthing-color-property-name"></div>
<div id="name-${BaseComponent.count}" class="webthing-color-property-name"></div>
`;

class ColorProperty extends BaseComponent {
constructor() {
super(template);

this._input = this.shadowRoot.querySelector('#color');
this._name = this.shadowRoot.querySelector('#name');
this._input = this.shadowRoot.querySelector(
'.webthing-color-property-color');
this._name = this.shadowRoot.querySelector(
'.webthing-color-property-name');

this._onChange = this.__onChange.bind(this);
}
Expand Down
28 changes: 15 additions & 13 deletions static/js/components/property/enum.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@

const BaseComponent = require('../base-component');

const template = document.createElement('template');
template.innerHTML = `
class EnumProperty extends BaseComponent {
constructor() {
const template = document.createElement('template');
template.innerHTML = `
<style>
:host {
display: inline-block;
Expand Down Expand Up @@ -64,22 +66,22 @@ template.innerHTML = `
display: inline-block;
}
</style>
<div id="container" class="webthing-enum-property-container">
<div id="contents" class="webthing-enum-property-contents">
<select id="select" class="webthing-enum-property-select"></select>
<div id="unit" class="webthing-enum-property-unit"></div>
<div id="container-${BaseComponent.count}" class="webthing-enum-property-container">
<div id="contents-${BaseComponent.count}" class="webthing-enum-property-contents">
<select id="select-${BaseComponent.count}" class="webthing-enum-property-select"></select>
<div id="unit-${BaseComponent.count}" class="webthing-enum-property-unit"></div>
</div>
</div>
<div id="name" class="webthing-enum-property-name"></div>
<div id="name-${BaseComponent.count}" class="webthing-enum-property-name"></div>
`;

class EnumProperty extends BaseComponent {
constructor() {
super(template);

this._select = this.shadowRoot.querySelector('#select');
this._unit = this.shadowRoot.querySelector('#unit');
this._name = this.shadowRoot.querySelector('#name');
this._select = this.shadowRoot.querySelector(
'.webthing-enum-property-select');
this._unit = this.shadowRoot.querySelector(
'.webthing-enum-property-unit');
this._name = this.shadowRoot.querySelector(
'.webthing-enum-property-name');

this._type = 'string';

Expand Down
53 changes: 30 additions & 23 deletions static/js/components/property/level.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@

const BaseComponent = require('../base-component');

const template = document.createElement('template');
template.innerHTML = `
class LevelProperty extends BaseComponent {
constructor() {
const template = document.createElement('template');
template.innerHTML = `
<style>
:host {
display: inline-block;
Expand Down Expand Up @@ -93,35 +95,40 @@ template.innerHTML = `
display: inline-block;
}
</style>
<div id="container" class="webthing-level-property-container">
<div id="contents" class="webthing-level-property-contents">
<div id="text" class="webthing-level-property-text hidden"></div>
<div id="bar-container"
<div id="container-${BaseComponent.count}" class="webthing-level-property-container">
<div id="contents-${BaseComponent.count}" class="webthing-level-property-contents">
<div id="text-${BaseComponent.count}" class="webthing-level-property-text hidden"></div>
<div id="bar-container-${BaseComponent.count}"
class="webthing-level-property-bar-container hidden">
<span id="bar" class="webthing-level-property-bar"></span>
<span id="bar-${BaseComponent.count}" class="webthing-level-property-bar"></span>
</div>
<form id="form" class="webthing-level-property-form">
<input type="number" id="number" class="webthing-level-property-number">
<input type="range" id="slider" class="webthing-level-property-slider">
<form id="form-${BaseComponent.count}" class="webthing-level-property-form">
<input type="number" id="number-${BaseComponent.count}" class="webthing-level-property-number">
<input type="range" id="slider-level-${BaseComponent.count}" class="webthing-level-property-slider">
</form>
<div id="unit" class="webthing-level-property-unit"></div>
<div id="unit-${BaseComponent.count}" class="webthing-level-property-unit"></div>
</div>
</div>
<div id="name" class="webthing-level-property-name"></div>
<div id="name-${BaseComponent.count}" class="webthing-level-property-name"></div>
`;

class LevelProperty extends BaseComponent {
constructor() {
super(template);

this._text = this.shadowRoot.querySelector('#text');
this._barContainer = this.shadowRoot.querySelector('#bar-container');
this._bar = this.shadowRoot.querySelector('#bar');
this._form = this.shadowRoot.querySelector('#form');
this._number = this.shadowRoot.querySelector('#number');
this._slider = this.shadowRoot.querySelector('#slider');
this._unit = this.shadowRoot.querySelector('#unit');
this._name = this.shadowRoot.querySelector('#name');
this._text = this.shadowRoot.querySelector(
'.webthing-level-property-text');
this._barContainer = this.shadowRoot.querySelector(
'.webthing-level-property-bar-container');
this._bar = this.shadowRoot.querySelector(
'.webthing-level-property-bar');
this._form = this.shadowRoot.querySelector(
'.webthing-level-property-form');
this._number = this.shadowRoot.querySelector(
'.webthing-level-property-number');
this._slider = this.shadowRoot.querySelector(
'.webthing-level-property-slider');
this._unit = this.shadowRoot.querySelector(
'.webthing-level-property-unit');
this._name = this.shadowRoot.querySelector(
'.webthing-level-property-name');

this._onChange = this.__onChange.bind(this);
this._onClick = this.__onClick.bind(this);
Expand Down
33 changes: 18 additions & 15 deletions static/js/components/property/number.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@

const BaseComponent = require('../base-component');

const template = document.createElement('template');
template.innerHTML = `
class NumberProperty extends BaseComponent {
constructor() {
const template = document.createElement('template');
template.innerHTML = `
<style>
:host {
display: inline-block;
Expand Down Expand Up @@ -72,26 +74,27 @@ template.innerHTML = `
display: inline-block;
}
</style>
<div id="container" class="webthing-number-property-container">
<div id="contents" class="webthing-number-property-contents">
<form id="form" class="webthing-number-property-form">
<input type="number" id="input"
<div id="container-${BaseComponent.count}" class="webthing-number-property-container">
<div id="contents-${BaseComponent.count}" class="webthing-number-property-contents">
<form id="form-${BaseComponent.count}" class="webthing-number-property-form">
<input type="number" id="input-${BaseComponent.count}"
class="webthing-number-property-input hide-spinner">
</form>
<div id="unit" class="webthing-number-property-unit"></div>
<div id="unit-${BaseComponent.count}" class="webthing-number-property-unit"></div>
</div>
</div>
<div id="name" class="webthing-number-property-name"></div>
<div id="name-${BaseComponent.count}" class="webthing-number-property-name"></div>
`;

class NumberProperty extends BaseComponent {
constructor() {
super(template);

this._form = this.shadowRoot.querySelector('#form');
this._input = this.shadowRoot.querySelector('#input');
this._unit = this.shadowRoot.querySelector('#unit');
this._name = this.shadowRoot.querySelector('#name');
this._form = this.shadowRoot.querySelector(
'.webthing-number-property-form');
this._input = this.shadowRoot.querySelector(
'.webthing-number-property-input');
this._unit = this.shadowRoot.querySelector(
'.webthing-number-property-unit');
this._name = this.shadowRoot.querySelector(
'.webthing-number-property-name');

this._onClick = this.__onClick.bind(this);
this._onSubmit = this.__onSubmit.bind(this);
Expand Down
28 changes: 15 additions & 13 deletions static/js/components/property/numeric-label.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@

const BaseComponent = require('../base-component');

const template = document.createElement('template');
template.innerHTML = `
class NumericLabelProperty extends BaseComponent {
constructor() {
const template = document.createElement('template');
template.innerHTML = `
<style>
:host {
display: inline-block;
Expand Down Expand Up @@ -51,22 +53,22 @@ template.innerHTML = `
display: inline-block;
}
</style>
<div id="container" class="webthing-numeric-label-property-container">
<div id="contents" class="webthing-numeric-label-property-contents">
<span id="value" class="webthing-numeric-label-property-value">
</span><span id="unit" class="webthing-numeric-label-property-unit"></span>
<div id="container-${BaseComponent.count}" class="webthing-numeric-label-property-container">
<div id="contents-${BaseComponent.count}" class="webthing-numeric-label-property-contents">
<span id="value-${BaseComponent.count}" class="webthing-numeric-label-property-value">
</span><span id="unit-${BaseComponent.count}" class="webthing-numeric-label-property-unit"></span>
</div>
</div>
<div id="name" class="webthing-numeric-label-property-name"></div>
<div id="name-${BaseComponent.count}" class="webthing-numeric-label-property-name"></div>
`;

class NumericLabelProperty extends BaseComponent {
constructor() {
super(template);

this._name = this.shadowRoot.querySelector('#name');
this._value = this.shadowRoot.querySelector('#value');
this._unit = this.shadowRoot.querySelector('#unit');
this._name = this.shadowRoot.querySelector(
'.webthing-numeric-label-property-name');
this._value = this.shadowRoot.querySelector(
'.webthing-numeric-label-property-value');
this._unit = this.shadowRoot.querySelector(
'.webthing-numeric-label-property-unit');
this._precision = 0;
}

Expand Down
Loading