Handle conditional_display of fieldsets

dvlpp · Nov 10, 2015 · 53806b9 · 53806b9
1 parent 3d59dcd
commit 53806b9
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 12 deletions.
diff --git a/resources/assets/js/sharp.conditional_display.js b/resources/assets/js/sharp.conditional_display.js
@@ -89,9 +89,19 @@ function selectShowHide($select, value, $field, fieldShowIfSelected) {
 
 function showHideField($field, show) {
     if(show) {
-        $field.show();
+        $field.removeClass("hidden");
     } else {
-        $field.hide();
+        $field.addClass("hidden");
+    }
+
+    // Check fieldset visibility if there's one.
+    var $fieldset = $field.parents(".fieldset");
+    if($fieldset.length) {
+        if($fieldset.find(".sharp-field:not(.hidden)").length) {
+            $fieldset.removeClass("hidden");
+        } else {
+            $fieldset.addClass("hidden");
+        }
     }
 }
 

diff --git a/resources/assets/sharp.form.min.js b/resources/assets/sharp.form.min.js
diff --git a/resources/assets/sharp.ui.js b/resources/assets/sharp.ui.js
@@ -12804,9 +12804,19 @@ function selectShowHide($select, value, $field, fieldShowIfSelected) {
 
 function showHideField($field, show) {
     if(show) {
-        $field.show();
+        $field.removeClass("hidden");
     } else {
-        $field.hide();
+        $field.addClass("hidden");
+    }
+
+    // Check fieldset visibility if there's one.
+    var $fieldset = $field.parents(".fieldset");
+    if($fieldset.length) {
+        if($fieldset.find(".sharp-field:not(.hidden)").length) {
+            $fieldset.removeClass("hidden");
+        } else {
+            $fieldset.addClass("hidden");
+        }
     }
 }
 

diff --git a/resources/assets/sharp.ui.min.js b/resources/assets/sharp.ui.min.js
diff --git a/resources/views/cms/entityForm.blade.php b/resources/views/cms/entityForm.blade.php
@@ -93,7 +93,7 @@
                                     @if(!is_numeric($group))
 
                                         {{--Form field panel--}}
-                                        <div class="panel">
+                                        <div class="panel fieldset">
                                             <div class="panel-heading">
                                                 <label class="control-label">{{ $group }}</label>
                                             </div>