wip #3924 @0.5

diff --git a/src/public/bunchmultiple/bunchmultiple.css b/src/public/bunchmultiple/bunchmultiple.css
index 615d423abeba9d5f1551e96b553d4897cbbc7a40..ed8e4861aa2f10d0372f8d0fec62c03d39425777 100644 (file)
--- a/src/public/bunchmultiple/bunchmultiple.css
+++ b/src/public/bunchmultiple/bunchmultiple.css
@@ -10,6 +10,9 @@
   background: #fafafa;
   margin-bottom: 15px;
 }
+.bunchmultiple .bunchmultiple__wrapper:empty {
+  display: none;
+}
 .bunchmultiple .bunchmultiple__wrapper.bunchmultiple_root {
   padding: 0;
   border: 0;

diff --git a/src/public/bunchmultiple/bunchmultiple.css.map b/src/public/bunchmultiple/bunchmultiple.css.map
index 8ca29521a441a62a4bdc7d74ee8ddd08f7f1021c..4c90c7c167e2aebc095f43a21ba7f1160f5c1c1a 100644 (file)
--- a/src/public/bunchmultiple/bunchmultiple.css.map
+++ b/src/public/bunchmultiple/bunchmultiple.css.map
@@ -1 +1 @@
-{"version":3,"sources":["bunchmultiple.less"],"names":[],"mappings":"AAAA;EACI,cAAA;;AAEA,cAAC;EACG,WAAA;;AAJR,cAOI;EACI,aAAA;EACA,sBAAA;EACA,mBAAA;EACA,mBAAA;;AAEA,cANJ,wBAMK;EACG,UAAA;EACA,SAAA;EACA,gBAAA;EACA,gBAAA;;AAjBZ,cAOI,wBAcI;EACI,UAAA;;AAtBZ,cAOI,wBAcI,cAGI;EACI,gBAAA;EACA,mBAAA;;AA1BhB,cAOI,wBAuBI;EACI,mBAAA;;AAEA,cA1BR,wBAuBI,MAGK;EACG,uBAAA;EACA,sBAAA;;AAFJ,cA1BR,wBAuBI,MAGK,MAIG;EACI,UAAA;;AALR,cA1BR,wBAuBI,MAGK,MAQG;EACI,UAAA;;AA1CpB,cAOI,wBAuBI,MAgBI;EACI,yBAAA;EACA,iBAAA;EACA,gBAAA;EACA,kBAAA;EACA,eAAA;;AAnDhB,cAOI,wBAuBI,MAgBI,QAOI;EACI,qBAAA;EACA,gBAAA;EACA,yBAAA;EACA,mBAAA;EACA,uBAAA;EACA,kBAAA;EACA,UAAA;EACA,SAAA;;AA7DpB,cAOI,wBAuBI,MAgBI,QAkBI,EAAC;EACG,WAAA;EACA,gBAAA;EACA,qBAAA;;AAEA,cA9DhB,wBAuBI,MAgBI,QAkBI,EAAC,OAKI;EACG,mBAAA;EACA,YAAA;;AAGJ,cAnEhB,wBAuBI,MAgBI,QAkBI,EAAC,OAUI;EACG,kBAAA;EACA,WAAA;EACA,eAAA;;AAGJ,cAzEhB,wBAuBI,MAgBI,QAkBI,EAAC,OAgBI;EACG,kBAAA;EACA,WAAA;EACA,eAAA;;AAnFxB,cAOI,wBAuBI,MA0DI;EACI,gBAAA;EACA,iEAAA;EACA,yBAAA;EACA,eAAA;;AAGJ,cAxFR,wBAuBI,MAiEK;EACG,aAAA;;AAGJ,cA5FR,wBAuBI,MAqEK,UACG;EACI,oBAAA;EACA,UAAA","file":"bunchmultiple.css"}
\ No newline at end of file
+{"version":3,"sources":["bunchmultiple.less"],"names":[],"mappings":"AAAA;EACI,cAAA;;AAEA,cAAC;EACG,WAAA;;AAJR,cAOI;EACI,aAAA;EACA,sBAAA;EACA,mBAAA;EACA,mBAAA;;AAEA,cANJ,wBAMK;EACG,aAAA;;AAGJ,cAVJ,wBAUK;EACG,UAAA;EACA,SAAA;EACA,gBAAA;EACA,gBAAA;;AArBZ,cAOI,wBAkBI;EACI,UAAA;;AA1BZ,cAOI,wBAkBI,cAGI;EACI,gBAAA;EACA,mBAAA;;AA9BhB,cAOI,wBA2BI;EACI,mBAAA;;AAEA,cA9BR,wBA2BI,MAGK;EACG,uBAAA;EACA,sBAAA;;AAFJ,cA9BR,wBA2BI,MAGK,MAIG;EACI,UAAA;;AALR,cA9BR,wBA2BI,MAGK,MAQG;EACI,UAAA;;AA9CpB,cAOI,wBA2BI,MAgBI;EACI,yBAAA;EACA,iBAAA;EACA,gBAAA;EACA,kBAAA;EACA,eAAA;;AAvDhB,cAOI,wBA2BI,MAgBI,QAOI;EACI,qBAAA;EACA,gBAAA;EACA,yBAAA;EACA,mBAAA;EACA,uBAAA;EACA,kBAAA;EACA,UAAA;EACA,SAAA;;AAjEpB,cAOI,wBA2BI,MAgBI,QAkBI,EAAC;EACG,WAAA;EACA,gBAAA;EACA,qBAAA;;AAEA,cAlEhB,wBA2BI,MAgBI,QAkBI,EAAC,OAKI;EACG,mBAAA;EACA,YAAA;;AAGJ,cAvEhB,wBA2BI,MAgBI,QAkBI,EAAC,OAUI;EACG,kBAAA;EACA,WAAA;EACA,eAAA;;AAGJ,cA7EhB,wBA2BI,MAgBI,QAkBI,EAAC,OAgBI;EACG,kBAAA;EACA,WAAA;EACA,eAAA;;AAvFxB,cAOI,wBA2BI,MA0DI;EACI,gBAAA;EACA,iEAAA;EACA,yBAAA;EACA,eAAA;;AAGJ,cA5FR,wBA2BI,MAiEK;EACG,aAAA;;AAGJ,cAhGR,wBA2BI,MAqEK,UACG;EACI,oBAAA;EACA,UAAA","file":"bunchmultiple.css"}
\ No newline at end of file

diff --git a/src/public/bunchmultiple/bunchmultiple.less b/src/public/bunchmultiple/bunchmultiple.less
index ca95f4a09f7859daa4b019199e426c021540f5fb..d898a3172659d3bd6ede7e8063e383144a92ec30 100644 (file)
--- a/src/public/bunchmultiple/bunchmultiple.less
+++ b/src/public/bunchmultiple/bunchmultiple.less
@@ -11,6 +11,10 @@
         background: #fafafa;
         margin-bottom: 15px;
 
+        &:empty{
+            display: none;
+        }
+
         &.bunchmultiple_root {
             padding: 0;
             border: 0;

diff --git a/src/resources/views/when.blade.php b/src/resources/views/when.blade.php
index c34f7da120346834bf3d6e7b8ef28260cd913b8a..9941b78994432ef93a18b4ec78e12a2455d4b57a 100644 (file)
--- a/src/resources/views/when.blade.php
+++ b/src/resources/views/when.blade.php
@@ -3,12 +3,25 @@
         jQuery('document').ready(function ($) {
             var triggersWhenChange = function (f) {
                 var form;
+                var prefix = '';
                 if (f === undefined) {
                     form = $('section.content form[method="post"]');
                 } else {
-                    form = $(f).closest('form');
+                    if ($(f).closest('.subform').length > 0) {
+                        form = $(f).closest('.subform');
+                        prefix = $(form).data('bmid') + '___';
+                    } else {
+                        form = $(f).closest('form');
+                    }
                 }
 
+                $(form).find('[data-when]').each(function () {
+                    if ($(this).parent().hasClass('bunchmultiple__wrapper')) {
+                        $(this).parent().parent().attr('data-when', $(this).attr('data-when'));
+                        $(this).attr('data-when', null);
+                    }
+                });
+
                 $(form).find('[data-when]').removeClass('when-visible').each(function () {
                     if ($(this).data('when-normalized') === undefined) {
                         $(this).data('when-normalized', normalizeWhen($(this).data('when')));
@@ -17,7 +30,8 @@
                     var match = true;
                     var order = 1000;
                     $.each(when, function (property, conditions) {
-                        var val = $(form).find('[name="' + property + '"]').val().toString();
+                        var fname = prefix + property;
+                        var val = $(form).find('[name="' + fname + '"]').val().toString();
                         var matchproperty = false;
                         $.each(conditions, function (k, condition) {
                             if (condition.id === val) {
@@ -48,6 +62,11 @@
             $(document).on('change', 'input,select,textarea', function () {
                 triggersWhenChange($(this));
             });
+            $(document).on('cubist.bunchmultiple.added', function () {
+                $('.subform[data-bmid]').each(function () {
+                    triggersWhenChange($(this));
+                });
+            });
             triggersWhenChange();
 
             function orderWhen() {
@@ -78,7 +97,6 @@
                     });
                     res[property] = normalizedConditions;
                 });
-                console.log(res);
                 return res;
             }