verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev

This commit is contained in:
Carlos Jimenez Ruiz 2019-02-25 13:07:39 +01:00
parent b5f29954ed 68aaade0a9
commit 0be9458672
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
front/core/components/td-editable/index.js
View File

@ -11,7 +11,8 @@ export default class Controller extends Component {
element.tabIndex = 0; element.tabIndex = 0;
element.addEventListener('focus', () => { element.addEventListener('focus', () => {
if (this.field) return; if (this.field || this.disabled) return;
$transclude((tClone, tScope) => { $transclude((tClone, tScope) => {
this.field = tClone; this.field = tClone;
this.tScope = tScope; this.tScope = tScope;
@ -26,7 +27,7 @@ export default class Controller extends Component {
}); });
element.addEventListener('focusout', event => { element.addEventListener('focusout', event => {
this.destroyTimer(); if (this.field || this.disabled) return;
this.lastEvent = event; this.lastEvent = event;
let target = event.relatedTarget; let target = event.relatedTarget;
while (target && target != element) while (target && target != element)
@ -57,6 +58,9 @@ Controller.$inject = ['$element', '$scope', '$transclude', '$timeout'];
ngModule.component('vnTdEditable', { ngModule.component('vnTdEditable', {
template: require('./index.html'), template: require('./index.html'),
controller: Controller, controller: Controller,
bindings: {
disabled: '<?'
},
transclude: { transclude: {
text: 'text', text: 'text',
field: '?field' field: '?field'

4
front/core/components/td-editable/style.scss
View File

@ -4,7 +4,9 @@ vn-td-editable {
cursor: pointer; cursor: pointer;
outline: none; outline: none;
position: relative; position: relative;
&:not([disabled="true"]) {
cursor: initial;
}
&.selected > .text { &.selected > .text {
visibility: hidden; visibility: hidden;
} }