Merge pull request #763 from wp-shortcake/758-dont-save-null-values

Avoid saving "null" values on empty select2 fields

Author: goldenapples

js-tests/build/specs.js

@@ -858,7 +858,7 @@ Shortcode = Backbone.Model.extend({
 		this.get( 'attrs' ).each( function( attr ) {
 
 			// Skip empty attributes.
-			if ( ! attr.get( 'value' ) ||  attr.get( 'value' ).length < 1 ) {
+			if ( ! attr.get( 'value' ) || attr.get( 'value' ).length < 1 ) {
 				return;
 			}
 

js/build/shortcode-ui.js

@@ -280,7 +280,7 @@ Shortcode = Backbone.Model.extend({
 		this.get( 'attrs' ).each( function( attr ) {
 
 			// Skip empty attributes.
-			if ( ! attr.get( 'value' ) ||  attr.get( 'value' ).length < 1 ) {
+			if ( ! attr.get( 'value' ) || attr.get( 'value' ).length < 1 ) {
 				return;
 			}
 
@@ -1754,6 +1754,11 @@ sui.views.editAttributeSelect2Field = sui.views.editAttributeField.extend( {
 	inputChanged: function(e) {
 		var _selected = $( e.currentTarget ).val();
 
+		// Empty fields will have null values. We don't want to coerce that to the string "null".
+		if ( _selected === null ) {
+			_selected = '';
+		}
+
 		// Store multiple selections as comma-delimited list
 		if ( Array.isArray( _selected ) ) {
 			_selected = _selected.join( ',' );

js/src/models/shortcode.js

@@ -69,7 +69,7 @@ Shortcode = Backbone.Model.extend({
 		this.get( 'attrs' ).each( function( attr ) {
 
 			// Skip empty attributes.
-			if ( ! attr.get( 'value' ) ||  attr.get( 'value' ).length < 1 ) {
+			if ( ! attr.get( 'value' ) || attr.get( 'value' ).length < 1 ) {
 				return;
 			}
 

js/src/views/select2-field.js

@@ -20,6 +20,11 @@ sui.views.editAttributeSelect2Field = sui.views.editAttributeField.extend( {
 	inputChanged: function(e) {
 		var _selected = $( e.currentTarget ).val();
 
+		// Empty fields will have null values. We don't want to coerce that to the string "null".
+		if ( _selected === null ) {
+			_selected = '';
+		}
+
 		// Store multiple selections as comma-delimited list
 		if ( Array.isArray( _selected ) ) {
 			_selected = _selected.join( ',' );