Fix radio/checkboxes in repeat groups having values wiped. Closes CMB…

…2#341, CMB2#263, CMB2#246, CMB2#304, CMB2#150
BraadMartin · Aug 7, 2015 · 5e90092 · 5e90092
1 parent 520c90a
commit 5e90092
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/js/cmb2.js b/js/cmb2.js
@@ -348,6 +348,8 @@ window.CMB2 = (function(window, document, $, undefined){
 			var isEditor  = $newInput.hasClass( 'wp-editor-area' );
 			var oldFor    = $newInput.attr( 'for' );
 			var oldVal    = $newInput.attr( 'value' );
+			var type      = $newInput.prop( 'type' );
+			var checkable = 'radio' === type || 'checkbox' === type ? oldVal : false;
 			// var $next  = $newInput.next();
 			var attrs     = {};
 			var newID, oldID;
@@ -369,18 +371,22 @@ window.CMB2 = (function(window, document, $, undefined){
 			}
 
 			// Clear out old values
-			if ( undefined !== typeof( oldVal ) && oldVal ) {
-				attrs.value = '';
+			if ( undefined !== typeof( oldVal ) && oldVal || checkable ) {
+				attrs.value = checkable ? checkable : '';
 			}
 
 			// Clear out textarea values
 			if ( 'TEXTAREA' === $newInput.prop('tagName') ) {
 				$newInput.html( '' );
 			}
 
+			if ( checkable ) {
+				$newInput.removeAttr( 'checked' );
+			}
+
 			$newInput
 				.removeClass( 'hasDatepicker' )
-				.attr( attrs ).val('');
+				.attr( attrs ).val( checkable ? checkable : '' );
 
 			// wysiwyg field
 			if ( isEditor ) {
@@ -485,7 +491,7 @@ window.CMB2 = (function(window, document, $, undefined){
 	};
 
 	cmb.emptyValue = function( evt, row ) {
-		$('input:not([type="button"]), textarea', row).val('');
+		$('input:not([type="button"]:not([type="radio"]):not([type="checkbox"]), textarea', row).val('');
 	};
 
 	cmb.addGroupRow = function( evt ) {