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

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

This commit is contained in:
Bernat 2019-09-24 13:56:31 +02:00
parent bf5a9967cf d56c7ff540
commit 2b80c4f7bf
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
front/core/components/popover/popover.js
View File

@ -77,8 +77,8 @@ export default class Popover extends Component {
let isDescriptorMoreMenu = parent && parent.attributes[0].nodeValue == 'more-button'; let isDescriptorMoreMenu = parent && parent.attributes[0].nodeValue == 'more-button';
let leftMenu = this.document.querySelector('div[class="menu left"]'); let leftMenu = this.document.querySelector('div[class="menu left"]');
if (isDescriptorMoreMenu && leftMenu) { if (isDescriptorMoreMenu && leftMenu) {
let descriptorDiv = this.document.querySelector('vn-side-menu div[class="vn-descriptor"]');
let leftMenuWidth = leftMenu.offsetWidth; let leftMenuWidth = leftMenu.offsetWidth;
let descriptorDiv = this.document.querySelector('vn-side-menu div');
let descriptorWidth = descriptorDiv.offsetWidth; let descriptorWidth = descriptorDiv.offsetWidth;
this.scrollbarWidth = leftMenuWidth - descriptorWidth; this.scrollbarWidth = leftMenuWidth - descriptorWidth;

3
modules/ticket/front/descriptor/index.html
View File

@ -168,13 +168,14 @@
</vn-confirm> </vn-confirm>
<vn-dialog <vn-dialog
vn-id="changeShippedDialog" vn-id="changeShippedDialog"
on-open="$ctrl.focusInput()"
on-response="$ctrl.changeShipped(response)"> on-response="$ctrl.changeShipped(response)">
<tpl-body> <tpl-body>
<div> <div>
<h5 style="text-align: center"> <h5 style="text-align: center">
<span translate>Change shipped hour</span> <span translate>Change shipped hour</span>
</h5> </h5>
<vn-input-time vn-one model="$ctrl.newShipped" label="Shipped hour"></vn-input-time> <vn-input-time vn-id="newShipped" vn-one model="$ctrl.newShipped" label="Shipped hour"></vn-input-time>
</div> </div>
</tpl-body> </tpl-body>
<tpl-buttons> <tpl-buttons>

4
modules/ticket/front/descriptor/index.js
View File

@ -297,6 +297,10 @@ class Controller {
); );
} }
} }
focusInput() {
this.$scope.newShipped.focus();
}
} }
Controller.$inject = ['$state', '$scope', '$http', 'vnApp', '$translate', 'aclService']; Controller.$inject = ['$state', '$scope', '$http', 'vnApp', '$translate', 'aclService'];