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

Add field text with range #134

Draft
wants to merge 5 commits into
base: feature/v2_carbonfay_round1
Choose a base branch
from
Draft

Add field text with range #134

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
74a8a23
Add field text with range
olddeda Jun 28, 2019
e513e4e
Change all cells style
olddeda Sep 7, 2019
9ac0ff5
Merge commit '8766eed36286d7e7eecdbfc6920542b1249c7272' into feature/…
olddeda Sep 11, 2019
45e3656
Disable redirect to history page when taped enter button
olddeda Sep 11, 2019
7f42b2f
Merge remote-tracking branch 'origin/feature/v2_carbonfay_round1' int…
evgeny-boger Apr 19, 2020
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
10 changes: 8 additions & 2 deletions app/scripts/directives/rangecell.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,21 @@
'focus': 'mouseleave'
}"
tooltip-class="custom-tooltip"
tooltip-disable="{{ cell.readOnly }}"
>
<!-- <input ng-readonly="cell.readOnly" type="range" ng-model="target.value"
ng-model-options="{ updateOn: 'default blur', debounce: {'default': 400, 'blur': 0} }">
-->
<div range-slider min="min" max="max" step="step" model-max="_value" pin-handle="min"
disabled="cell.readOnly"
on-handle-up='handleUp()'></div>
<span class="value-wrapper">
<span class="value">{{ cell.value }}</span>

<span class="value-wrapper field">
<span class="value">
<input ng-if="cell.valueType == 'number' && !cell.readOnly" type="number"
min="{{ cell.min }}" max="{{ cell.max }}" step="{{ cell.step }}"
ng-model="cell.value" explicit-changes>
</span>
<span ng-if="!!cell.units" class="units">{{ cell.units }}</span>
</span>
</div>
9 changes: 9 additions & 0 deletions app/styles/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,6 +573,15 @@ button.show-console span {
margin: 0 auto 4px auto;
}

.display-cell .cell-range .value-wrapper.field {
border-bottom: none;
}

.display-cell .cell-range .value-wrapper.field input {
display: inline-block;
margin-top: 8px;
}

.display-cell button.cell-button {
margin: 4px 0;
}
Expand Down