fix blur style on Internal Modals

This commit is contained in:
Nicola Carminati
2018-05-28 09:52:45 +02:00
parent 0e30f200e9
commit 62745cf4e6
4 changed files with 14 additions and 4 deletions
+1 -1
View File
@@ -169,7 +169,7 @@
<tooling_families_boxright_newlabel>Creazione nuova famiglia</tooling_families_boxright_newlabel>
<siemens_tooling_families_boxright_editlabel>Modifica gruppo %s</siemens_tooling_families_boxright_editlabel>
<siemens_tooling_families_boxright_newlabel>Creazione nuovo gruppo</siemens_tooling_families_boxright_newlabel>
<tooling_childtoolsfamily_skill_tools>Untensile %d</tooling_childtoolsfamily_skill_tools>
<tooling_childtoolsfamily_skill_tools>Utensile %d</tooling_childtoolsfamily_skill_tools>
<tooling_childtoolsfamily_boxright_editlabel>Modifica utensile %d della famiglia %s</tooling_childtoolsfamily_boxright_editlabel>
<siemens_tooling_childtoolsfamily_boxright_editlabel>Modifica utensile %d del gruppo %s</siemens_tooling_childtoolsfamily_boxright_editlabel>
<tooling_equipment_search_placeholder>Cerca un utensile per nome</tooling_equipment_search_placeholder>
+1 -1
View File
@@ -88,7 +88,7 @@ body {
-webkit-user-select: none;
}
#app.blur {
.blur {
filter: blur(10px);
}
+1 -1
View File
@@ -7854,7 +7854,7 @@ body {
user-select: none;
-webkit-user-select: none;
}
#app.blur {
.blur {
filter: blur(10px);
}
#main-view {
+11 -1
View File
@@ -6,7 +6,7 @@
<under-the-hood></under-the-hood>
<div id="main-view" ref="main-view" :class="{liftedUp : isMainViewLiftedUp}">
<router-view/>
<router-view :class="{'blur':applyBlurInternal}" />
<modal-container name="modal" container-name="modal2" :inform-hmi="false" ></modal-container>
</div>
<div id="main-view-handler" ref="main-view-handler" @click="toggleMainView()" :class="{liftedUp : isMainViewLiftedUp}">
@@ -62,6 +62,15 @@ export default {
this.applyBlur = false;
});
ms.subscribeToChannel("show-modal2", args => {
this.applyBlurInternal = true;
});
ms.subscribeToChannel("hide-modal2", args => {
this.applyBlurInternal = false;
});
ms.subscribeToChannel("show-loading", args => {
this.loadingOperations++;
});
@@ -189,6 +198,7 @@ export default {
return {
state: this.$store.state,
applyBlur: false,
applyBlurInternal: false,
loadingOperations: 0
};
}