Home Explore Help
Sign In
tigerphp
/
stagfe2
4
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Add no-mask feature for moes

Vijayakrishnan 4 years ago
parent
b5aec21168
commit
083216f64d
3 changed files with 7 additions and 5 deletions
Split View Show Diff Stats
  1. 4 2
      public/js/yemi.js
  2. 2 2
      resources/views/app/patient/canvas-sections/pmhx/form.blade.php
  3. 1 1
      resources/views/layouts/template.blade.php

+ 4 - 2
public/js/yemi.js
View File 

@@ -310,9 +310,11 @@ var initMoes = function() {
 
                         }else{
 
                             // keep data in moes, don't force reset
 
                             // if($(realForm).is('form')) $(realForm)[0].reset();
 
-                            showMoeFormMask();
 
+                            if(!$(realForm).closest('[moe]').is('[no-mask]')) {
 
+                                showMoeFormMask();
 
+                            }
 
                             setTimeout(function() {
 
-                                $('[moe]>form:not([show]):visible').hide();
 
+                                $('[moe]>[url]:not([show]):visible').hide();
 
                                 $(realForm).toggle(100);
 
                                 initPrimaryForm($(realForm));
 
                                 setTimeout(function() {

+ 2 - 2
resources/views/app/patient/canvas-sections/pmhx/form.blade.php
View File 

@@ -78,7 +78,7 @@ $formID = rand(0, 100000);
 
                                 <input type="checkbox" name="{{ $fName }}" class="m-0"
 
                                        v-model="common['{{$fName}}']">
 
                                 <span class="mx-2">{{ $values[$k] }}</span>
 
-                                <div moe>
 
+                                <div moe no-mask>
 
                                     <a href="#" start show>
 
                                         <i v-show="common['{{$fName}}']" class="fa-comment" :class="common['{{$fName}}__comments'] ? 'fas' : 'far'"></i>
 
                                     </a>
 
@@ -131,7 +131,7 @@ $formID = rand(0, 100000);
 
                         <input type="checkbox" class="m-0"
 
                                v-model="item.value">
 
                         <span class="mx-2">@{{ item.label }}</span>
 
-                        <div moe>
 
+                        <div moe no-mask>
 
                             <a href="#" start show>
 
                                 <i v-show="item.value" class="fa-comment" :class="item.comments ? 'fas' : 'far'"></i>
 
                             </a>

+ 1 - 1
resources/views/layouts/template.blade.php
View File 

@@ -52,7 +52,7 @@
 
 <body>
 
     <div id="mask" style="background: rgba(0, 0, 0, 0) url(&quot;/vanillaspin.gif&quot;) no-repeat scroll center center; position: fixed; top: 0px; left: 0px; z-index: 9999; width: 100%; height: 100%; display: none;">
 
     </div>
 
-    <div id="moe-form-mask" style="background: rgba(0, 0, 0, .1) no-repeat scroll center center; position: fixed; top: 0px; left: 0px; z-index: 98; width: 100%; height: 100%; display: none;">
 
+    <div id="moe-form-mask" style="background: rgba(0, 0, 0, .1) no-repeat scroll center center; position: fixed; top: 0px; left: 0px; z-index: 97; width: 100%; height: 100%; display: none;">
 
     </div>
 
 
     <nav class="navbar navbar-expand-md navbar-dark stag-primary-bg py-1">