apostrophe-schemas - npm Package Compare versions

Comparing version 0.5.89 to 0.5.90

package.json

 {
-  "version": "0.5.89",
+  "version": "0.5.90",
   "name": "apostrophe-schemas",
@@ -4,0 +4,0 @@ "description": "Schemas for easy editing of properties in Apostrophe objects",

public/js/editor.js

@@ -36,56 +36,2 @@ /* globals: async, apos, _, aposPages, async, $ */
     function afterPopulateFields() {
-
-      // This function actually toggles the things based on data-showFields of options in select
-      function toggleHiddenFields($select) {
-
-        // First hide all the fields in our unselected options
-        var $hideFieldOptions = $select.siblings('.selectize-control').find('.selectize-dropdown-content div:not(.selected)');
-
-        _.each($hideFieldOptions, function(hideFieldOption){
-          var hideFields = $(hideFieldOption).attr('data-showFields');
-
-          if (hideFields && hideFields.length > 0) {
-            hideFields = hideFields.split(',');
-
-            _.each(hideFields, function(field){
-              var $fieldset = self.findFieldset($el, field);
-              $fieldset.addClass('apos-hidden');
-              var $helpText = $fieldset.next('p.apos-help');
-              $helpText.addClass('apos-hidden');
-            });
-          }
-        });
-
-        // Now show the fields for our selected option
-        var showFields = $select.siblings('.selectize-control').find('[data-selected]').attr('data-showFields');
-        if (showFields && showFields.length > 0) {
-          showFields = showFields.split(',');
-
-          _.each(showFields, function(field){
-            var $fieldset = self.findFieldset($el, field);
-            var $helpText = $fieldset.next('p.apos-help');
-            $fieldset.removeClass('apos-hidden');
-            $helpText.removeClass('apos-hidden');
-          });
-        }
-      }
-
-      window.apos.on('enhance', function() {
-
-        // loop over any (safe) select we've marked for functionality, do initial toggle, add listener
-        _.each(schema, function(field) {
-          if (field.type == 'select') {
-            var $fieldset = self.findFieldset($el, field.name);
-
-            if ($fieldset.hasClass('apos-fieldset-select-show-fields')){
-              var $toggleSelect = self.findSafe($fieldset, 'select');
-              toggleHiddenFields($toggleSelect);
-              $toggleSelect.on('change', function(){
-                toggleHiddenFields($(this));
-              });
-            }
-          }
-        });
-      });
-
       callback(null);
@@ -96,3 +42,3 @@ }
   // Gather data from form elements and push it into properties of the data object,
-  // as specified by the schema provided. The inverse of self.populateSomeFields
+  // as specified by the schema provided. The inverse of self.populateFields
   self.convertFields = function($el, schema, data, callback) {
@@ -122,5 +68,5 @@ schema = self.allowedSubset($el, schema);
       if ($fieldset.hasClass('apos-hidden')) {
-        // If this field is hidden by toggleHiddenFields, it is not reasonable to
-        // expect the user to populate it. This allows "required" and "showFields" to
-        // interact in a reasonable way. -Tom
+        // If this field is hidden, it is not reasonable to
+        // expect the user to populate it. This allows "required"
+        // and "showFields" to interact in a reasonable way. -Tom
         i++;
@@ -651,3 +597,6 @@ return apos.afterYield(convertField);
     },
+
     select: function(data, name, $field, $el, field, callback) {
+
+      var $fieldset = self.findFieldset($el, name);
       var $options = $field.find('option');
@@ -664,2 +613,4 @@ // Synthesize options from the choices in the schema, unless
       }
+
+      // Set the default value, taking selectize into account, ugh
       var val = ((data[name] === undefined) && field.choices[0]) ? field.choices[0].value : data[name];
@@ -671,4 +622,7 @@ if ($field[0] && $field[0].selectize) {
       }
+
+      self.enableShowFields(data, name, $field, $el, field);
       return apos.afterYield(callback);
     },
+
     integer: function(data, name, $field, $el, field, callback) {
@@ -688,2 +642,4 @@ $field.val(data[name]);
       }
+
+      self.enableShowFields(data, name, $field, $el, field);
       return apos.afterYield(callback);
@@ -919,2 +875,84 @@ },
   };
+
+  // Enable the showFields option for the choices associated
+  // with the given field (boolean or select)
+
+  self.enableShowFields = function(data, name, $field, $el, field) {
+
+    var $fieldset = self.findFieldset($el, name);
+
+    // afterChange shows and hides other fieldsets based on
+    // the current value of this field and its visibility.
+    // We do this in three situations: at startup, when the
+    // user changes the value, and when the visibility of this
+    // field has been affected by another field with the
+    // showFields option. This allows nested showFields to
+    // work properly. -Tom
+
+    afterChange();
+
+    $field.on('change', afterChange);
+    $fieldset.on('aposShowFields', afterChange);
+
+    function afterChange() {
+
+      // Implement showFields
+
+      if (!_.find(field.choices || [], function(choice) {
+        return choice.showFields;
+      })) {
+        // showFields is not in use for this select
+        return;
+      }
+
+      var val;
+      if (field.checkbox) {
+        val = $field.is(':checked');
+      } else {
+        val = $field.val();
+      }
+
+      _.each(field.choices || [], function(choice) {
+
+        // Show the fields for this value if it is the current value
+        // *and* the select field itself is currently visible
+
+        var show;
+
+        if ($fieldset.hasClass('apos-hidden')) {
+          show = false;
+        } else if (field.type === 'boolean') {
+          // Comparing boolean values is hard because
+          // the string '0' must be considered falsy in
+          // order to permit use of select elements. -Tom
+          if (val === choice.value) {
+            show = true;
+          } else if (!choice.value) {
+            if ((!val) || (val === '0')) {
+              show = true;
+            }
+          } else {
+            if (val && (val !== '0')) {
+              show = true;
+            }
+          }
+        } else {
+          // type select
+          if (val === choice.value) {
+            show = true;
+          }
+        }
+
+        _.each(choice.showFields || [], function(fieldName) {
+          var $fieldset = self.findFieldset($el, fieldName);
+          $fieldset.toggleClass('apos-hidden', !show);
+          $fieldset.trigger('aposShowFields');
+          var $helpText = $fieldset.next('p.apos-help');
+          $helpText.toggleClass('apos-hidden', !show);
+        });
+
+      });
+
+    }
+  };
 }
@@ -921,0 +959,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

125082

increased by0.41%

Lines of code

1905

increased by1.38%

No dependency changes