Merge pull request #69 from legalthings/fix-material-checkbox

Fix material checkbox
legalthings · Jul 27, 2017 · b203adb · b203adb
2 parents ebd5a6e + 5e352d6
commit b203adb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/js/ractive-legalform.js b/js/ractive-legalform.js
@@ -91,6 +91,10 @@
         onChangeLegalForm: function (newValue, oldValue, keypath) {
             if (this.isCondition(keypath)) {
                 this.onChangeCondition(newValue, oldValue, keypath);
+
+                if ($(this.el).hasClass('material')) {
+                    $(this.el).toMaterial();
+                }
             }
 
             this.updateExpressions(newValue, oldValue, keypath);

diff --git a/js/to-material.js b/js/to-material.js
@@ -14,10 +14,12 @@
         var $wizardSteps = $docWizard.find('.wizard-step');
 
         $wizardSteps.each(function(index, value) {
-            var $wizardForm = $('<div>').appendTo(this);
-            $wizardForm.addClass('wizzard-form');
-            $wizardForm.append($(this).find('form'));
-            $wizardForm.append($(this).find('.wizards-actions'));
+            if (!$(this).children('.wizzard-form').length) {
+                var $wizardForm = $('<div>').appendTo(this);
+                $wizardForm.addClass('wizzard-form');
+                $wizardForm.append($(this).find('form'));
+                $wizardForm.append($(this).find('.wizards-actions'));
+            }
         });
 
         // Change checkboxes to the bootstrap material
@@ -30,9 +32,11 @@
 
         // Change likert-view on bootstrap material
         $docWizard.find('.likert-answer').each(function(){
-            var $div = $('<div>').appendTo(this).addClass('radio');
-            var $label = $('<label>').appendTo($div);
-            $(this).find('input').appendTo($label);
+            if (!$(this).children('.radio').length) {
+                var $div = $('<div>').appendTo(this).addClass('radio');
+                var $label = $('<label>').appendTo($div);
+                $(this).find('input').appendTo($label);
+            }
         });
 
         // Do all labels floating for nice view