Merge pull request #2239 from guerler/rename_jsvalidate_000

Rename/refactor Utils.validate() to Utils.isEmpty()

client/galaxy/scripts/mvc/form/form-parameters.js

@@ -138,7 +138,7 @@ define(['utils/utils',
             // field replaces e.g. a select field
             if ( input_def.options ) {
                 input_def.area = input_def.multiple;
-                if ( !Utils.validate( input_def.value ) ) {
+                if ( Utils.isEmpty( input_def.value ) ) {
                     input_def.value = null;
                 } else {
                     if ( $.isArray( input_def.value ) ) {

client/galaxy/scripts/mvc/tool/tool-form-composite.js

@@ -98,7 +98,7 @@ define([ 'utils/utils', 'mvc/ui/ui-misc', 'mvc/form/form-view', 'mvc/form/form-d
                                     input.options && ( ( input.options.length == 0 && !data_resolved ) || is_workflow_parameter ) && ( input.is_workflow = true );
                                     input.value && input.value.__class__ == 'RuntimeValue' && ( input.value = null );
                                     if ( !is_data_input && input.type !== 'hidden' && !is_workflow_parameter ) {
-                                        if ( input.optional || ( Utils.validate( input.value ) && input.value !== '' ) ) {
+                                        if ( input.optional || ( !Utils.isEmpty( input.value ) && input.value !== '' ) ) {
                                             input.collapsible_value = input.value;
                                             input.collapsible_preview = true;
                                         }

client/galaxy/scripts/mvc/ui/ui-list.js

@@ -87,7 +87,7 @@ var View = Backbone.View.extend({
     add: function(options) {
         var self = this;
         if (this.$('[id="' + options.id + '"]').length === 0) {
-            if (Utils.validate(options.id)) {
+            if (!Utils.isEmpty(options.id)) {
                 var $el = $(this._templateRow({
                     id      : options.id,
                     name    : options.name

client/galaxy/scripts/mvc/ui/ui-options.js

@@ -193,7 +193,7 @@ var Base = Backbone.View.extend({
         });
 
         // get selected elements
-        if (!Utils.validate(selected)) {
+        if (Utils.isEmpty(selected)) {
             return null;
         }
 

client/galaxy/scripts/mvc/ui/ui-select-default.js

@@ -256,10 +256,7 @@ var View = Backbone.View.extend({
     */
     _getValue: function() {
         var val = this.$select.val();
-        if (!Utils.validate(val)) {
-            return null;
-        }
-        return val;
+        return Utils.isEmpty( val ) ? null : val;
     },
 
     /** Returns all currently available options

client/galaxy/scripts/utils/utils.js

@@ -44,23 +44,23 @@ function sanitize(content) {
 };
 
 /**
- * Validate atomic values or list of values
+ * Checks if a value or list of values is `empty`
  * usually used for selectable options
  * @param{String}   value - Value or list to be validated
  */
-function validate ( value ) {
+function isEmpty ( value ) {
     if ( !( value instanceof Array ) ) {
         value = [ value ];
     }
     if ( value.length === 0 ) {
-        return false;
+        return true;
     }
     for( var i in value ) {
         if ( [ '__null__', '__undefined__', null, undefined ].indexOf( value[ i ] ) > -1 ) {
-            return false;
+            return true;
         }
     }
-    return true;
+    return false;
 };
 
 /**
@@ -272,7 +272,7 @@ return {
     request: request,
     sanitize: sanitize,
     textify: textify,
-    validate: validate,
+    isEmpty: isEmpty,
     deepeach: deepeach,
     isJSON: isJSON
 };