From d5222c704f92feff9cc415388cf205724b578890 Mon Sep 17 00:00:00 2001
From: Matth_eu <matthew@matth.eu>
Date: Mon, 31 Mar 2014 22:01:49 +0100
Subject: [PATCH 001/148] Checkbox multi

---
 classes.fields.php    | 33 +++++++++++++++++++++++++++++++++
 example-functions.php | 38 ++++++++++++++++++++------------------
 2 files changed, 53 insertions(+), 18 deletions(-)

diff --git a/classes.fields.php b/classes.fields.php
index d1fcc411..b30d06ed 100644
--- a/classes.fields.php
+++ b/classes.fields.php
@@ -812,6 +812,39 @@ public function html() { ?>
 }
 
 
+class Checkbox_Multi extends CMB_Field {
+
+	public function html() {
+
+		if ( $this->has_data_delegate() ) {
+			$this->args['options'] = $this->get_delegate_data();
+		}
+
+		foreach ( $this->args['options'] as $key => $value ) : ?>
+
+			<div class="cmb-checkbox-wrap">
+
+				<input
+					type="checkbox"
+					<?php $this->id_attr( 'item-' . $key ); ?>
+					<?php $this->boolean_attr(); ?>
+					<?php $this->class_attr(); ?>
+					<?php $this->name_attr( '[item-' . $key . ']' ); ?>
+					<?php checked( isset( $this->get_value()[ 'item-' . $key ] )); ?>
+				/>
+
+				<label <?php $this->for_attr( 'item-' . $key ); ?>>
+					<?php echo esc_html( $value ); ?>
+				</label>
+
+			</div>
+
+		<?php endforeach;
+
+	}
+
+}
+
 /**
  * Standard title used as a splitter.
  *
diff --git a/example-functions.php b/example-functions.php
index 69f61b73..42d448d1 100644
--- a/example-functions.php
+++ b/example-functions.php
@@ -8,19 +8,20 @@
 function cmb_sample_metaboxes( array $meta_boxes ) {
 
 	// Example of all available fields
-	
+
 	$fields = array(
-		
+
 		array( 'id' => 'field-1',  'name' => 'Text input field', 'type' => 'text' ),
 		array( 'id' => 'field-2', 'name' => 'Read-only text input field', 'type' => 'text', 'readonly' => true, 'default' => 'READ ONLY' ),
  		array( 'id' => 'field-3', 'name' => 'Repeatable text input field', 'type' => 'text', 'desc' => 'Add up to 5 fields.', 'repeatable' => true, 'repeatable_max' => 5, 'sortable' => true ),
 
 		array( 'id' => 'field-4',  'name' => 'Small text input field', 'type' => 'text_small' ),
 		array( 'id' => 'field-5',  'name' => 'URL field', 'type' => 'url' ),
-		
-		array( 'id' => 'field-6',  'name' => 'Radio input field', 'type' => 'radio', 'options' => array( 'Option 1', 'Option 2' ) ),
-		array( 'id' => 'field-7',  'name' => 'Checkbox field', 'type' => 'checkbox' ),
-		
+
+		array( 'id' => 'field-6',  'name' => 'Radio input field', 'type' => 'radio', 'options' => array( 'Option with a really long label', 'Option 1', 'Option 2', 'Option 3', 'Option 4' ) ),
+		array( 'id' => 'field-7a',  'name' => 'Checkbox-Multi field', 'type' => 'checkbox_multi', 'options' => array( 'Option with a really long label', 'Option 1', 'Option 2', 'Option 3', 'Option 4' ) ),
+		array( 'id' => 'field-7b',  'name' => 'Checkbox field', 'type' => 'checkbox' ),
+
 		array( 'id' => 'field-8',  'name' => 'WYSIWYG field', 'type' => 'wysiwyg', 'options' => array( 'editor_height' => '100' ), 'repeatable' => true, 'sortable' => true ),
 
 		array( 'id' => 'field-9',  'name' => 'Textarea field', 'type' => 'textarea' ),
@@ -28,30 +29,32 @@ function cmb_sample_metaboxes( array $meta_boxes ) {
 
 		array( 'id' => 'field-11', 'name' => 'File field', 'type' => 'file', 'file_type' => 'image', 'repeatable' => 1, 'sortable' => 1 ),
 		array( 'id' => 'field-12', 'name' => 'Image upload field', 'type' => 'image', 'repeatable' => true, 'show_size' => true ),
-		
+
 		array( 'id' => 'field-13', 'name' => 'Select field', 'type' => 'select', 'options' => array( 'option-1' => 'Option 1', 'option-2' => 'Option 2', 'option-3' => 'Option 3' ), 'allow_none' => true, 'sortable' => true, 'repeatable' => true ),
 		array( 'id' => 'field-14', 'name' => 'Select field', 'type' => 'select', 'options' => array( 'option-1' => 'Option 1', 'option-2' => 'Option 2', 'option-3' => 'Option 3' ), 'multiple' => true ),
 		array( 'id' => 'field-15', 'name' => 'Select taxonomy field', 'type' => 'taxonomy_select',  'taxonomy' => 'category' ),
 		array( 'id' => 'field-15b', 'name' => 'Select taxonomy field', 'type' => 'taxonomy_select',  'taxonomy' => 'category',  'multiple' => true ),
-		array( 'id' => 'field-16', 'name' => 'Post select field', 'type' => 'post_select', 'use_ajax' => false, 'query' => array( 'cat' => 1 ) ),	
+		array( 'id' => 'field-16', 'name' => 'Post select field', 'type' => 'post_select', 'use_ajax' => false, 'query' => array( 'cat' => 1 ) ),
 		array( 'id' => 'field-17', 'name' => 'Post select field (AJAX)', 'type' => 'post_select', 'use_ajax' => true ),
 		array( 'id' => 'field-17b', 'name' => 'Post select field (AJAX)', 'type' => 'post_select', 'use_ajax' => true, 'query' => array( 'posts_per_page' => 8 ), 'multiple' => true  ),
-		
+
 		array( 'id' => 'field-18', 'name' => 'Date input field', 'type' => 'date' ),
 		array( 'id' => 'field-19', 'name' => 'Time input field', 'type' => 'time' ),
 		array( 'id' => 'field-20', 'name' => 'Date (unix) input field', 'type' => 'date_unix' ),
 		array( 'id' => 'field-21', 'name' => 'Date & Time (unix) input field', 'type' => 'datetime_unix' ),
-		
+
 		array( 'id' => 'field-22', 'name' => 'Color', 'type' => 'colorpicker' ),
 
 		array( 'id' => 'field-24', 'name' => 'Title Field', 'type' => 'title' ),
-	
+
 	);
 
 	$meta_boxes[] = array(
 		'title' => 'CMB Test - all fields',
 		'pages' => 'post',
-		'fields' => $fields
+		'fields' => $fields,
+		'capability' => 'edit_user',
+		'capability_args' => 'current'
 	);
 
 	// Examples of Groups and Columns
@@ -86,10 +89,10 @@ function cmb_sample_metaboxes( array $meta_boxes ) {
 		'title' => 'CMB Test - group (all fields)',
 		'pages' => 'post',
 		'fields' => array(
-			array( 
-				'id' => 'gp', 
-				'name' => 'My Repeatable Group', 
-				'type' => 'group', 
+			array(
+				'id' => 'gp',
+				'name' => 'My Repeatable Group',
+				'type' => 'group',
 				'repeatable' => true,
 				'sortable' => true,
 				'fields' => $group_fields,
@@ -100,5 +103,4 @@ function cmb_sample_metaboxes( array $meta_boxes ) {
 
 	return $meta_boxes;
 
-}
-add_filter( 'cmb_meta_boxes', 'cmb_sample_metaboxes' );
+}add_filter( 'cmb_meta_boxes', 'cmb_sample_metaboxes' );

From aa97f31edaf39c67a665039a294d5a721127fb37 Mon Sep 17 00:00:00 2001
From: Matth_eu <matthew@matth.eu>
Date: Mon, 31 Mar 2014 22:07:35 +0100
Subject: [PATCH 002/148] Checkbox multi field type

---
 classes.fields.php    | 14 +++++++-------
 custom-meta-boxes.php |  3 ++-
 example-functions.php |  4 ++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/classes.fields.php b/classes.fields.php
index b30d06ed..1c259231 100644
--- a/classes.fields.php
+++ b/classes.fields.php
@@ -812,7 +812,7 @@ public function html() { ?>
 }
 
 
-class Checkbox_Multi extends CMB_Field {
+class CMB_Checkbox_Multi extends CMB_Field {
 
 	public function html() {
 
@@ -820,21 +820,21 @@ public function html() {
 			$this->args['options'] = $this->get_delegate_data();
 		}
 
-		foreach ( $this->args['options'] as $key => $value ) : ?>
+		foreach ( $this->args['options'] as $i => $label ) : ?>
 
 			<div class="cmb-checkbox-wrap">
 
 				<input
 					type="checkbox"
-					<?php $this->id_attr( 'item-' . $key ); ?>
+					<?php $this->id_attr( 'item-' . $i ); ?>
 					<?php $this->boolean_attr(); ?>
 					<?php $this->class_attr(); ?>
-					<?php $this->name_attr( '[item-' . $key . ']' ); ?>
-					<?php checked( isset( $this->get_value()[ 'item-' . $key ] )); ?>
+					<?php $this->name_attr( '[item-' . $i . ']' ); ?>
+					<?php checked( isset( $this->get_value()[ 'item-' . $i ] )); ?>
 				/>
 
-				<label <?php $this->for_attr( 'item-' . $key ); ?>>
-					<?php echo esc_html( $value ); ?>
+				<label <?php $this->for_attr( 'item-' . $i ); ?>>
+					<?php echo esc_html( $label ); ?>
 				</label>
 
 			</div>
diff --git a/custom-meta-boxes.php b/custom-meta-boxes.php
index deca7f9a..da00b3ae 100755
--- a/custom-meta-boxes.php
+++ b/custom-meta-boxes.php
@@ -51,7 +51,7 @@
 // Make it possible to add fields in locations other than post edit screen.
 include_once( CMB_PATH . '/fields-anywhere.php' );
 
-// include_once( CMB_PATH . '/example-functions.php' );
+include_once( CMB_PATH . '/example-functions.php' );
 
 /**
  * Get all the meta boxes on init
@@ -97,6 +97,7 @@ function _cmb_available_fields() {
 		'url'				=> 'CMB_URL_Field',
 		'radio'				=> 'CMB_Radio_Field',
 		'checkbox'			=> 'CMB_Checkbox',
+		'checkbox_multi'    => 'CMB_Checkbox_Multi',
 		'file'				=> 'CMB_File_Field',
 		'image' 			=> 'CMB_Image_Field',
 		'wysiwyg'			=> 'CMB_wysiwyg',
diff --git a/example-functions.php b/example-functions.php
index 42d448d1..53ad901b 100644
--- a/example-functions.php
+++ b/example-functions.php
@@ -19,8 +19,8 @@ function cmb_sample_metaboxes( array $meta_boxes ) {
 		array( 'id' => 'field-5',  'name' => 'URL field', 'type' => 'url' ),
 
 		array( 'id' => 'field-6',  'name' => 'Radio input field', 'type' => 'radio', 'options' => array( 'Option with a really long label', 'Option 1', 'Option 2', 'Option 3', 'Option 4' ) ),
-		array( 'id' => 'field-7a',  'name' => 'Checkbox-Multi field', 'type' => 'checkbox_multi', 'options' => array( 'Option with a really long label', 'Option 1', 'Option 2', 'Option 3', 'Option 4' ) ),
-		array( 'id' => 'field-7b',  'name' => 'Checkbox field', 'type' => 'checkbox' ),
+		array( 'id' => 'field-7a',  'name' => 'Checkbox field', 'type' => 'checkbox' ),
+		array( 'id' => 'field-7b',  'name' => 'Checkbox-Multi field', 'type' => 'checkbox_multi', 'options' => array( 'Option with a really long label', 'Option 1', 'Option 2', 'Option 3', 'Option 4' ) ),
 
 		array( 'id' => 'field-8',  'name' => 'WYSIWYG field', 'type' => 'wysiwyg', 'options' => array( 'editor_height' => '100' ), 'repeatable' => true, 'sortable' => true ),
 

From ef7ae7fee9a3df8dd3b81fd9e5dbade129e06519 Mon Sep 17 00:00:00 2001
From: Matth_eu <matthew@matth.eu>
Date: Mon, 31 Mar 2014 22:57:10 +0100
Subject: [PATCH 003/148] fix php notice. Props TravisCI

---
 classes.fields.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/classes.fields.php b/classes.fields.php
index 1c259231..aaa101e2 100644
--- a/classes.fields.php
+++ b/classes.fields.php
@@ -820,7 +820,11 @@ public function html() {
 			$this->args['options'] = $this->get_delegate_data();
 		}
 
-		foreach ( $this->args['options'] as $i => $label ) : ?>
+		foreach ( $this->args['options'] as $i => $label ) :
+
+			$value = $this->get_value();
+
+			?>
 
 			<div class="cmb-checkbox-wrap">
 
@@ -830,7 +834,7 @@ public function html() {
 					<?php $this->boolean_attr(); ?>
 					<?php $this->class_attr(); ?>
 					<?php $this->name_attr( '[item-' . $i . ']' ); ?>
-					<?php checked( isset( $this->get_value()[ 'item-' . $i ] )); ?>
+					<?php checked( isset( $value[ 'item-' . $i ] ) ); ?>
 				/>
 
 				<label <?php $this->for_attr( 'item-' . $i ); ?>>

From 27955227e400ea581dfb90df9aa83b6f5925c91b Mon Sep 17 00:00:00 2001
From: Matth_eu <matthew@matth.eu>
Date: Fri, 15 Aug 2014 23:45:34 +0100
Subject: [PATCH 004/148] Add field border to row not field

---
 css/dist/cmb.min.css |  4 ++--
 css/src/layout.css   | 27 ++++++++++++++-------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/css/dist/cmb.min.css b/css/dist/cmb.min.css
index d2fd9858..205dcaa3 100644
--- a/css/dist/cmb.min.css
+++ b/css/dist/cmb.min.css
@@ -1,6 +1,6 @@
 /**
- * Custom-Meta-Boxes - v1.0.1 - 2014-08-05
+ * Custom-Meta-Boxes - v1.0.1 - 2014-08-15
  * https://github.com/humanmade/Custom-Meta-Boxes/
  * Copyright (c) 2014 Human Made Limited; License: GPL
  */
-.cmb_metabox .field{overflow:hidden;padding:16px 0;border-bottom:1px solid #DFDFDF}.cmb-row:last-child>[class*=cmb-cell-]>.field{border-bottom:0}.postbox>.inside>.cmb_metabox{margin:-10px 0}.cmb_metabox .cmb-row{overflow:hidden;margin:0 -5px;zoom:1}.cmb_metabox .cmb-row:after,.cmb_metabox .cmb-row:before{content:"";display:table}.cmb_metabox .cmb-row:after{clear:both}.cmb_metabox [class*=cmb-cell-]{float:left;padding:0 5px;-moz-box-sizing:border-box;box-sizing:border-box}.cmb_metabox .cmb-cell-1{width:8.333333333%}.cmb_metabox .cmb-cell-2{width:16.666666667%}.cmb_metabox .cmb-cell-3{width:25%}.cmb_metabox .cmb-cell-4{width:33.333333333%}.cmb_metabox .cmb-cell-5{width:41.666666667%}.cmb_metabox .cmb-cell-6{width:50%}.cmb_metabox .cmb-cell-7{width:58.333333333%}.cmb_metabox .cmb-cell-8{width:66.666666667%}.cmb_metabox .cmb-cell-9{width:75%}.cmb_metabox .cmb-cell-10{width:83.333333333%}.cmb_metabox .cmb-cell-11{width:91.666666667%}.cmb_metabox .cmb-cell-12{width:100%}@media all and (max-width:850px){.cmb_metabox [class*=cmb-cell-]{width:100%}}.cmb_metabox .field-item{position:relative}.cmb_metabox_description{color:#AAA;font-style:italic;margin:0 0 16px!important}.cmb_metabox input[type=text],.cmb_metabox select,.cmb_metabox textarea{width:100%;margin:0}.cmb_metabox input.cmb_text_small{width:100px}.cmb_metabox input.cmb_text_medium{width:230px;margin-right:15px}.cmb_metabox input[type=checkbox],.cmb_metabox input[type=radio]{margin:0 5px 0 0;padding:0}.cmb_metabox .field-title{margin-bottom:16px;margin-top:0;font-weight:700}.cmb_metabox .field-title label{vertical-align:baseline}.cmb_metabox [disabled]{background:#F7F7F7}.cmb_metabox .field.repeatable>.field-item{padding-right:30px;margin-bottom:10px}.cmb_metabox .repeat-field{display:block!important;clear:both}.CMB_Date_Field.repeatable .field-item,.CMB_Date_Timestamp_Field.repeatable .field-item,.CMB_Datetime_Timestamp_Field.repeatable .field-item,.CMB_Text_Small_Field.repeatable .field-item,.CMB_Time_Field.repeatable .field-item{float:left;clear:both}.cmb-delete-field{display:inline-block;text-decoration:none;font-size:11px;line-height:20px;height:22px;width:22px;margin:0;padding:0;cursor:pointer;border-width:1px;border-style:solid;-webkit-border-radius:3px;-webkit-appearance:none;border-radius:3px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;color:#555;border-color:#ccc;background:#f7f7f7;-webkit-box-shadow:inset 0 1px 0 #fff,0 1px 0 rgba(0,0,0,.08);box-shadow:inset 0 1px 0 #fff,0 1px 0 rgba(0,0,0,.08);vertical-align:top;position:absolute;top:3px;right:0;text-indent:100%;overflow:hidden;white-space:nowrap}.cmb-delete-field:active,.cmb-delete-field:focus,.cmb-delete-field:hover{background:#fafafa;border-color:#999;color:#222}.cmb-delete-field .cmb-delete-field-icon{content:' ';display:block;position:absolute;height:8px;width:8px;top:50%;left:50%;margin-top:-4px;margin-left:-4px;background-image:url( '../../images/cmb-icon-remove.png');background-repeat:no-repeat;text-indent:8px;overflow:hidden}@media only screen and (-webkit-min-device-pixel-ratio :1.5),only screen and (min-device-pixel-ratio :1.5){.cmb-delete-field .cmb-delete-field-icon{background-image:url( '../../images/cmb-icon-remove@2x.png');background-size:8px 8px}}.cmb-sortable>.field-item{padding-left:15px}.cmb-sortable .cmb-handle{height:100%;width:3px;position:absolute;top:0;left:0;background:0 0;cursor:move;border-left:3px solid #DFDFDF;border-right:3px solid #DFDFDF}.cmb-sortable .ui-sortable-helper{opacity:.75}.cmb-sortable .ui-sortable-helper:before{content:' ';position:absolute;width:100%;height:100%;top:-6px;left:-6px;background-color:#F8F8F8;border:1px solid #DEDEDE;padding:5px;z-index:-1}.cmb-sortable>.ui-sortable-placeholder{border:1px dashed #DDD!important;background:transparent!important;visibility:visible!important;margin-bottom:8px!important}.cmb_metabox .CMB_Group_Field>.field-title{font-size:20px;clear:left;color:#222;font-family:'Open Sans',sans-serif;font-weight:400;margin:8px 0}.cmb_metabox .CMB_Group_Field.repeatable>.field-title{margin-bottom:16px}.cmb_metabox .CMB_Group_Field.repeatable>.field-item{padding:30px 10px 0;margin-bottom:16px;border:1px solid #DDD;background:#FAFAFA;position:relative}.cmb_metabox .CMB_Group_Field.repeatable>.field-item:before{content:' ';display:block;position:absolute;top:0;left:0;right:0;height:33px;border-bottom:1px solid #DDD}.cmb_metabox .CMB_Group_Field.repeatable>.field-item>.cmb-delete-field{top:5px;right:5px;width:auto;text-indent:0;padding-left:24px;padding-right:8px;height:22px;line-height:20px;font-size:11px;z-index:1}.cmb_metabox .CMB_Group_Field.repeatable>.field-item>.cmb-delete-field .cmb-delete-field-icon{left:12px}.CMB_Group_Field.cmb-sortable>.field-item{position:relative;padding-top:30px}.CMB_Group_Field.cmb-sortable>.field-item>.cmb-handle{top:-1px;left:-1px;right:-1px;height:34px;width:auto;border:0;border-bottom:1px solid #DDD}.CMB_Group_Field.cmb-sortable>.field-item.ui-sortable-helper>.cmb-handle{padding:0 5px}.cmb_metabox .CMB_Group_Field.repeatable.cmb-sortable>.field-item:before{display:none!important}.CMB_Group_Field.cmb-sortable>.ui-sortable-placeholder{margin-bottom:16px!important}.CMB_File_Field .field-item,.CMB_Image_Field .field-item{float:left;margin:0 16px 16px 0!important;text-align:center;padding:0!important;z-index:1}.cmb-file-wrap{position:relative;overflow:hidden;width:150px;height:150px;line-height:150px}.cmb-file-wrap-placeholder{content:' ';position:absolute;top:0;left:0;display:block;height:142px;width:142px;border:4px dashed #DDD;z-index:-1}.cmb-file-wrap-placeholder .dimensions{line-height:normal;position:absolute;bottom:10px;right:10px;font-size:18px;font-weight:700;opacity:.2}.cmb-file-holder{position:relative;overflow:hidden;box-shadow:inset 0 0 15px rgba(0,0,0,.1),inset 0 0 0 1px rgba(0,0,0,.05);background:#eee;width:100%;height:100%}.cmb-file-holder.type-file img{position:absolute;top:43%;margin-top:-30px;left:50%;margin-left:-23px}.cmb-file-holder.type-img img{width:100%;height:auto;margin-top:0;vertical-align:top}.cmb-file-holder.type-img::after{content:'';display:block;position:absolute;top:0;left:0;right:0;bottom:0;box-shadow:inset 0 0 0 1px rgba(0,0,0,.1);overflow:hidden;z-index:1}.cmb-file-name{position:absolute;left:0;right:0;bottom:0;line-height:1.4;overflow:hidden;max-height:100%;word-wrap:break-word;text-align:center;font-weight:700;background:rgba(255,255,255,.8);box-shadow:inset 0 0 0 1px rgba(0,0,0,.15)}.cmb-file-name strong{padding:5px 10px;display:block}.CMB_File_Field .cmb-delete-field,.CMB_Image_Field .cmb-delete-field{z-index:10;top:10px;right:10px}.CMB_File_Field .cmb-remove-file,.CMB_Image_Field .cmb-remove-file{position:absolute;z-index:1;top:5px;right:5px}.CMB_File_Field.repeatable .cmb-remove-file,.CMB_Image_Field.repeatable .cmb-remove-file{display:none!important}.cmb-file-wrap .cmb-file-upload{vertical-align:middle}.cmb-loading::before{content:' ';display:block;background:url( '../../images/wpspin.gif' ) no-repeat;width:16px;height:16px;position:absolute;top:50%;left:50%;margin-top:-8px;margin-left:-8px}@media only screen and (-webkit-min-device-pixel-ratio :1.5),only screen and (min-device-pixel-ratio :1.5){.cmb-loading::before{background-image:url( '../../images/wpspin-2x.gif');background-size:16px 16px}}.CMB_File_Field.cmb-sortable .cmb-handle,.CMB_Image_Field.cmb-sortable .cmb-handle{border:0;background:0 0;height:100%;width:100%;z-index:1}.CMB_File_Field.cmb-sortable .cmb-file-upload,.CMB_Image_Field.cmb-sortable .cmb-file-upload{position:relative;z-index:5}.CMB_File_Field.cmb-sortable .ui-sortable-helper:before,.CMB_Image_Field.cmb-sortable .ui-sortable-helper:before{top:0;left:0;padding:0;border:0;background:#F9F9F9}.CMB_Title .field-title{margin:8px 0!important}.CMB_Title{border-bottom:0;padding-bottom:0;margin-top:16px}.CMB_Title h2{margin:0!important;padding:0!important}.CMB_Color_Picker .field-item{float:left;clear:both}.CMB_Color_Picker:after,.CMB_Color_Picker:before{content:"";display:table}.CMB_Color_Picker:after{clear:both}.CMB_Color_Picker{zoom:1}div.time-picker{position:absolute;height:191px;width:4em;overflow:auto;background:#fff;border:1px solid #aaa;z-index:99;margin:0}div.time-picker-12hours{width:6em}div.time-picker ul{list-style-type:none;margin:0;padding:0}div.time-picker li{cursor:pointer;height:10px;font:12px/1 Helvetica,Arial,sans-serif;padding:4px 3px}div.time-picker li.selected{background:#0063CE;color:#fff}.cmb_metabox input.cmb_timepicker{width:100px;margin-right:0}.CMB_Datetime_Timestamp_Field input+input{margin-left:4px}.cmb_select{width:100%}.select2-offscreen{display:none}
\ No newline at end of file
+.cmb_metabox .field{overflow:hidden;padding:16px 0}.postbox>.inside>.cmb_metabox{margin:-10px 0}.cmb_metabox .cmb-row{overflow:hidden;margin:0 -5px;border-bottom:1px solid #DFDFDF;zoom:1}.cmb-row:last-child{border-bottom:0}.cmb_metabox .cmb-row:after,.cmb_metabox .cmb-row:before{content:"";display:table}.cmb_metabox .cmb-row:after{clear:both}.cmb_metabox [class*=cmb-cell-]{float:left;padding:0 5px;-moz-box-sizing:border-box;box-sizing:border-box}.cmb_metabox .cmb-cell-1{width:8.333333333%}.cmb_metabox .cmb-cell-2{width:16.666666667%}.cmb_metabox .cmb-cell-3{width:25%}.cmb_metabox .cmb-cell-4{width:33.333333333%}.cmb_metabox .cmb-cell-5{width:41.666666667%}.cmb_metabox .cmb-cell-6{width:50%}.cmb_metabox .cmb-cell-7{width:58.333333333%}.cmb_metabox .cmb-cell-8{width:66.666666667%}.cmb_metabox .cmb-cell-9{width:75%}.cmb_metabox .cmb-cell-10{width:83.333333333%}.cmb_metabox .cmb-cell-11{width:91.666666667%}.cmb_metabox .cmb-cell-12{width:100%}@media all and (max-width:850px){.cmb_metabox [class*=cmb-cell-]{width:100%}}.cmb_metabox .field-item{position:relative}.cmb_metabox_description{color:#AAA;font-style:italic;margin:0 0 16px!important}.cmb_metabox input[type=text],.cmb_metabox select,.cmb_metabox textarea{width:100%;margin:0}.cmb_metabox input.cmb_text_small{width:100px}.cmb_metabox input.cmb_text_medium{width:230px;margin-right:15px}.cmb_metabox input[type=checkbox],.cmb_metabox input[type=radio]{margin:0 5px 0 0;padding:0}.cmb_metabox .field-title{margin-bottom:16px;margin-top:0;font-weight:700}.cmb_metabox .field-title label{vertical-align:baseline}.cmb_metabox [disabled]{background:#F7F7F7}.cmb_metabox .field.repeatable>.field-item{padding-right:30px;margin-bottom:10px}.cmb_metabox .repeat-field{display:block!important;clear:both}.CMB_Date_Field.repeatable .field-item,.CMB_Date_Timestamp_Field.repeatable .field-item,.CMB_Datetime_Timestamp_Field.repeatable .field-item,.CMB_Text_Small_Field.repeatable .field-item,.CMB_Time_Field.repeatable .field-item{float:left;clear:both}.cmb-delete-field{display:inline-block;text-decoration:none;font-size:11px;line-height:20px;height:22px;width:22px;margin:0;padding:0;cursor:pointer;border-width:1px;border-style:solid;-webkit-border-radius:3px;-webkit-appearance:none;border-radius:3px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;color:#555;border-color:#ccc;background:#f7f7f7;-webkit-box-shadow:inset 0 1px 0 #fff,0 1px 0 rgba(0,0,0,.08);box-shadow:inset 0 1px 0 #fff,0 1px 0 rgba(0,0,0,.08);vertical-align:top;position:absolute;top:3px;right:0;text-indent:100%;overflow:hidden;white-space:nowrap}.cmb-delete-field:active,.cmb-delete-field:focus,.cmb-delete-field:hover{background:#fafafa;border-color:#999;color:#222}.cmb-delete-field .cmb-delete-field-icon{content:' ';display:block;position:absolute;height:8px;width:8px;top:50%;left:50%;margin-top:-4px;margin-left:-4px;background-image:url( '../../images/cmb-icon-remove.png');background-repeat:no-repeat;text-indent:8px;overflow:hidden}@media only screen and (-webkit-min-device-pixel-ratio :1.5),only screen and (min-device-pixel-ratio :1.5){.cmb-delete-field .cmb-delete-field-icon{background-image:url( '../../images/cmb-icon-remove@2x.png');background-size:8px 8px}}.cmb-sortable>.field-item{padding-left:15px}.cmb-sortable .cmb-handle{height:100%;width:3px;position:absolute;top:0;left:0;background:0 0;cursor:move;border-left:3px solid #DFDFDF;border-right:3px solid #DFDFDF}.cmb-sortable .ui-sortable-helper{opacity:.75}.cmb-sortable .ui-sortable-helper:before{content:' ';position:absolute;width:100%;height:100%;top:-6px;left:-6px;background-color:#F8F8F8;border:1px solid #DEDEDE;padding:5px;z-index:-1}.cmb-sortable>.ui-sortable-placeholder{border:1px dashed #DDD!important;background:transparent!important;visibility:visible!important;margin-bottom:8px!important}.cmb_metabox .CMB_Group_Field>.field-title{font-size:20px;clear:left;color:#222;font-family:'Open Sans',sans-serif;font-weight:400;margin:8px 0}.cmb_metabox .CMB_Group_Field.repeatable>.field-title{margin-bottom:16px}.cmb_metabox .CMB_Group_Field.repeatable>.field-item{padding:30px 10px 0;margin-bottom:16px;border:1px solid #DDD;background:#FAFAFA;position:relative}.cmb_metabox .CMB_Group_Field.repeatable>.field-item:before{content:' ';display:block;position:absolute;top:0;left:0;right:0;height:33px;border-bottom:1px solid #DDD}.cmb_metabox .CMB_Group_Field.repeatable>.field-item>.cmb-delete-field{top:5px;right:5px;width:auto;text-indent:0;padding-left:24px;padding-right:8px;height:22px;line-height:20px;font-size:11px;z-index:1}.cmb_metabox .CMB_Group_Field.repeatable>.field-item>.cmb-delete-field .cmb-delete-field-icon{left:12px}.CMB_Group_Field.cmb-sortable>.field-item{position:relative;padding-top:30px}.CMB_Group_Field.cmb-sortable>.field-item>.cmb-handle{top:-1px;left:-1px;right:-1px;height:34px;width:auto;border:0;border-bottom:1px solid #DDD}.CMB_Group_Field.cmb-sortable>.field-item.ui-sortable-helper>.cmb-handle{padding:0 5px}.cmb_metabox .CMB_Group_Field.repeatable.cmb-sortable>.field-item:before{display:none!important}.CMB_Group_Field.cmb-sortable>.ui-sortable-placeholder{margin-bottom:16px!important}.CMB_File_Field .field-item,.CMB_Image_Field .field-item{float:left;margin:0 16px 16px 0!important;text-align:center;padding:0!important;z-index:1}.cmb-file-wrap{position:relative;overflow:hidden;width:150px;height:150px;line-height:150px}.cmb-file-wrap-placeholder{content:' ';position:absolute;top:0;left:0;display:block;height:142px;width:142px;border:4px dashed #DDD;z-index:-1}.cmb-file-wrap-placeholder .dimensions{line-height:normal;position:absolute;bottom:10px;right:10px;font-size:18px;font-weight:700;opacity:.2}.cmb-file-holder{position:relative;overflow:hidden;box-shadow:inset 0 0 15px rgba(0,0,0,.1),inset 0 0 0 1px rgba(0,0,0,.05);background:#eee;width:100%;height:100%}.cmb-file-holder.type-file img{position:absolute;top:43%;margin-top:-30px;left:50%;margin-left:-23px}.cmb-file-holder.type-img img{width:100%;height:auto;margin-top:0;vertical-align:top}.cmb-file-holder.type-img::after{content:'';display:block;position:absolute;top:0;left:0;right:0;bottom:0;box-shadow:inset 0 0 0 1px rgba(0,0,0,.1);overflow:hidden;z-index:1}.cmb-file-name{position:absolute;left:0;right:0;bottom:0;line-height:1.4;overflow:hidden;max-height:100%;word-wrap:break-word;text-align:center;font-weight:700;background:rgba(255,255,255,.8);box-shadow:inset 0 0 0 1px rgba(0,0,0,.15)}.cmb-file-name strong{padding:5px 10px;display:block}.CMB_File_Field .cmb-delete-field,.CMB_Image_Field .cmb-delete-field{z-index:10;top:10px;right:10px}.CMB_File_Field .cmb-remove-file,.CMB_Image_Field .cmb-remove-file{position:absolute;z-index:1;top:5px;right:5px}.CMB_File_Field.repeatable .cmb-remove-file,.CMB_Image_Field.repeatable .cmb-remove-file{display:none!important}.cmb-file-wrap .cmb-file-upload{vertical-align:middle}.cmb-loading::before{content:' ';display:block;background:url( '../../images/wpspin.gif' ) no-repeat;width:16px;height:16px;position:absolute;top:50%;left:50%;margin-top:-8px;margin-left:-8px}@media only screen and (-webkit-min-device-pixel-ratio :1.5),only screen and (min-device-pixel-ratio :1.5){.cmb-loading::before{background-image:url( '../../images/wpspin-2x.gif');background-size:16px 16px}}.CMB_File_Field.cmb-sortable .cmb-handle,.CMB_Image_Field.cmb-sortable .cmb-handle{border:0;background:0 0;height:100%;width:100%;z-index:1}.CMB_File_Field.cmb-sortable .cmb-file-upload,.CMB_Image_Field.cmb-sortable .cmb-file-upload{position:relative;z-index:5}.CMB_File_Field.cmb-sortable .ui-sortable-helper:before,.CMB_Image_Field.cmb-sortable .ui-sortable-helper:before{top:0;left:0;padding:0;border:0;background:#F9F9F9}.CMB_Title .field-title{margin:8px 0!important}.CMB_Title{border-bottom:0;padding-bottom:0;margin-top:16px}.CMB_Title h2{margin:0!important;padding:0!important}.CMB_Color_Picker .field-item{float:left;clear:both}.CMB_Color_Picker:after,.CMB_Color_Picker:before{content:"";display:table}.CMB_Color_Picker:after{clear:both}.CMB_Color_Picker{zoom:1}div.time-picker{position:absolute;height:191px;width:4em;overflow:auto;background:#fff;border:1px solid #aaa;z-index:99;margin:0}div.time-picker-12hours{width:6em}div.time-picker ul{list-style-type:none;margin:0;padding:0}div.time-picker li{cursor:pointer;height:10px;font:12px/1 Helvetica,Arial,sans-serif;padding:4px 3px}div.time-picker li.selected{background:#0063CE;color:#fff}.cmb_metabox input.cmb_timepicker{width:100px;margin-right:0}.CMB_Datetime_Timestamp_Field input+input{margin-left:4px}.cmb_select{width:100%}.select2-offscreen{display:none}
\ No newline at end of file
diff --git a/css/src/layout.css b/css/src/layout.css
index ded6137c..a840b247 100644
--- a/css/src/layout.css
+++ b/css/src/layout.css
@@ -1,37 +1,38 @@
 /** CMB Layout **/
 
-.cmb_metabox .field { 
+.cmb_metabox .field {
 	overflow: hidden;
 	padding: 16px 0;
-	border-bottom: 1px solid #DFDFDF;
-}
-
-.cmb-row:last-child > [class*="cmb-cell-"]  > .field { 
-	border-bottom: 0; 
 }
 
 /* Neaten up the margins when metaboxes are within the standard postbox. */
 .postbox > .inside > .cmb_metabox {
-	margin: -10px 0; 
+	margin: -10px 0;
 }
 
-.cmb_metabox .cmb-row { 
-	overflow: hidden; 
-	margin: 0 -5px; 
+.cmb_metabox .cmb-row {
+	overflow: hidden;
+	margin: 0 -5px;
+	border-bottom: 1px solid #DFDFDF;
 	zoom: 1;
 }
 
+.cmb-row:last-child {
+	border-bottom: 0;
+}
+
+
 .cmb_metabox .cmb-row:before,
 .cmb_metabox .cmb-row:after {
 	content: "";
 	display: table;
-} 
+}
 .cmb_metabox .cmb-row:after {
 	clear: both;
 }
 
-.cmb_metabox [class*="cmb-cell-"] { 
-	float: left; 
+.cmb_metabox [class*="cmb-cell-"] {
+	float: left;
 	padding: 0 5px;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;

From ca8f432d328ed0926617daa4dcbb3720a46985d0 Mon Sep 17 00:00:00 2001
From: Matth_eu <matthew@matth.eu>
Date: Mon, 18 Aug 2014 16:44:36 +0100
Subject: [PATCH 005/148] Re-do row stytling

---
 css/dist/cmb.min.css |  4 ++--
 css/src/group.css    |  2 +-
 css/src/layout.css   | 32 +++++++++++++++++++-------------
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/css/dist/cmb.min.css b/css/dist/cmb.min.css
index 205dcaa3..d493f527 100644
--- a/css/dist/cmb.min.css
+++ b/css/dist/cmb.min.css
@@ -1,6 +1,6 @@
 /**
- * Custom-Meta-Boxes - v1.0.1 - 2014-08-15
+ * Custom-Meta-Boxes - v1.0.1 - 2014-08-18
  * https://github.com/humanmade/Custom-Meta-Boxes/
  * Copyright (c) 2014 Human Made Limited; License: GPL
  */
-.cmb_metabox .field{overflow:hidden;padding:16px 0}.postbox>.inside>.cmb_metabox{margin:-10px 0}.cmb_metabox .cmb-row{overflow:hidden;margin:0 -5px;border-bottom:1px solid #DFDFDF;zoom:1}.cmb-row:last-child{border-bottom:0}.cmb_metabox .cmb-row:after,.cmb_metabox .cmb-row:before{content:"";display:table}.cmb_metabox .cmb-row:after{clear:both}.cmb_metabox [class*=cmb-cell-]{float:left;padding:0 5px;-moz-box-sizing:border-box;box-sizing:border-box}.cmb_metabox .cmb-cell-1{width:8.333333333%}.cmb_metabox .cmb-cell-2{width:16.666666667%}.cmb_metabox .cmb-cell-3{width:25%}.cmb_metabox .cmb-cell-4{width:33.333333333%}.cmb_metabox .cmb-cell-5{width:41.666666667%}.cmb_metabox .cmb-cell-6{width:50%}.cmb_metabox .cmb-cell-7{width:58.333333333%}.cmb_metabox .cmb-cell-8{width:66.666666667%}.cmb_metabox .cmb-cell-9{width:75%}.cmb_metabox .cmb-cell-10{width:83.333333333%}.cmb_metabox .cmb-cell-11{width:91.666666667%}.cmb_metabox .cmb-cell-12{width:100%}@media all and (max-width:850px){.cmb_metabox [class*=cmb-cell-]{width:100%}}.cmb_metabox .field-item{position:relative}.cmb_metabox_description{color:#AAA;font-style:italic;margin:0 0 16px!important}.cmb_metabox input[type=text],.cmb_metabox select,.cmb_metabox textarea{width:100%;margin:0}.cmb_metabox input.cmb_text_small{width:100px}.cmb_metabox input.cmb_text_medium{width:230px;margin-right:15px}.cmb_metabox input[type=checkbox],.cmb_metabox input[type=radio]{margin:0 5px 0 0;padding:0}.cmb_metabox .field-title{margin-bottom:16px;margin-top:0;font-weight:700}.cmb_metabox .field-title label{vertical-align:baseline}.cmb_metabox [disabled]{background:#F7F7F7}.cmb_metabox .field.repeatable>.field-item{padding-right:30px;margin-bottom:10px}.cmb_metabox .repeat-field{display:block!important;clear:both}.CMB_Date_Field.repeatable .field-item,.CMB_Date_Timestamp_Field.repeatable .field-item,.CMB_Datetime_Timestamp_Field.repeatable .field-item,.CMB_Text_Small_Field.repeatable .field-item,.CMB_Time_Field.repeatable .field-item{float:left;clear:both}.cmb-delete-field{display:inline-block;text-decoration:none;font-size:11px;line-height:20px;height:22px;width:22px;margin:0;padding:0;cursor:pointer;border-width:1px;border-style:solid;-webkit-border-radius:3px;-webkit-appearance:none;border-radius:3px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;color:#555;border-color:#ccc;background:#f7f7f7;-webkit-box-shadow:inset 0 1px 0 #fff,0 1px 0 rgba(0,0,0,.08);box-shadow:inset 0 1px 0 #fff,0 1px 0 rgba(0,0,0,.08);vertical-align:top;position:absolute;top:3px;right:0;text-indent:100%;overflow:hidden;white-space:nowrap}.cmb-delete-field:active,.cmb-delete-field:focus,.cmb-delete-field:hover{background:#fafafa;border-color:#999;color:#222}.cmb-delete-field .cmb-delete-field-icon{content:' ';display:block;position:absolute;height:8px;width:8px;top:50%;left:50%;margin-top:-4px;margin-left:-4px;background-image:url( '../../images/cmb-icon-remove.png');background-repeat:no-repeat;text-indent:8px;overflow:hidden}@media only screen and (-webkit-min-device-pixel-ratio :1.5),only screen and (min-device-pixel-ratio :1.5){.cmb-delete-field .cmb-delete-field-icon{background-image:url( '../../images/cmb-icon-remove@2x.png');background-size:8px 8px}}.cmb-sortable>.field-item{padding-left:15px}.cmb-sortable .cmb-handle{height:100%;width:3px;position:absolute;top:0;left:0;background:0 0;cursor:move;border-left:3px solid #DFDFDF;border-right:3px solid #DFDFDF}.cmb-sortable .ui-sortable-helper{opacity:.75}.cmb-sortable .ui-sortable-helper:before{content:' ';position:absolute;width:100%;height:100%;top:-6px;left:-6px;background-color:#F8F8F8;border:1px solid #DEDEDE;padding:5px;z-index:-1}.cmb-sortable>.ui-sortable-placeholder{border:1px dashed #DDD!important;background:transparent!important;visibility:visible!important;margin-bottom:8px!important}.cmb_metabox .CMB_Group_Field>.field-title{font-size:20px;clear:left;color:#222;font-family:'Open Sans',sans-serif;font-weight:400;margin:8px 0}.cmb_metabox .CMB_Group_Field.repeatable>.field-title{margin-bottom:16px}.cmb_metabox .CMB_Group_Field.repeatable>.field-item{padding:30px 10px 0;margin-bottom:16px;border:1px solid #DDD;background:#FAFAFA;position:relative}.cmb_metabox .CMB_Group_Field.repeatable>.field-item:before{content:' ';display:block;position:absolute;top:0;left:0;right:0;height:33px;border-bottom:1px solid #DDD}.cmb_metabox .CMB_Group_Field.repeatable>.field-item>.cmb-delete-field{top:5px;right:5px;width:auto;text-indent:0;padding-left:24px;padding-right:8px;height:22px;line-height:20px;font-size:11px;z-index:1}.cmb_metabox .CMB_Group_Field.repeatable>.field-item>.cmb-delete-field .cmb-delete-field-icon{left:12px}.CMB_Group_Field.cmb-sortable>.field-item{position:relative;padding-top:30px}.CMB_Group_Field.cmb-sortable>.field-item>.cmb-handle{top:-1px;left:-1px;right:-1px;height:34px;width:auto;border:0;border-bottom:1px solid #DDD}.CMB_Group_Field.cmb-sortable>.field-item.ui-sortable-helper>.cmb-handle{padding:0 5px}.cmb_metabox .CMB_Group_Field.repeatable.cmb-sortable>.field-item:before{display:none!important}.CMB_Group_Field.cmb-sortable>.ui-sortable-placeholder{margin-bottom:16px!important}.CMB_File_Field .field-item,.CMB_Image_Field .field-item{float:left;margin:0 16px 16px 0!important;text-align:center;padding:0!important;z-index:1}.cmb-file-wrap{position:relative;overflow:hidden;width:150px;height:150px;line-height:150px}.cmb-file-wrap-placeholder{content:' ';position:absolute;top:0;left:0;display:block;height:142px;width:142px;border:4px dashed #DDD;z-index:-1}.cmb-file-wrap-placeholder .dimensions{line-height:normal;position:absolute;bottom:10px;right:10px;font-size:18px;font-weight:700;opacity:.2}.cmb-file-holder{position:relative;overflow:hidden;box-shadow:inset 0 0 15px rgba(0,0,0,.1),inset 0 0 0 1px rgba(0,0,0,.05);background:#eee;width:100%;height:100%}.cmb-file-holder.type-file img{position:absolute;top:43%;margin-top:-30px;left:50%;margin-left:-23px}.cmb-file-holder.type-img img{width:100%;height:auto;margin-top:0;vertical-align:top}.cmb-file-holder.type-img::after{content:'';display:block;position:absolute;top:0;left:0;right:0;bottom:0;box-shadow:inset 0 0 0 1px rgba(0,0,0,.1);overflow:hidden;z-index:1}.cmb-file-name{position:absolute;left:0;right:0;bottom:0;line-height:1.4;overflow:hidden;max-height:100%;word-wrap:break-word;text-align:center;font-weight:700;background:rgba(255,255,255,.8);box-shadow:inset 0 0 0 1px rgba(0,0,0,.15)}.cmb-file-name strong{padding:5px 10px;display:block}.CMB_File_Field .cmb-delete-field,.CMB_Image_Field .cmb-delete-field{z-index:10;top:10px;right:10px}.CMB_File_Field .cmb-remove-file,.CMB_Image_Field .cmb-remove-file{position:absolute;z-index:1;top:5px;right:5px}.CMB_File_Field.repeatable .cmb-remove-file,.CMB_Image_Field.repeatable .cmb-remove-file{display:none!important}.cmb-file-wrap .cmb-file-upload{vertical-align:middle}.cmb-loading::before{content:' ';display:block;background:url( '../../images/wpspin.gif' ) no-repeat;width:16px;height:16px;position:absolute;top:50%;left:50%;margin-top:-8px;margin-left:-8px}@media only screen and (-webkit-min-device-pixel-ratio :1.5),only screen and (min-device-pixel-ratio :1.5){.cmb-loading::before{background-image:url( '../../images/wpspin-2x.gif');background-size:16px 16px}}.CMB_File_Field.cmb-sortable .cmb-handle,.CMB_Image_Field.cmb-sortable .cmb-handle{border:0;background:0 0;height:100%;width:100%;z-index:1}.CMB_File_Field.cmb-sortable .cmb-file-upload,.CMB_Image_Field.cmb-sortable .cmb-file-upload{position:relative;z-index:5}.CMB_File_Field.cmb-sortable .ui-sortable-helper:before,.CMB_Image_Field.cmb-sortable .ui-sortable-helper:before{top:0;left:0;padding:0;border:0;background:#F9F9F9}.CMB_Title .field-title{margin:8px 0!important}.CMB_Title{border-bottom:0;padding-bottom:0;margin-top:16px}.CMB_Title h2{margin:0!important;padding:0!important}.CMB_Color_Picker .field-item{float:left;clear:both}.CMB_Color_Picker:after,.CMB_Color_Picker:before{content:"";display:table}.CMB_Color_Picker:after{clear:both}.CMB_Color_Picker{zoom:1}div.time-picker{position:absolute;height:191px;width:4em;overflow:auto;background:#fff;border:1px solid #aaa;z-index:99;margin:0}div.time-picker-12hours{width:6em}div.time-picker ul{list-style-type:none;margin:0;padding:0}div.time-picker li{cursor:pointer;height:10px;font:12px/1 Helvetica,Arial,sans-serif;padding:4px 3px}div.time-picker li.selected{background:#0063CE;color:#fff}.cmb_metabox input.cmb_timepicker{width:100px;margin-right:0}.CMB_Datetime_Timestamp_Field input+input{margin-left:4px}.cmb_select{width:100%}.select2-offscreen{display:none}
\ No newline at end of file
+.cmb_metabox .field{overflow:hidden;padding:15px 0 20px}.postbox>.inside>.cmb_metabox{margin:-10px 0;padding:5px 5px 0}.cmb_metabox .cmb-row{overflow:hidden;position:relative;margin:0 -10px;zoom:1}.cmb_metabox .cmb-row:after{content:" ";position:absolute;clear:both;display:block;border-bottom:1px solid #DFDFDF;left:10px;right:10px;bottom:0}.cmb_metabox>.cmb-row:last-child{margin-bottom:-15px}.cmb_metabox>.cmb-row:last-child:after{display:none}.cmb_metabox [class*=cmb-cell-]{float:left;padding:0 10px;-moz-box-sizing:border-box;box-sizing:border-box}.cmb_metabox .cmb-cell-1{width:8.333333333%}.cmb_metabox .cmb-cell-2{width:16.666666667%}.cmb_metabox .cmb-cell-3{width:25%}.cmb_metabox .cmb-cell-4{width:33.333333333%}.cmb_metabox .cmb-cell-5{width:41.666666667%}.cmb_metabox .cmb-cell-6{width:50%}.cmb_metabox .cmb-cell-7{width:58.333333333%}.cmb_metabox .cmb-cell-8{width:66.666666667%}.cmb_metabox .cmb-cell-9{width:75%}.cmb_metabox .cmb-cell-10{width:83.333333333%}.cmb_metabox .cmb-cell-11{width:91.666666667%}.cmb_metabox .cmb-cell-12{width:100%}@media all and (max-width:850px){.cmb_metabox [class*=cmb-cell-]{width:100%}}.cmb_metabox .field-item{position:relative}.cmb_metabox_description{color:#AAA;font-style:italic;margin:0 0 16px!important}.cmb_metabox input[type=text],.cmb_metabox select,.cmb_metabox textarea{width:100%;margin:0}.cmb_metabox input.cmb_text_small{width:100px}.cmb_metabox input.cmb_text_medium{width:230px;margin-right:15px}.cmb_metabox input[type=checkbox],.cmb_metabox input[type=radio]{margin:0 5px 0 0;padding:0}.cmb_metabox .field-title{margin-bottom:16px;margin-top:0;font-weight:700}.cmb_metabox .field-title label{vertical-align:baseline}.cmb_metabox [disabled]{background:#F7F7F7}.cmb_metabox .field.repeatable>.field-item{padding-right:30px;margin-bottom:10px}.cmb_metabox .repeat-field{display:block!important;clear:both}.CMB_Date_Field.repeatable .field-item,.CMB_Date_Timestamp_Field.repeatable .field-item,.CMB_Datetime_Timestamp_Field.repeatable .field-item,.CMB_Text_Small_Field.repeatable .field-item,.CMB_Time_Field.repeatable .field-item{float:left;clear:both}.cmb-delete-field{display:inline-block;text-decoration:none;font-size:11px;line-height:20px;height:22px;width:22px;margin:0;padding:0;cursor:pointer;border-width:1px;border-style:solid;-webkit-border-radius:3px;-webkit-appearance:none;border-radius:3px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;color:#555;border-color:#ccc;background:#f7f7f7;-webkit-box-shadow:inset 0 1px 0 #fff,0 1px 0 rgba(0,0,0,.08);box-shadow:inset 0 1px 0 #fff,0 1px 0 rgba(0,0,0,.08);vertical-align:top;position:absolute;top:3px;right:0;text-indent:100%;overflow:hidden;white-space:nowrap}.cmb-delete-field:active,.cmb-delete-field:focus,.cmb-delete-field:hover{background:#fafafa;border-color:#999;color:#222}.cmb-delete-field .cmb-delete-field-icon{content:' ';display:block;position:absolute;height:8px;width:8px;top:50%;left:50%;margin-top:-4px;margin-left:-4px;background-image:url( '../../images/cmb-icon-remove.png');background-repeat:no-repeat;text-indent:8px;overflow:hidden}@media only screen and (-webkit-min-device-pixel-ratio :1.5),only screen and (min-device-pixel-ratio :1.5){.cmb-delete-field .cmb-delete-field-icon{background-image:url( '../../images/cmb-icon-remove@2x.png');background-size:8px 8px}}.cmb-sortable>.field-item{padding-left:15px}.cmb-sortable .cmb-handle{height:100%;width:3px;position:absolute;top:0;left:0;background:0 0;cursor:move;border-left:3px solid #DFDFDF;border-right:3px solid #DFDFDF}.cmb-sortable .ui-sortable-helper{opacity:.75}.cmb-sortable .ui-sortable-helper:before{content:' ';position:absolute;width:100%;height:100%;top:-6px;left:-6px;background-color:#F8F8F8;border:1px solid #DEDEDE;padding:5px;z-index:-1}.cmb-sortable>.ui-sortable-placeholder{border:1px dashed #DDD!important;background:transparent!important;visibility:visible!important;margin-bottom:8px!important}.cmb_metabox .CMB_Group_Field>.field-title{font-size:20px;clear:left;color:#222;font-family:'Open Sans',sans-serif;font-weight:400;margin:8px 0}.cmb_metabox .CMB_Group_Field.repeatable>.field-title{margin-bottom:16px}.cmb_metabox .CMB_Group_Field.repeatable>.field-item{padding:30px 15px 0;margin-bottom:16px;border:1px solid #DDD;background:#FAFAFA;position:relative}.cmb_metabox .CMB_Group_Field.repeatable>.field-item:before{content:' ';display:block;position:absolute;top:0;left:0;right:0;height:33px;border-bottom:1px solid #DDD}.cmb_metabox .CMB_Group_Field.repeatable>.field-item>.cmb-delete-field{top:5px;right:5px;width:auto;text-indent:0;padding-left:24px;padding-right:8px;height:22px;line-height:20px;font-size:11px;z-index:1}.cmb_metabox .CMB_Group_Field.repeatable>.field-item>.cmb-delete-field .cmb-delete-field-icon{left:12px}.CMB_Group_Field.cmb-sortable>.field-item{position:relative;padding-top:30px}.CMB_Group_Field.cmb-sortable>.field-item>.cmb-handle{top:-1px;left:-1px;right:-1px;height:34px;width:auto;border:0;border-bottom:1px solid #DDD}.CMB_Group_Field.cmb-sortable>.field-item.ui-sortable-helper>.cmb-handle{padding:0 5px}.cmb_metabox .CMB_Group_Field.repeatable.cmb-sortable>.field-item:before{display:none!important}.CMB_Group_Field.cmb-sortable>.ui-sortable-placeholder{margin-bottom:16px!important}.CMB_File_Field .field-item,.CMB_Image_Field .field-item{float:left;margin:0 16px 16px 0!important;text-align:center;padding:0!important;z-index:1}.cmb-file-wrap{position:relative;overflow:hidden;width:150px;height:150px;line-height:150px}.cmb-file-wrap-placeholder{content:' ';position:absolute;top:0;left:0;display:block;height:142px;width:142px;border:4px dashed #DDD;z-index:-1}.cmb-file-wrap-placeholder .dimensions{line-height:normal;position:absolute;bottom:10px;right:10px;font-size:18px;font-weight:700;opacity:.2}.cmb-file-holder{position:relative;overflow:hidden;box-shadow:inset 0 0 15px rgba(0,0,0,.1),inset 0 0 0 1px rgba(0,0,0,.05);background:#eee;width:100%;height:100%}.cmb-file-holder.type-file img{position:absolute;top:43%;margin-top:-30px;left:50%;margin-left:-23px}.cmb-file-holder.type-img img{width:100%;height:auto;margin-top:0;vertical-align:top}.cmb-file-holder.type-img::after{content:'';display:block;position:absolute;top:0;left:0;right:0;bottom:0;box-shadow:inset 0 0 0 1px rgba(0,0,0,.1);overflow:hidden;z-index:1}.cmb-file-name{position:absolute;left:0;right:0;bottom:0;line-height:1.4;overflow:hidden;max-height:100%;word-wrap:break-word;text-align:center;font-weight:700;background:rgba(255,255,255,.8);box-shadow:inset 0 0 0 1px rgba(0,0,0,.15)}.cmb-file-name strong{padding:5px 10px;display:block}.CMB_File_Field .cmb-delete-field,.CMB_Image_Field .cmb-delete-field{z-index:10;top:10px;right:10px}.CMB_File_Field .cmb-remove-file,.CMB_Image_Field .cmb-remove-file{position:absolute;z-index:1;top:5px;right:5px}.CMB_File_Field.repeatable .cmb-remove-file,.CMB_Image_Field.repeatable .cmb-remove-file{display:none!important}.cmb-file-wrap .cmb-file-upload{vertical-align:middle}.cmb-loading::before{content:' ';display:block;background:url( '../../images/wpspin.gif' ) no-repeat;width:16px;height:16px;position:absolute;top:50%;left:50%;margin-top:-8px;margin-left:-8px}@media only screen and (-webkit-min-device-pixel-ratio :1.5),only screen and (min-device-pixel-ratio :1.5){.cmb-loading::before{background-image:url( '../../images/wpspin-2x.gif');background-size:16px 16px}}.CMB_File_Field.cmb-sortable .cmb-handle,.CMB_Image_Field.cmb-sortable .cmb-handle{border:0;background:0 0;height:100%;width:100%;z-index:1}.CMB_File_Field.cmb-sortable .cmb-file-upload,.CMB_Image_Field.cmb-sortable .cmb-file-upload{position:relative;z-index:5}.CMB_File_Field.cmb-sortable .ui-sortable-helper:before,.CMB_Image_Field.cmb-sortable .ui-sortable-helper:before{top:0;left:0;padding:0;border:0;background:#F9F9F9}.CMB_Title .field-title{margin:8px 0!important}.CMB_Title{border-bottom:0;padding-bottom:0;margin-top:16px}.CMB_Title h2{margin:0!important;padding:0!important}.CMB_Color_Picker .field-item{float:left;clear:both}.CMB_Color_Picker:after,.CMB_Color_Picker:before{content:"";display:table}.CMB_Color_Picker:after{clear:both}.CMB_Color_Picker{zoom:1}div.time-picker{position:absolute;height:191px;width:4em;overflow:auto;background:#fff;border:1px solid #aaa;z-index:99;margin:0}div.time-picker-12hours{width:6em}div.time-picker ul{list-style-type:none;margin:0;padding:0}div.time-picker li{cursor:pointer;height:10px;font:12px/1 Helvetica,Arial,sans-serif;padding:4px 3px}div.time-picker li.selected{background:#0063CE;color:#fff}.cmb_metabox input.cmb_timepicker{width:100px;margin-right:0}.CMB_Datetime_Timestamp_Field input+input{margin-left:4px}.cmb_select{width:100%}.select2-offscreen{display:none}
\ No newline at end of file
diff --git a/css/src/group.css b/css/src/group.css
index 563d7c84..4aee2e21 100644
--- a/css/src/group.css
+++ b/css/src/group.css
@@ -14,7 +14,7 @@
 }
 
 .cmb_metabox .CMB_Group_Field.repeatable > .field-item {
-	padding: 30px 10px 0;
+	padding: 30px 15px 0;
 	margin-bottom: 16px;
 	border: 1px solid #DDD;
 	background: #FAFAFA;
diff --git a/css/src/layout.css b/css/src/layout.css
index a840b247..c1be9a6f 100644
--- a/css/src/layout.css
+++ b/css/src/layout.css
@@ -2,38 +2,44 @@
 
 .cmb_metabox .field {
 	overflow: hidden;
-	padding: 16px 0;
+	padding: 15px 0 20px;
 }
 
 /* Neaten up the margins when metaboxes are within the standard postbox. */
 .postbox > .inside > .cmb_metabox {
 	margin: -10px 0;
+	padding: 5px 5px 0;
 }
 
 .cmb_metabox .cmb-row {
 	overflow: hidden;
-	margin: 0 -5px;
-	border-bottom: 1px solid #DFDFDF;
+	position: relative;
+	margin: 0 -10px;
 	zoom: 1;
 }
 
-.cmb-row:last-child {
-	border-bottom: 0;
+.cmb_metabox .cmb-row:after {
+	content: " ";
+	position: absolute;
+	clear: both;
+	display: block;
+	border-bottom: 1px solid #DFDFDF;
+	left: 10px;
+	right: 10px;
+	bottom: 0;
 }
 
-
-.cmb_metabox .cmb-row:before,
-.cmb_metabox .cmb-row:after {
-	content: "";
-	display: table;
+.cmb_metabox > .cmb-row:last-child {
+	margin-bottom: -15px;
 }
-.cmb_metabox .cmb-row:after {
-	clear: both;
+
+.cmb_metabox > .cmb-row:last-child:after {
+	display: none;
 }
 
 .cmb_metabox [class*="cmb-cell-"] {
 	float: left;
-	padding: 0 5px;
+	padding: 0 10px;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;
 }

From 237f2f9a16f088c078225c4fee1ee0705a8987b5 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <hello@pascalbirchler.ch>
Date: Mon, 10 Nov 2014 09:52:04 +0100
Subject: [PATCH 006/148] Post type check on meta box saving

When saving a field, verify its meta box was added to this post type.
Prevents conflicts when using fields with the same ID but different
data for multiple post types.
---
 class.cmb-meta-box.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/class.cmb-meta-box.php b/class.cmb-meta-box.php
index faaa0494..5cc4217b 100644
--- a/class.cmb-meta-box.php
+++ b/class.cmb-meta-box.php
@@ -323,6 +323,10 @@ function save( $post_id = 0 ) {
 		// Verify nonce
 		if ( ! isset( $_POST['wp_meta_box_nonce'] ) || ! wp_verify_nonce( $_POST['wp_meta_box_nonce'], basename( __FILE__ ) ) )
 			return $post_id;
+      
+    // Verify this meta box is for the right post type
+    if ( ! in_array( get_post_type( $post_id ), (array) $this->_meta_box['pages'] ) )
+    	return $post_id;
 
 		foreach ( $this->_meta_box['fields'] as $field ) {
 

From a46a86df103f2bcdf9b68ba87eb9b0aebcded8b3 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <hello@pascalbirchler.ch>
Date: Mon, 10 Nov 2014 09:57:21 +0100
Subject: [PATCH 007/148] Fix indention

---
 class.cmb-meta-box.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/class.cmb-meta-box.php b/class.cmb-meta-box.php
index 5cc4217b..4e37a605 100644
--- a/class.cmb-meta-box.php
+++ b/class.cmb-meta-box.php
@@ -324,9 +324,9 @@ function save( $post_id = 0 ) {
 		if ( ! isset( $_POST['wp_meta_box_nonce'] ) || ! wp_verify_nonce( $_POST['wp_meta_box_nonce'], basename( __FILE__ ) ) )
 			return $post_id;
       
-    // Verify this meta box is for the right post type
-    if ( ! in_array( get_post_type( $post_id ), (array) $this->_meta_box['pages'] ) )
-    	return $post_id;
+		// Verify this meta box is for the right post type
+		if ( ! in_array( get_post_type( $post_id ), (array) $this->_meta_box['pages'] ) )
+			return $post_id;
 
 		foreach ( $this->_meta_box['fields'] as $field ) {
 

From 949e45c5f1e99703e1551f973e423d0b36e15e31 Mon Sep 17 00:00:00 2001
From: Barry Ceelen <b@rryceelen.com>
Date: Mon, 12 Sep 2016 00:25:20 +0200
Subject: [PATCH 008/148] Make repeatable field delete confirmation optional

---
 class.cmb-meta-box.php | 3 +++
 classes.fields.php     | 1 +
 js/cmb.js              | 8 ++++----
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/class.cmb-meta-box.php b/class.cmb-meta-box.php
index fefc5dad..6f557dca 100644
--- a/class.cmb-meta-box.php
+++ b/class.cmb-meta-box.php
@@ -295,6 +295,9 @@ static function layout_fields( array $fields ) { ?>
 				if ( isset( $field->args['repeatable_max']  ) )
 					$attrs[] = sprintf( 'data-rep-max="%s"', intval( $field->args['repeatable_max'] ) );
 
+				// Ask for confirmation before removing field.
+				if ( ! empty( $field->args['confirm_delete_field'] ) )
+					$attrs[] = sprintf( 'data-confirm-delete="%s"', (bool) $field->args['confirm_delete_field'] );
 				?>
 
 				<div class="cmb-cell-<?php echo intval( $field->args['cols'] ); ?> <?php echo esc_attr( $label_designation ); ?>">
diff --git a/classes.fields.php b/classes.fields.php
index dee15239..49aa62d7 100644
--- a/classes.fields.php
+++ b/classes.fields.php
@@ -67,6 +67,7 @@ public function get_default_args() {
 				'save_callback'       => null,
 				'string-repeat-field' => __( 'Add New', 'cmb' ),
 				'string-delete-field' => __( 'Remove Field', 'cmb' ),
+				'confirm_delete'      => true,
 			),
 			get_class( $this )
 		);
diff --git a/js/cmb.js b/js/cmb.js
index 51008560..01ca65c3 100644
--- a/js/cmb.js
+++ b/js/cmb.js
@@ -99,13 +99,13 @@ var CMB = {
 		e.preventDefault();
 		jQuery(this).blur();
 
-		if ( ! confirm( CMBData.strings.confirmDeleteField ) ) {
+		fieldItem = jQuery( this ).closest('.field-item' );
+		field = fieldItem.closest( '.field' );
+
+		if ( 1 === field.data('confirm-delete') && ! confirm( CMBData.strings.confirmDeleteField ) ) {
 			return;
 		}
 
-		fieldItem = jQuery( this ).closest('.field-item' );
-		field     = fieldItem.closest( '.field' );
-
 		CMB.isMaxFields( field, -1 );
 		CMB.deletedField( fieldItem );
 

From 5fa18628e3501a56b14cf574057ac8b32d488407 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Fri, 2 Dec 2016 22:21:08 +0100
Subject: [PATCH 009/148] Added basic hidden field type

---
 custom-meta-boxes.php             |  2 ++
 example-functions.php             |  2 ++
 fields/class-cmb-hidden-field.php | 28 ++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 fields/class-cmb-hidden-field.php

diff --git a/custom-meta-boxes.php b/custom-meta-boxes.php
index 8af2a038..08d09b7c 100755
--- a/custom-meta-boxes.php
+++ b/custom-meta-boxes.php
@@ -39,6 +39,7 @@
  */
 include_once( CMB_PATH . '/classes.fields.php' );
 include_once( CMB_PATH . '/class.cmb-meta-box.php' );
+include_once( CMB_PATH . 'fields/class-cmb-hidden-field.php' );
 
 /**
  * Make it possible to add fields in locations other than post edit screen. Optional.
@@ -114,6 +115,7 @@ function _cmb_available_fields() {
 		'group'				=> 'CMB_Group_Field',
 		'gmap'				=> 'CMB_Gmap_Field',
 		'number'			=> 'CMB_Number_Field',
+		'hidden'			=> 'CMB_Hidden_Field',
 	) );
 
 }
diff --git a/example-functions.php b/example-functions.php
index 3a19f88d..c4cc3ef1 100644
--- a/example-functions.php
+++ b/example-functions.php
@@ -57,6 +57,8 @@ function cmb_sample_metaboxes( array $meta_boxes ) {
 
 		array( 'id' => 'field-24', 'name' => 'Title Field', 'type' => 'title' ),
 
+		array( 'id' => 'field-25', 'name' => 'Hidden Field', 'type' => 'hidden', 'default' => 'my valuuuuuuue' ),
+
 	);
 
 	$meta_boxes[] = array(
diff --git a/fields/class-cmb-hidden-field.php b/fields/class-cmb-hidden-field.php
new file mode 100644
index 00000000..fe6d8bae
--- /dev/null
+++ b/fields/class-cmb-hidden-field.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Hidden field type.
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
+
+/**
+ * Hidden field type.
+ *
+ * @since 1.1.0
+ *
+ * @extends CMB_Field
+ */
+class CMB_Hidden_Field extends CMB_Field {
+
+	/**
+	 * Print out field HTML.
+	 */
+	public function html() {
+		?>
+
+		<input type="hidden" <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr(); ?> <?php $this->name_attr(); ?> value="<?php echo esc_attr( $this->get_value() ); ?>" />
+
+		<?php
+	}
+}
\ No newline at end of file

From c4576c24f11c890f456a6a6a4f2265b608094c66 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Sat, 3 Dec 2016 18:02:22 +0100
Subject: [PATCH 010/148] Added tests and wrapper output for hidden field

---
 fields/class-cmb-hidden-field.php | 18 +++++++++++
 tests/testHiddenField.php         | 53 +++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 tests/testHiddenField.php

diff --git a/fields/class-cmb-hidden-field.php b/fields/class-cmb-hidden-field.php
index fe6d8bae..9b92ad9c 100644
--- a/fields/class-cmb-hidden-field.php
+++ b/fields/class-cmb-hidden-field.php
@@ -15,6 +15,24 @@
  */
 class CMB_Hidden_Field extends CMB_Field {
 
+	/**
+	 * Print out a field wrapper.
+	 *
+	 * Overriding this as there's no reason nor opportunity to have a repeatable hidden field and we don't
+	 * want to display the title and description here so getting rid of all of that logic.
+	 */
+	public function display() {
+		?>
+
+		<div class="field-item" data-class="<?php echo esc_attr( get_class( $this ) ); ?>" style="display: none; <?php echo esc_attr( $this->args['style'] ); ?>">
+
+			<?php $this->html(); ?>
+
+		</div>
+
+		<?php
+	}
+
 	/**
 	 * Print out field HTML.
 	 */
diff --git a/tests/testHiddenField.php b/tests/testHiddenField.php
new file mode 100644
index 00000000..0bce3782
--- /dev/null
+++ b/tests/testHiddenField.php
@@ -0,0 +1,53 @@
+<?php
+
+class HiddenFieldTestCase extends WP_UnitTestCase {
+
+	function setUp() {
+		parent::setUp();
+
+		$args = array(
+			'post_author'  => 1,
+			'post_status'  => 'publish',
+			'post_content' => rand_str(),
+			'post_title'   => rand_str(),
+			'post_type'    => 'post',
+		);
+
+		$id = wp_insert_post( $args );
+
+		$this->post = get_post( $id );
+	}
+
+	function tearDown() {
+		wp_delete_post( $this->post->ID, true );
+		unset( $this->post );
+		parent::tearDown();
+	}
+
+	function testSaveValue() {
+		$value = array( 'value' );
+		$field = new CMB_Hidden_Field( 'foo', 'Foo', $value );
+
+		if ( ! $this->post ) {
+			$this->markTestSkipped( 'Post not found' );
+		}
+
+		$field->save( $this->post->ID, $value );
+
+		// Verify single value is properly saved.
+		$this->assertEquals( get_post_meta( $this->post->ID, 'foo', false ), $value );
+	}
+
+	function testFieldOutput() {
+		$field        = new CMB_Hidden_Field( 'foo', 'Foo', array( 'value' ) );
+
+		if ( ! $this->post ) {
+			$this->markTestSkipped( 'Post not found' );
+		}
+
+		$this->expectOutputRegex( '/(type=\"hidden\".*?id=\"foo-cmb-field-0\".*?value=\"value\")/s' );
+
+		// Trigger output.
+		$field->html();
+	}
+}

From 2a963754088f8a5a0f151b5fb28ecb76ccbc38f0 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Sat, 3 Dec 2016 18:20:23 +0100
Subject: [PATCH 011/148] Hiding wrapper div on hidden field as we need no
 visual indication that the field exists

---
 class.cmb-meta-box.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/class.cmb-meta-box.php b/class.cmb-meta-box.php
index e53d4cf8..0d5653d0 100644
--- a/class.cmb-meta-box.php
+++ b/class.cmb-meta-box.php
@@ -369,7 +369,7 @@ static function layout_fields( array $fields ) {
 
 			foreach ( $fields as $field ) :
 
-				if ( 0 == $current_colspan ) : ?>
+				if ( 0 == $current_colspan && ! $field instanceof CMB_Hidden_Field ) : ?>
 
 					<div class="cmb-row">
 
@@ -415,7 +415,7 @@ static function layout_fields( array $fields ) {
 
 				</div>
 
-				<?php if ( 12 == $current_colspan || $field === end( $fields ) ) :
+				<?php if ( ( 12 == $current_colspan || $field === end( $fields ) ) && ! $field instanceof CMB_Hidden_Field ) :
 
 					$current_colspan = 0; ?>
 

From 0c09ca083662b92a7a11b12a344049fa749c08ba Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Sat, 3 Dec 2016 18:23:11 +0100
Subject: [PATCH 012/148] Added newline at the end of the hidden field file

---
 fields/class-cmb-hidden-field.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fields/class-cmb-hidden-field.php b/fields/class-cmb-hidden-field.php
index 9b92ad9c..adf76917 100644
--- a/fields/class-cmb-hidden-field.php
+++ b/fields/class-cmb-hidden-field.php
@@ -43,4 +43,4 @@ public function html() {
 
 		<?php
 	}
-}
\ No newline at end of file
+}

From 9d57943f4aaaee7606809098534eafe99c22ca5b Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Sat, 3 Dec 2016 18:38:21 +0100
Subject: [PATCH 013/148] Added proper class_exists chackes to avoid fataling a
 page

---
 classes.fields.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/classes.fields.php b/classes.fields.php
index 556a0965..23888ccb 100644
--- a/classes.fields.php
+++ b/classes.fields.php
@@ -1842,7 +1842,10 @@ function __construct() {
 			foreach ( $this->args['fields'] as $f ) {
 
 				$class = _cmb_field_class_for_type( $f['type'] );
-				$this->add_field( new $class( $f['id'], $f['name'], array(), $f ) );
+
+				if ( $class && class_exists( $class ) ) {
+					$this->add_field( new $class( $f['id'], $f['name'], array(), $f ) );
+				}
 
 			}
 		}
@@ -1876,8 +1879,10 @@ public function enqueue_scripts() {
 
 		foreach ( $this->args['fields'] as $f ) {
 			$class = _cmb_field_class_for_type( $f['type'] );
-			$field = new $class( '', '', array(), $f );
-			$field->enqueue_scripts();
+			if ( $class && class_exists( $class ) ) {
+				$field = new $class( '', '', array(), $f );
+				$field->enqueue_scripts();
+			}
 		}
 
 	}
@@ -1893,8 +1898,10 @@ public function enqueue_styles() {
 
 		foreach ( $this->args['fields'] as $f ) {
 			$class = _cmb_field_class_for_type( $f['type'] );
-			$field = new $class( '', '', array(), $f );
-			$field->enqueue_styles();
+			if ( $class && class_exists( $class ) ) {
+				$field = new $class( '', '', array(), $f );
+				$field->enqueue_styles();
+			}
 		}
 
 	}

From ed52d066468885ee5f8ff52e24be45e536f6c0da Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Sat, 3 Dec 2016 18:44:04 +0100
Subject: [PATCH 014/148] Fixed small PHPCS line issue

---
 classes.fields.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/classes.fields.php b/classes.fields.php
index 23888ccb..1136dfb7 100644
--- a/classes.fields.php
+++ b/classes.fields.php
@@ -1846,7 +1846,6 @@ function __construct() {
 				if ( $class && class_exists( $class ) ) {
 					$this->add_field( new $class( $f['id'], $f['name'], array(), $f ) );
 				}
-
 			}
 		}
 

From 15efb99f4273b3ee4570469eecf64c723e4851a0 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Sat, 3 Dec 2016 21:44:46 +0100
Subject: [PATCH 015/148] Moved new field type into its own file

---
 classes.fields.php                  | 38 ---------------------
 fields/class-cmb-checkbox-multi.php | 51 +++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 38 deletions(-)
 create mode 100644 fields/class-cmb-checkbox-multi.php

diff --git a/classes.fields.php b/classes.fields.php
index aaa101e2..182a89f8 100644
--- a/classes.fields.php
+++ b/classes.fields.php
@@ -811,44 +811,6 @@ public function html() { ?>
 
 }
 
-
-class CMB_Checkbox_Multi extends CMB_Field {
-
-	public function html() {
-
-		if ( $this->has_data_delegate() ) {
-			$this->args['options'] = $this->get_delegate_data();
-		}
-
-		foreach ( $this->args['options'] as $i => $label ) :
-
-			$value = $this->get_value();
-
-			?>
-
-			<div class="cmb-checkbox-wrap">
-
-				<input
-					type="checkbox"
-					<?php $this->id_attr( 'item-' . $i ); ?>
-					<?php $this->boolean_attr(); ?>
-					<?php $this->class_attr(); ?>
-					<?php $this->name_attr( '[item-' . $i . ']' ); ?>
-					<?php checked( isset( $value[ 'item-' . $i ] ) ); ?>
-				/>
-
-				<label <?php $this->for_attr( 'item-' . $i ); ?>>
-					<?php echo esc_html( $label ); ?>
-				</label>
-
-			</div>
-
-		<?php endforeach;
-
-	}
-
-}
-
 /**
  * Standard title used as a splitter.
  *
diff --git a/fields/class-cmb-checkbox-multi.php b/fields/class-cmb-checkbox-multi.php
new file mode 100644
index 00000000..11fea001
--- /dev/null
+++ b/fields/class-cmb-checkbox-multi.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Checkbox-Multi field type.
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
+
+/**
+ * Class CMB_Checkbox_Multi
+ *
+ * @since 1.1.0
+ *
+ * @extends CMB_Fields
+ */
+class CMB_Checkbox_Multi extends CMB_Field {
+
+	public function html() {
+
+		if ( $this->has_data_delegate() ) {
+			$this->args['options'] = $this->get_delegate_data();
+		}
+
+		foreach ( $this->args['options'] as $i => $label ) :
+
+			$value = $this->get_value();
+
+			?>
+
+			<div class="cmb-checkbox-wrap">
+
+				<input
+					type="checkbox"
+					<?php $this->id_attr( 'item-' . $i ); ?>
+					<?php $this->boolean_attr(); ?>
+					<?php $this->class_attr(); ?>
+					<?php $this->name_attr( '[item-' . $i . ']' ); ?>
+					<?php checked( isset( $value[ 'item-' . $i ] ) ); ?>
+				/>
+
+				<label <?php $this->for_attr( 'item-' . $i ); ?>>
+					<?php echo esc_html( $label ); ?>
+				</label>
+
+			</div>
+
+		<?php endforeach;
+
+	}
+
+}
\ No newline at end of file

From 6cec654804c49a9c16fe8bcd2e274a0345283db0 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Sat, 3 Dec 2016 22:29:05 +0100
Subject: [PATCH 016/148] Abstracted out some core field functionality into
 separate methods and fixed bug in checkbox multi field

---
 classes.fields.php                  | 48 ++++++++++++++----------
 custom-meta-boxes.php               |  1 +
 fields/class-cmb-checkbox-multi.php | 58 ++++++++++++++++++++++++++++-
 3 files changed, 86 insertions(+), 21 deletions(-)

diff --git a/classes.fields.php b/classes.fields.php
index caba4a5b..b1413dd1 100644
--- a/classes.fields.php
+++ b/classes.fields.php
@@ -444,11 +444,7 @@ public function display() {
 
 			<div class="field-item" data-class="<?php echo esc_attr( get_class( $this ) ); ?>" style="position: relative; <?php echo esc_attr( $this->args['style'] ); ?>">
 
-			<?php if ( $this->args['repeatable'] ) : ?>
-				<button class="cmb-delete-field" title="<?php echo esc_attr( $this->args['string-delete-field'] ); ?>">
-					<span class="cmb-delete-field-icon">&times;</span>
-				</button>
-			<?php endif; ?>
+			<?php $this->delete_button_markup(); ?>
 
 			<?php $this->html(); ?>
 
@@ -462,29 +458,43 @@ public function display() {
 
 		// Insert a hidden one if it's repeatable.
 		if ( $this->args['repeatable'] ) {
+			$this->repeatable_button_markup();
+		}
+	}
 
-			// X used to distinguish hidden fields.
-			$this->field_index = 'x';
-			$this->value = ''; ?>
+	/**
+	 * Markup to make a field repeatable and enable a user to add or delete another row.
+	 */
+	protected function repeatable_button_markup() {
+		// X used to distinguish hidden fields.
+		$this->field_index = 'x';
+		$this->value = ''; ?>
 
-			<div class="field-item hidden" data-class="<?php echo esc_attr( get_class( $this ) ); ?>" style="position: relative; <?php echo esc_attr( $this->args['style'] ); ?>">
+		<div class="field-item hidden" data-class="<?php echo esc_attr( get_class( $this ) ); ?>" style="position: relative; <?php echo esc_attr( $this->args['style'] ); ?>">
 
-			<?php if ( $this->args['repeatable'] ) : ?>
-				<button class="cmb-delete-field" title="<?php echo esc_attr( $this->args['string-delete-field'] ); ?>">
-					<span class="cmb-delete-field-icon">&times;</span>
-					<?php echo esc_html( $this->args['string-delete-field'] ); ?>
-				</button>
-			<?php endif; ?>
+			<?php $this->delete_button_markup(); ?>
 
 			<?php $this->html(); ?>
 
-			</div>
+		</div>
 
-			<button class="button repeat-field"><?php echo esc_html( $this->args['string-repeat-field'] ); ?></button>
+		<button class="button repeat-field"><?php echo esc_html( $this->args['string-repeat-field'] ); ?></button>
 
-			<?php
-		}
+		<?php
+	}
 
+	/**
+	 * Markup to print a "remove" button for a repeatable field.
+	 */
+	protected function delete_button_markup() {
+		if ( $this->args['repeatable'] ) :
+			?>
+			<button class="cmb-delete-field" title="<?php echo esc_attr( $this->args['string-delete-field'] ); ?>">
+				<span class="cmb-delete-field-icon">&times;</span>
+				<?php echo esc_html( $this->args['string-delete-field'] ); ?>
+			</button>
+			<?php
+		endif;
 	}
 }
 
diff --git a/custom-meta-boxes.php b/custom-meta-boxes.php
index 06433c58..c43cfbea 100755
--- a/custom-meta-boxes.php
+++ b/custom-meta-boxes.php
@@ -39,6 +39,7 @@
  */
 include_once( CMB_PATH . '/classes.fields.php' );
 include_once( CMB_PATH . '/class.cmb-meta-box.php' );
+include_once( CMB_PATH . 'fields/class-cmb-checkbox-multi.php' );
 
 /**
  * Make it possible to add fields in locations other than post edit screen. Optional.
diff --git a/fields/class-cmb-checkbox-multi.php b/fields/class-cmb-checkbox-multi.php
index 11fea001..5b9bc280 100644
--- a/fields/class-cmb-checkbox-multi.php
+++ b/fields/class-cmb-checkbox-multi.php
@@ -15,6 +15,61 @@
  */
 class CMB_Checkbox_Multi extends CMB_Field {
 
+	/**
+	 * Print out a field.
+	 */
+	public function display() {
+
+		// Print title if necessary.
+		$this->title();
+
+		// Print description if necessary.
+		$this->description();
+
+		if ( $this->args['repeatable'] ) {
+
+			$values = ( $this->get_values() ) ? $this->get_values() : array();
+
+			$i = 0;
+
+			foreach ( $values as $key => $value ) {
+
+				$this->field_index = $i;
+				$this->value       = $value;
+				?>
+
+				<div class="field-item" data-class="<?php echo esc_attr( get_class( $this ) ); ?>" style="position: relative; <?php echo esc_attr( $this->args['style'] ); ?>">
+
+					<?php $this->delete_button_markup(); ?>
+					<?php $this->html(); ?>
+
+				</div>
+
+				<?php
+
+				$i++;
+			}
+
+			// Insert a hidden one if it's repeatable.
+			$this->repeatable_button_markup();
+		} else {
+
+			$this->value = $this->get_values();
+			?>
+
+			<div class="field-item" data-class="<?php echo esc_attr( get_class( $this ) ); ?>" style="position: relative; <?php echo esc_attr( $this->args['style'] ); ?>">
+
+				<?php $this->html(); ?>
+
+			</div>
+
+			<?php
+		}
+	}
+
+	/**
+	 * Print out field HTML.
+	 */
 	public function html() {
 
 		if ( $this->has_data_delegate() ) {
@@ -47,5 +102,4 @@ public function html() {
 		<?php endforeach;
 
 	}
-
-}
\ No newline at end of file
+}

From d5d6bcbf3a18770db535b48f9db4e5d98b157efc Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Wed, 21 Dec 2016 15:40:26 +0100
Subject: [PATCH 017/148] Beginning of new generic tests and test for the
 checkbox multi field

---
 classes.fields.php                  | 10 +++--
 fields/class-cmb-checkbox-multi.php |  5 +--
 tests/testCheckboxMultiField.php    | 61 +++++++++++++++++++++++++++++
 tests/testField.php                 | 15 +++++++
 4 files changed, 84 insertions(+), 7 deletions(-)
 create mode 100644 tests/testCheckboxMultiField.php

diff --git a/classes.fields.php b/classes.fields.php
index b1413dd1..ebaca343 100644
--- a/classes.fields.php
+++ b/classes.fields.php
@@ -440,7 +440,8 @@ public function display() {
 		foreach ( $values as $key => $value ) {
 
 			$this->field_index = $i;
-			$this->value = $value; ?>
+			$this->value       = $value;
+			?>
 
 			<div class="field-item" data-class="<?php echo esc_attr( get_class( $this ) ); ?>" style="position: relative; <?php echo esc_attr( $this->args['style'] ); ?>">
 
@@ -450,7 +451,7 @@ public function display() {
 
 			</div>
 
-		<?php
+			<?php
 
 			$i++;
 
@@ -463,12 +464,13 @@ public function display() {
 	}
 
 	/**
-	 * Markup to make a field repeatable and enable a user to add or delete another row.
+	 * Markup to print an "add" button and for a repeatable field.
 	 */
 	protected function repeatable_button_markup() {
 		// X used to distinguish hidden fields.
 		$this->field_index = 'x';
-		$this->value = ''; ?>
+		$this->value       = '';
+		?>
 
 		<div class="field-item hidden" data-class="<?php echo esc_attr( get_class( $this ) ); ?>" style="position: relative; <?php echo esc_attr( $this->args['style'] ); ?>">
 
diff --git a/fields/class-cmb-checkbox-multi.php b/fields/class-cmb-checkbox-multi.php
index 5b9bc280..4b0992dc 100644
--- a/fields/class-cmb-checkbox-multi.php
+++ b/fields/class-cmb-checkbox-multi.php
@@ -79,7 +79,6 @@ public function html() {
 		foreach ( $this->args['options'] as $i => $label ) :
 
 			$value = $this->get_value();
-
 			?>
 
 			<div class="cmb-checkbox-wrap">
@@ -99,7 +98,7 @@ public function html() {
 
 			</div>
 
-		<?php endforeach;
-
+		<?php
+		endforeach;
 	}
 }
diff --git a/tests/testCheckboxMultiField.php b/tests/testCheckboxMultiField.php
new file mode 100644
index 00000000..19fba224
--- /dev/null
+++ b/tests/testCheckboxMultiField.php
@@ -0,0 +1,61 @@
+<?php
+
+class CheckboxMultiFieldTestCase extends WP_UnitTestCase {
+
+	function setUp() {
+		parent::setUp();
+
+		$args = array(
+			'post_author'  => 1,
+			'post_status'  => 'publish',
+			'post_content' => rand_str(),
+			'post_title'   => rand_str(),
+			'post_type'    => 'post',
+		);
+
+		$id = wp_insert_post( $args );
+
+		$this->post = get_post( $id );
+	}
+
+	function tearDown() {
+		wp_delete_post( $this->post->ID, true );
+		unset( $this->post );
+		parent::tearDown();
+	}
+
+	function testSaveValue() {
+		$value = array( 'value' );
+		$field = new CMB_Checkbox_Multi( 'foo', 'Foo', $value );
+
+		if ( ! $this->post ) {
+			$this->markTestSkipped( 'Post not found' );
+		}
+
+		$field->save( $this->post->ID, $value );
+
+		// Verify single value is properly saved.
+		$this->assertEquals( get_post_meta( $this->post->ID, 'foo', false ), $value );
+	}
+
+	function testSaveValuesOnRepeatable() {
+
+	}
+
+	function testEmptyFieldOutput() {
+		$field        = new CMB_Checkbox_Multi( 'foo', 'Foo', array( 'value' ) );
+
+		if ( ! $this->post ) {
+			$this->markTestSkipped( 'Post not found' );
+		}
+
+		$this->expectOutputRegex( '/(type=\"hidden\".*?id=\"foo-cmb-field-0\".*?value=\"value\")/s' );
+
+		// Trigger output.
+		$field->html();
+	}
+
+	function testSavedFieldOutput() {
+
+	}
+}
diff --git a/tests/testField.php b/tests/testField.php
index fc5be6a0..dc1ef3ac 100644
--- a/tests/testField.php
+++ b/tests/testField.php
@@ -163,4 +163,19 @@ function testSavedFieldOutput() {
 		$field->html();
 	}
 
+	function testEmptyRepeatableButton() {
+
+	}
+
+	function testDisplayedRepeatableButton() {
+
+	}
+
+	function testEmptyDeleteButton() {
+
+	}
+
+	function testDisplayedDeleteButton() {
+
+	}
 }

From d0e706e875535bfb22c0b6a5af20f757d9c53b70 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Wed, 21 Dec 2016 16:07:32 +0100
Subject: [PATCH 018/148] Fixed non-repeatable group fields

---
 class.cmb-meta-box.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/class.cmb-meta-box.php b/class.cmb-meta-box.php
index e53d4cf8..dda31e14 100644
--- a/class.cmb-meta-box.php
+++ b/class.cmb-meta-box.php
@@ -75,14 +75,19 @@ public function init_fields( $post_id = 0 ) {
 			unset( $args['type'] );
 			unset( $args['name'] );
 
-			$class = _cmb_field_class_for_type( $field['type'] );
+			$class  = _cmb_field_class_for_type( $field['type'] );
+			$single = ( ! isset( $field['repeatable'] ) || false === $field['repeatable'] );
 
 			// If we are on a post edit screen - get metadata value of the field for this post.
 			if ( $post_id ) {
-				$single = ( ! isset( $field['repeatable'] ) || false === $field['repeatable'] );
 				$values = (array) get_post_meta( $post_id, $field['id'], $single );
 			}
 
+			// Handle repeatable values for group fields.
+			if ( 'group' === $field['type'] && $single ) {
+				$values = array( $values );
+			}
+
 			if ( class_exists( $class ) ) {
 				$this->fields[] = new $class( $field['id'], $field['name'], (array) $values, $args );
 			}

From 6e03f71942f988ea8c4f0fa17a50d7b8a011d06f Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Wed, 21 Dec 2016 17:19:54 +0100
Subject: [PATCH 019/148] Start of unit tests for basic value setting of the
 CMB_Meta_Box class

---
 class.cmb-meta-box.php        |   2 +-
 tests/testCmbMetaBoxClass.php | 191 ++++++++++++++++++++++++++++++++++
 2 files changed, 192 insertions(+), 1 deletion(-)
 create mode 100644 tests/testCmbMetaBoxClass.php

diff --git a/class.cmb-meta-box.php b/class.cmb-meta-box.php
index dda31e14..06892bbf 100644
--- a/class.cmb-meta-box.php
+++ b/class.cmb-meta-box.php
@@ -29,7 +29,7 @@ class CMB_Meta_Box {
 	 *
 	 * @var array
 	 */
-	private $fields = array();
+	public $fields = array();
 
 	/**
 	 * CMB_Meta_Box constructor.
diff --git a/tests/testCmbMetaBoxClass.php b/tests/testCmbMetaBoxClass.php
new file mode 100644
index 00000000..1da43da3
--- /dev/null
+++ b/tests/testCmbMetaBoxClass.php
@@ -0,0 +1,191 @@
+<?php
+
+class CmbMetaboxClassTests extends WP_UnitTestCase {
+
+	/**
+	 * Holds the test post ID.
+	 *
+	 * @var int
+	 */
+	private $post_id = 0;
+
+	/**
+	 * Initialization.
+	 */
+	function setUp() {
+		parent::setUp();
+
+		// Create a test post.
+		$this->post_id = self::factory()->post->create(
+			array(
+				'post_author'  => get_current_user_id(),
+				'post_title'   => 'My test post',
+				'post_type'    => 'post',
+				'post_status'  => 'publish',
+			)
+		);
+
+	}
+
+	/**
+	 * Clean up after a test.
+	 */
+	function tearDown() {
+		wp_delete_post( $this->post_id );
+		parent::tearDown();
+	}
+
+
+	function test_values_from_init_non_repeatable() {
+
+		$simple_fields = array(
+			'title' => 'Simple',
+			'pages' => 'post',
+			'fields' => array(
+				array(
+					'id'         => 'text',
+					'name'       => 'Simple',
+					'type'       => 'text',
+					'repeatable' => false,
+				),
+			)
+		);
+
+		$boxes = new CMB_Meta_Box( $simple_fields );
+		$boxes->init_fields( $this->post_id );
+
+		// Save some values for testing.
+		$boxes->fields[0]->save( $this->post_id, array( 1, 2, 3, 4, 5 ) );
+
+		// Re-initialize the boxes and check the data.
+		$boxes->init_fields( $this->post_id );
+
+		// Check that a non-repeatable field only returns one value.
+		// The new instance of the field is 1.
+		$this->assertEquals( array( 1 ), $boxes->fields[1]->values );
+	}
+
+	function test_values_from_init_repeatable() {
+
+		$simple_fields = array(
+			'title' => 'Simple',
+			'pages' => 'post',
+			'fields' => array(
+				array(
+					'id'         => 'text',
+					'name'       => 'Simple',
+					'type'       => 'text',
+					'repeatable' => true,
+				),
+			)
+		);
+
+		$boxes = new CMB_Meta_Box( $simple_fields );
+		$boxes->init_fields( $this->post_id );
+
+		// Save some values for testing.
+		$boxes->fields[0]->save( $this->post_id, array( 1, 2, 3, 4, 5 ) );
+
+		// Re-initialize the boxes and check the data.
+		$boxes->init_fields( $this->post_id );
+
+		// Check that a non-repeatable field only returns one value.
+		// The new instance of the field is 1.
+		$this->assertEquals( array( 1, 2, 3, 4, 5 ), $boxes->fields[1]->values );
+
+	}
+
+	function test_values_from_init_group_non_repeatable() {
+
+		$group_fields = array(
+			'title' => 'Simple',
+			'pages' => 'post',
+			'fields' => array(
+				array(
+					'id'         => 'text',
+					'name'       => 'Simple',
+					'type'       => 'group',
+					'fields'     => array(
+						array(
+							'id'         => 'text',
+							'name'       => 'Simple',
+							'type'       => 'text',
+						),
+						array(
+							'id'         => 'text2',
+							'name'       => 'Simple 2',
+							'type'       => 'text',
+						),
+					),
+				),
+			)
+		);
+
+		$boxes = new CMB_Meta_Box( $group_fields );
+		$boxes->init_fields( $this->post_id );
+
+		// Save some values for testing.
+		$boxes->fields[0]->save( $this->post_id, array(
+			array(
+				'text'  => array( 'one', 'two', 'three' ),
+				'text2' => array( 'four', 'five', 'six' ),
+			)
+		) );
+
+		// Re-initialize the boxes and check the data.
+		$boxes->init_fields( $this->post_id );
+
+		// Check that a non-repeatable field only returns one value.
+		// The new instance of the field is 1.
+		$this->assertEquals( array( array( 'text' => 'one', 'text2' => 'four' ) ), $boxes->fields[1]->values );
+
+	}
+
+	function test_values_from_init_group_repeatable() {
+
+		$group_fields = array(
+			'title' => 'Simple',
+			'pages' => 'post',
+			'fields' => array(
+				array(
+					'id'         => 'text',
+					'name'       => 'Simple',
+					'type'       => 'group',
+					'fields'     => array(
+						array(
+							'id'         => 'text',
+							'name'       => 'Simple',
+							'type'       => 'text',
+							'repeatable' => true,
+						),
+						array(
+							'id'         => 'text2',
+							'name'       => 'Simple 2',
+							'type'       => 'text',
+							'repeatable' => true,
+						),
+					),
+				),
+			)
+		);
+
+		$boxes = new CMB_Meta_Box( $group_fields );
+		$boxes->init_fields( $this->post_id );
+
+		// Save some values for testing.
+		$boxes->fields[0]->save( $this->post_id, array(
+			array(
+				'text'  => array( 'one', 'two', 'three' ),
+				'text2' => array( 'four', 'five', 'six' ),
+			)
+		) );
+
+		// Re-initialize the boxes and check the data.
+		$boxes->init_fields( $this->post_id );
+
+		// Check that a non-repeatable field only returns one value.
+		// The new instance of the field is 1.
+		$this->assertEquals( array( array( 'text' => array( 'one', 'two', 'three' ), 'text2' => array( 'four', 'five', 'six' ) ) ), $boxes->fields[1]->values );
+
+	}
+}
\ No newline at end of file

From a0b3710b281fc33c0aa2b89eb39f17936b2a1a28 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Thu, 22 Dec 2016 09:42:08 +0100
Subject: [PATCH 020/148] Cleaned up the base class tests a bit. Still not in
 love, but better

---
 tests/testCmbMetaBoxClass.php | 206 +++++++++++++++++-----------------
 1 file changed, 100 insertions(+), 106 deletions(-)

diff --git a/tests/testCmbMetaBoxClass.php b/tests/testCmbMetaBoxClass.php
index 1da43da3..54bfcc1c 100644
--- a/tests/testCmbMetaBoxClass.php
+++ b/tests/testCmbMetaBoxClass.php
@@ -9,6 +9,20 @@ class CmbMetaboxClassTests extends WP_UnitTestCase {
 	 */
 	private $post_id = 0;
 
+	/**
+	 * Holds a simlpe fieldset.
+	 *
+	 * @var array
+	 */
+	private $simple_fields = [];
+
+	/**
+	 * Holds a simlpe fieldset.
+	 *
+	 * @var array
+	 */
+	private $group_fields = [];
+
 	/**
 	 * Initialization.
 	 */
@@ -25,20 +39,7 @@ function setUp() {
 			)
 		);
 
-	}
-
-	/**
-	 * Clean up after a test.
-	 */
-	function tearDown() {
-		wp_delete_post( $this->post_id );
-		parent::tearDown();
-	}
-
-
-	function test_values_from_init_non_repeatable() {
-
-		$simple_fields = array(
+		$this->simple_fields = array(
 			'title' => 'Simple',
 			'pages' => 'post',
 			'fields' => array(
@@ -51,53 +52,7 @@ function test_values_from_init_non_repeatable() {
 			)
 		);
 
-		$boxes = new CMB_Meta_Box( $simple_fields );
-		$boxes->init_fields( $this->post_id );
-
-		// Save some values for testing.
-		$boxes->fields[0]->save( $this->post_id, array( 1, 2, 3, 4, 5 ) );
-
-		// Re-initialize the boxes and check the data.
-		$boxes->init_fields( $this->post_id );
-
-		// Check that a non-repeatable field only returns one value.
-		// The new instance of the field is 1.
-		$this->assertEquals( array( 1 ), $boxes->fields[1]->values );
-	}
-
-	function test_values_from_init_repeatable() {
-
-		$simple_fields = array(
-			'title' => 'Simple',
-			'pages' => 'post',
-			'fields' => array(
-				array(
-					'id'         => 'text',
-					'name'       => 'Simple',
-					'type'       => 'text',
-					'repeatable' => true,
-				),
-			)
-		);
-
-		$boxes = new CMB_Meta_Box( $simple_fields );
-		$boxes->init_fields( $this->post_id );
-
-		// Save some values for testing.
-		$boxes->fields[0]->save( $this->post_id, array( 1, 2, 3, 4, 5 ) );
-
-		// Re-initialize the boxes and check the data.
-		$boxes->init_fields( $this->post_id );
-
-		// Check that a non-repeatable field only returns one value.
-		// The new instance of the field is 1.
-		$this->assertEquals( array( 1, 2, 3, 4, 5 ), $boxes->fields[1]->values );
-
-	}
-
-	function test_values_from_init_group_non_repeatable() {
-
-		$group_fields = array(
+		$this->group_fields = array(
 			'title' => 'Simple',
 			'pages' => 'post',
 			'fields' => array(
@@ -121,71 +76,110 @@ function test_values_from_init_group_non_repeatable() {
 			)
 		);
 
-		$boxes = new CMB_Meta_Box( $group_fields );
-		$boxes->init_fields( $this->post_id );
+	}
 
-		// Save some values for testing.
-		$boxes->fields[0]->save( $this->post_id, array(
-			array(
-				'text'  => array( 'one', 'two', 'three' ),
-				'text2' => array( 'four', 'five', 'six' ),
-			)
+	/**
+	 * Clean up after a test.
+	 */
+	function tearDown() {
+		wp_delete_post( $this->post_id );
+		parent::tearDown();
+	}
+
+
+	function test_values_from_init_non_repeatable() {
+
+		$values = array( 1, 2, 3, 4, 5 );
+
+		$field = $this->intialize_fields( $this->simple_fields, $values );
+
+		// Check that a non-repeatable field only returns one value.
+		// The new instance of the field is 1.
+		$this->assertEquals( array( 1 ), $field->values );
+
+		unset( $boxes );
+	}
+
+	function test_values_from_init_repeatable() {
+
+		// Change simple field to be a repeatable.
+		$this->simple_fields['fields'][0]['repeatable'] = true;
+
+		$values = array( 1, 2, 3, 4, 5 );
+
+		$field = $this->intialize_fields( $this->simple_fields, $values );
+
+		// Check that a non-repeatable field only returns one value.
+		// The new instance of the field is 1.
+		$this->assertEquals( array( 1, 2, 3, 4, 5 ), $field->values );
+
+		unset( $boxes );
+
+	}
+
+	function test_values_from_init_group_non_repeatable() {
+
+		$values = array( array(
+			'text'  => array( 'one', 'two', 'three' ),
+			'text2' => array( 'four', 'five', 'six' ),
 		) );
 
-		// Re-initialize the boxes and check the data.
-		$boxes->init_fields( $this->post_id );
+		$field = $this->intialize_fields( $this->group_fields, $values );
 
 		// Check that a non-repeatable field only returns one value.
 		// The new instance of the field is 1.
-		$this->assertEquals( array( array( 'text' => 'one', 'text2' => 'four' ) ), $boxes->fields[1]->values );
+		$this->assertEquals( array( array( 'text' => 'one', 'text2' => 'four' ) ), $field->values );
+
+		unset( $boxes );
 
 	}
 
 	function test_values_from_init_group_repeatable() {
 
-		$group_fields = array(
-			'title' => 'Simple',
-			'pages' => 'post',
-			'fields' => array(
+		// Change fields to be a repeatable.
+		$this->group_fields['fields'][0]['fields'][0]['repeatable'] = true;
+		$this->group_fields['fields'][0]['fields'][1]['repeatable'] = true;
+
+		$values = array( array(
+			'text'  => array( 'one', 'two', 'three' ),
+			'text2' => array( 'four', 'five', 'six' ),
+		) );
+
+		$field = $this->intialize_fields( $this->group_fields, $values );
+
+		// Check that a non-repeatable field only returns one value.
+		// The new instance of the field is 1.
+		$this->assertEquals(
+			array(
 				array(
-					'id'         => 'text',
-					'name'       => 'Simple',
-					'type'       => 'group',
-					'fields'     => array(
-						array(
-							'id'         => 'text',
-							'name'       => 'Simple',
-							'type'       => 'text',
-							'repeatable' => true,
-						),
-						array(
-							'id'         => 'text2',
-							'name'       => 'Simple 2',
-							'type'       => 'text',
-							'repeatable' => true,
-						),
-					),
-				),
-			)
+					'text' => array( 'one', 'two', 'three' ),
+					'text2' => array( 'four', 'five', 'six' ),
+				)
+			),
+			$field->values
 		);
 
-		$boxes = new CMB_Meta_Box( $group_fields );
+		unset( $boxes );
+
+	}
+
+	/**
+	 * Mock up a CMB_MetaBox instance, save a field value and the return the boxes for testing
+	 *
+	 * @param $fields
+	 * @param $values
+	 * @return object Field type class instance.
+	 */
+	private function intialize_fields( $fields, $values ) {
+		$boxes = new CMB_Meta_Box( $fields );
 		$boxes->init_fields( $this->post_id );
 
 		// Save some values for testing.
-		$boxes->fields[0]->save( $this->post_id, array(
-			array(
-				'text'  => array( 'one', 'two', 'three' ),
-				'text2' => array( 'four', 'five', 'six' ),
-			)
-		) );
+		$boxes->fields[0]->save( $this->post_id, $values );
 
 		// Re-initialize the boxes and check the data.
 		$boxes->init_fields( $this->post_id );
 
-		// Check that a non-repeatable field only returns one value.
-		// The new instance of the field is 1.
-		$this->assertEquals( array( array( 'text' => array( 'one', 'two', 'three' ), 'text2' => array( 'four', 'five', 'six' ) ) ), $boxes->fields[1]->values );
-
+		return $boxes->fields[1];
 	}
 }
\ No newline at end of file

From 669b2c42ab3392abc822b74f350181620fa1c24e Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Thu, 22 Dec 2016 09:43:34 +0100
Subject: [PATCH 021/148] Fixed spelling errors in the docblocks

---
 tests/testCmbMetaBoxClass.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/testCmbMetaBoxClass.php b/tests/testCmbMetaBoxClass.php
index 54bfcc1c..f8b2eb08 100644
--- a/tests/testCmbMetaBoxClass.php
+++ b/tests/testCmbMetaBoxClass.php
@@ -10,14 +10,14 @@ class CmbMetaboxClassTests extends WP_UnitTestCase {
 	private $post_id = 0;
 
 	/**
-	 * Holds a simlpe fieldset.
+	 * Holds a simple fieldset.
 	 *
 	 * @var array
 	 */
 	private $simple_fields = [];
 
 	/**
-	 * Holds a simlpe fieldset.
+	 * Holds a group fieldset.
 	 *
 	 * @var array
 	 */

From 797b77fa1f4efb858e97edeefb9e737ea2c4e2ed Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Thu, 22 Dec 2016 09:56:06 +0100
Subject: [PATCH 022/148] Fixing tests to run more bc-like

---
 tests/testCmbMetaBoxClass.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/tests/testCmbMetaBoxClass.php b/tests/testCmbMetaBoxClass.php
index f8b2eb08..41811c17 100644
--- a/tests/testCmbMetaBoxClass.php
+++ b/tests/testCmbMetaBoxClass.php
@@ -14,14 +14,14 @@ class CmbMetaboxClassTests extends WP_UnitTestCase {
 	 *
 	 * @var array
 	 */
-	private $simple_fields = [];
+	private $simple_fields = array();
 
 	/**
 	 * Holds a group fieldset.
 	 *
 	 * @var array
 	 */
-	private $group_fields = [];
+	private $group_fields = array();
 
 	/**
 	 * Initialization.
@@ -29,8 +29,15 @@ class CmbMetaboxClassTests extends WP_UnitTestCase {
 	function setUp() {
 		parent::setUp();
 
+		// Factory was originally a variable, not a method. Checking for running tests bc-like.
+		if ( is_callable( [ $this, 'factory' ] ) ) {
+			$factory = $this->factory();
+		} else {
+			$factory = $this->factory;
+		}
+
 		// Create a test post.
-		$this->post_id = self::factory()->post->create(
+		$this->post_id = $factory->post->create(
 			array(
 				'post_author'  => get_current_user_id(),
 				'post_title'   => 'My test post',

From 0845e94be9420a4cdf48a338ba335474f4e5b763 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Thu, 22 Dec 2016 10:14:59 +0100
Subject: [PATCH 023/148] Removing last instance of php5.4 arrays from the new
 tests

---
 tests/testCmbMetaBoxClass.php | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/tests/testCmbMetaBoxClass.php b/tests/testCmbMetaBoxClass.php
index 41811c17..6c53de45 100644
--- a/tests/testCmbMetaBoxClass.php
+++ b/tests/testCmbMetaBoxClass.php
@@ -30,7 +30,7 @@ function setUp() {
 		parent::setUp();
 
 		// Factory was originally a variable, not a method. Checking for running tests bc-like.
-		if ( is_callable( [ $this, 'factory' ] ) ) {
+		if ( is_callable( array( $this, 'factory' ) ) ) {
 			$factory = $this->factory();
 		} else {
 			$factory = $this->factory;
@@ -103,8 +103,6 @@ function test_values_from_init_non_repeatable() {
 		// Check that a non-repeatable field only returns one value.
 		// The new instance of the field is 1.
 		$this->assertEquals( array( 1 ), $field->values );
-
-		unset( $boxes );
 	}
 
 	function test_values_from_init_repeatable() {
@@ -119,9 +117,6 @@ function test_values_from_init_repeatable() {
 		// Check that a non-repeatable field only returns one value.
 		// The new instance of the field is 1.
 		$this->assertEquals( array( 1, 2, 3, 4, 5 ), $field->values );
-
-		unset( $boxes );
-
 	}
 
 	function test_values_from_init_group_non_repeatable() {
@@ -136,9 +131,6 @@ function test_values_from_init_group_non_repeatable() {
 		// Check that a non-repeatable field only returns one value.
 		// The new instance of the field is 1.
 		$this->assertEquals( array( array( 'text' => 'one', 'text2' => 'four' ) ), $field->values );
-
-		unset( $boxes );
-
 	}
 
 	function test_values_from_init_group_repeatable() {
@@ -165,9 +157,6 @@ function test_values_from_init_group_repeatable() {
 			),
 			$field->values
 		);
-
-		unset( $boxes );
-
 	}
 
 	/**

From 2254eb571277f49c0adb7c1ee3553a9e65ce726e Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Thu, 22 Dec 2016 11:00:23 +0100
Subject: [PATCH 024/148] Added tests for delete and repeatable buttons,
 started on tests for checkbox multi

---
 classes.fields.php                  | 18 +++++++++---------
 fields/class-cmb-checkbox-multi.php | 12 +++++++++---
 tests/bootstrap.php                 | 16 ++++++++++++++++
 tests/testCheckboxMultiField.php    |  4 ++--
 tests/testField.php                 | 21 ++++++++++++++++-----
 5 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/classes.fields.php b/classes.fields.php
index ebaca343..2a52a417 100644
--- a/classes.fields.php
+++ b/classes.fields.php
@@ -445,7 +445,9 @@ public function display() {
 
 			<div class="field-item" data-class="<?php echo esc_attr( get_class( $this ) ); ?>" style="position: relative; <?php echo esc_attr( $this->args['style'] ); ?>">
 
-			<?php $this->delete_button_markup(); ?>
+			<?php if ( $this->args['repeatable'] ) {
+				$this->delete_button_markup();
+			} ?>
 
 			<?php $this->html(); ?>
 
@@ -489,14 +491,12 @@ protected function repeatable_button_markup() {
 	 * Markup to print a "remove" button for a repeatable field.
 	 */
 	protected function delete_button_markup() {
-		if ( $this->args['repeatable'] ) :
-			?>
-			<button class="cmb-delete-field" title="<?php echo esc_attr( $this->args['string-delete-field'] ); ?>">
-				<span class="cmb-delete-field-icon">&times;</span>
-				<?php echo esc_html( $this->args['string-delete-field'] ); ?>
-			</button>
-			<?php
-		endif;
+		?>
+		<button class="cmb-delete-field" title="<?php echo esc_attr( $this->args['string-delete-field'] ); ?>">
+			<span class="cmb-delete-field-icon">&times;</span>
+			<?php echo esc_html( $this->args['string-delete-field'] ); ?>
+		</button>
+		<?php
 	}
 }
 
diff --git a/fields/class-cmb-checkbox-multi.php b/fields/class-cmb-checkbox-multi.php
index 4b0992dc..e405eff3 100644
--- a/fields/class-cmb-checkbox-multi.php
+++ b/fields/class-cmb-checkbox-multi.php
@@ -40,7 +40,9 @@ public function display() {
 
 				<div class="field-item" data-class="<?php echo esc_attr( get_class( $this ) ); ?>" style="position: relative; <?php echo esc_attr( $this->args['style'] ); ?>">
 
-					<?php $this->delete_button_markup(); ?>
+					<?php if ( $this->args['repeatable'] ) {
+						$this->delete_button_markup();
+					} ?>
 					<?php $this->html(); ?>
 
 				</div>
@@ -76,6 +78,11 @@ public function html() {
 			$this->args['options'] = $this->get_delegate_data();
 		}
 
+		// Whoops, someone forgot to add some options. We can't do anything without options.
+		if ( empty( $this->args['options'] ) ) {
+			return;
+		}
+
 		foreach ( $this->args['options'] as $i => $label ) :
 
 			$value = $this->get_value();
@@ -83,8 +90,7 @@ public function html() {
 
 			<div class="cmb-checkbox-wrap">
 
-				<input
-					type="checkbox"
+				<input type="checkbox"
 					<?php $this->id_attr( 'item-' . $i ); ?>
 					<?php $this->boolean_attr(); ?>
 					<?php $this->class_attr(); ?>
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 9d9bcebf..95396d7b 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -15,3 +15,19 @@ function _manually_load_plugin() {
 
 require $_tests_dir . '/includes/bootstrap.php';
 
+/**
+ * Call protected/private method of a class.
+ *
+ * @param object &$object Instantiated object that we will run method on.
+ * @param string $method_name Method name to call
+ * @param array $parameters Array of parameters to pass into method.
+ *
+ * @return mixed Method return.
+ */
+function hmcmb_invoke_method( &$object, $method_name, array $parameters = array() ) {
+	$reflection = new \ReflectionClass( get_class( $object ) );
+	$method     = $reflection->getMethod( $method_name );
+	$method->setAccessible( true );
+
+	return $method->invokeArgs( $object, $parameters );
+}
\ No newline at end of file
diff --git a/tests/testCheckboxMultiField.php b/tests/testCheckboxMultiField.php
index 19fba224..40599972 100644
--- a/tests/testCheckboxMultiField.php
+++ b/tests/testCheckboxMultiField.php
@@ -43,13 +43,13 @@ function testSaveValuesOnRepeatable() {
 	}
 
 	function testEmptyFieldOutput() {
-		$field        = new CMB_Checkbox_Multi( 'foo', 'Foo', array( 'value' ) );
+		$field        = new CMB_Checkbox_Multi( 'foo', 'Foo', array( 'value' => 'value' ), array( 'options' => array( 'value' => 'value' ) ) );
 
 		if ( ! $this->post ) {
 			$this->markTestSkipped( 'Post not found' );
 		}
 
-		$this->expectOutputRegex( '/(type=\"hidden\".*?id=\"foo-cmb-field-0\".*?value=\"value\")/s' );
+		$this->expectOutputRegex( '/(type=\"checkbox\".*?id=\"foo-cmb-field-0-item-value\".*?checked=\"checked\")/s' );
 
 		// Trigger output.
 		$field->html();
diff --git a/tests/testField.php b/tests/testField.php
index dc1ef3ac..785a6409 100644
--- a/tests/testField.php
+++ b/tests/testField.php
@@ -163,19 +163,30 @@ function testSavedFieldOutput() {
 		$field->html();
 	}
 
-	function testEmptyRepeatableButton() {
+	function testDisplayedRepeatableButtonDiv() {
+		$field = new CMB_Text_Field( 'foo', 'Title', array( 1 ), array( 'repeatable' => true ) );
 
-	}
-
-	function testDisplayedRepeatableButton() {
+		// Set expectation for an empty output.
+		$this->expectOutputRegex( '/\<div class=\"field-item hidden\" .*?\>/' );
 
+		hmcmb_invoke_method( $field, 'repeatable_button_markup' );
 	}
 
-	function testEmptyDeleteButton() {
+	function testDisplayedRepeatableButtonButton() {
+		$field = new CMB_Text_Field( 'foo', 'Title', array( 1 ), array( 'repeatable' => true ) );
 
+		// Set expectation for an empty output.
+		$this->expectOutputRegex( '/\<button class=\"button repeat-field\"\>Add New<\/button\>/' );
+
+		hmcmb_invoke_method( $field, 'repeatable_button_markup' );
 	}
 
 	function testDisplayedDeleteButton() {
+		$field = new CMB_Text_Field( 'foo', 'Title', array( 1 ), array( 'repeatable' => true ) );
+
+		// Set expectation for an empty output.
+		$this->expectOutputRegex( '/\<button class=\"cmb-delete-field\" title=\"Remove\">/' );
 
+		hmcmb_invoke_method( $field, 'delete_button_markup' );
 	}
 }

From 4ef8299b0753f8f0d7dc1246b5ffc818158a05a0 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Wed, 28 Dec 2016 17:26:08 +0100
Subject: [PATCH 025/148] Added EOF line in test file

---
 tests/testCmbMetaBoxClass.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/testCmbMetaBoxClass.php b/tests/testCmbMetaBoxClass.php
index 6c53de45..bf8b381b 100644
--- a/tests/testCmbMetaBoxClass.php
+++ b/tests/testCmbMetaBoxClass.php
@@ -178,4 +178,4 @@ private function intialize_fields( $fields, $values ) {
 
 		return $boxes->fields[1];
 	}
-}
\ No newline at end of file
+}

From 22e262b356cd98a47d0d22c596a9ec63773e5d43 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Mon, 2 Jan 2017 15:24:01 +0100
Subject: [PATCH 026/148] Added capability checks and options

---
 class.cmb-meta-box.php | 25 ++++++++++++++++++++++++-
 classes.fields.php     |  8 ++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/class.cmb-meta-box.php b/class.cmb-meta-box.php
index 06892bbf..d644a73d 100644
--- a/class.cmb-meta-box.php
+++ b/class.cmb-meta-box.php
@@ -89,7 +89,11 @@ public function init_fields( $post_id = 0 ) {
 			}
 
 			if ( class_exists( $class ) ) {
-				$this->fields[] = new $class( $field['id'], $field['name'], (array) $values, $args );
+				$field = new $class( $field['id'], $field['name'], (array) $values, $args );
+				if ( $field->is_displayed() ) {
+					$this->fields[] = $field;
+				}
+				unset( $field );
 			}
 		}
 
@@ -212,6 +216,7 @@ function is_metabox_displayed() {
 		$display = $this->hide_for_id( $display );
 		$display = $this->add_for_page_template( $display );
 		$display = $this->hide_for_page_template( $display );
+		$display = $this->check_capabilities( $display );
 		return $display;
 	}
 
@@ -331,6 +336,24 @@ function hide_for_page_template( $display ) {
 
 	}
 
+	/**
+	 * Check capabilities of current user before displaying a CMB block.
+	 *
+	 * Only works for field collections that have the 'capability' attribute set.
+	 *
+	 * @param bool $display Current display status.
+	 * @return bool (Potentially) modified display status
+	 */
+	function check_capabilities( $display ) {
+
+		if ( ! isset( $this->_meta_box['capability'] ) ) {
+			return $display;
+		}
+
+		return current_user_can( sanitize_text_field( $this->_meta_box['capability'] ) );
+
+	}
+
 	/**
 	 * Print out field collection description.
 	 */
diff --git a/classes.fields.php b/classes.fields.php
index 556a0965..528d2676 100644
--- a/classes.fields.php
+++ b/classes.fields.php
@@ -91,6 +91,7 @@ public function get_default_args() {
 				'class'               => '',
 				'data_delegate'       => null,
 				'save_callback'       => null,
+				'capability'          => 'edit_posts',
 				'string-repeat-field' => __( 'Add New', 'cmb' ),
 				'string-delete-field' => __( 'Remove', 'cmb' ),
 			),
@@ -382,6 +383,13 @@ public function save( $post_id, $values ) {
 		}
 	}
 
+	/**
+	 * Check whether the current field should or should not be displayed.
+	 */
+	public function is_displayed() {
+		return current_user_can( $this->args['capability'] );
+	}
+
 	/**
 	 * Print title for field.
 	 */

From ec65bf7132b2103ffb1ad4fa4e1936fd47699c24 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Mon, 2 Jan 2017 15:34:05 +0100
Subject: [PATCH 027/148] Added test for new is_displayed method

---
 tests/testField.php | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/tests/testField.php b/tests/testField.php
index fc5be6a0..eeb88f4e 100644
--- a/tests/testField.php
+++ b/tests/testField.php
@@ -4,6 +4,8 @@ class FieldTestCase extends WP_UnitTestCase {
 
 	private $post;
 
+	private $users = [];
+
 	function setUp() {
 
 		parent::setUp();
@@ -20,11 +22,16 @@ function setUp() {
 
 		$this->post = get_post( $id );
 
+		// Setup some users to test our display logic.
+		$this->users['admin'] = $this->factory->user->create( [ 'role' => 'administrator' ] );
+		$this->users['author'] = $this->factory->user->create( [ 'role' => 'author' ] );
+
 	}
 
 	function tearDown() {
 		wp_delete_post( $this->post->ID, true );
 		unset( $this->post );
+		wp_set_current_user( 0 );
 		parent::tearDown();
 	}
 
@@ -163,4 +170,24 @@ function testSavedFieldOutput() {
 		$field->html();
 	}
 
+	function testIsDisplayed() {
+		$field = new CMB_Text_Field( 'foo', 'Title', array( 1 ) );
+
+		wp_set_current_user( $this->users['admin'] );
+
+		// Test default value against default admin.
+		$this->assertTrue( $field->is_displayed() );
+
+		// Re-setup the field with some capability logic in there.
+		$field = new CMB_Text_Field( 'foo', 'Title', array( 1 ), array( 'capability' => 'edit_others_posts' ) );
+
+		// Should still return true for admin.
+		$this->assertTrue( $field->is_displayed() );
+
+		// Change to the author and test against our modified permission.
+		wp_set_current_user( $this->users['author'] );
+
+		$this->assertFalse( $field->is_displayed() );
+	}
+
 }

From f310ca9b9f00736c92867005fe033fcda52164bb Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Mon, 2 Jan 2017 15:48:40 +0100
Subject: [PATCH 028/148] Updated readme

---
 readme.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/readme.md b/readme.md
index 20cbdafe..11cbf285 100644
--- a/readme.md
+++ b/readme.md
@@ -56,6 +56,9 @@ See [CONTRIBUTING.md](https://github.com/humanmade/Custom-Meta-Boxes/blob/master
 
 ## Changelog ##
 
+**1.1**
+* Added `capapability` option to individual fields and groups
+
 **1.0.3**
 * Fix repeatable fields bugs (props @barryceelen )
 * Fix gmaps field bug where key doesn't pass in correctly (props: @shadyvb )

From 9360e743666a4e1330ef79bbc8eff3ca80c83a10 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Mon, 2 Jan 2017 15:54:50 +0100
Subject: [PATCH 029/148] Fixed metabox clsss checks

---
 tests/testCmbMetaBoxClass.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/testCmbMetaBoxClass.php b/tests/testCmbMetaBoxClass.php
index bf8b381b..59db3469 100644
--- a/tests/testCmbMetaBoxClass.php
+++ b/tests/testCmbMetaBoxClass.php
@@ -83,6 +83,9 @@ function setUp() {
 			)
 		);
 
+		// Assign an admin user as we now check that you have proper permissions before passing a field.
+		wp_set_current_user( $this->factory->user->create( [ 'role' => 'administrator' ] ) );
+
 	}
 
 	/**

From 06be5342b05350b40f6e660cf5666300ecb595e5 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Mon, 2 Jan 2017 16:05:03 +0100
Subject: [PATCH 030/148] Removed PHP5.4 array brackets from tests and fixed
 spelling error

---
 readme.md                     | 2 +-
 tests/testCmbMetaBoxClass.php | 2 +-
 tests/testField.php           | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/readme.md b/readme.md
index 11cbf285..ad66320f 100644
--- a/readme.md
+++ b/readme.md
@@ -57,7 +57,7 @@ See [CONTRIBUTING.md](https://github.com/humanmade/Custom-Meta-Boxes/blob/master
 ## Changelog ##
 
 **1.1**
-* Added `capapability` option to individual fields and groups
+* Added `capability` option to individual fields and groups
 
 **1.0.3**
 * Fix repeatable fields bugs (props @barryceelen )
diff --git a/tests/testCmbMetaBoxClass.php b/tests/testCmbMetaBoxClass.php
index 59db3469..1735a361 100644
--- a/tests/testCmbMetaBoxClass.php
+++ b/tests/testCmbMetaBoxClass.php
@@ -84,7 +84,7 @@ function setUp() {
 		);
 
 		// Assign an admin user as we now check that you have proper permissions before passing a field.
-		wp_set_current_user( $this->factory->user->create( [ 'role' => 'administrator' ] ) );
+		wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
 
 	}
 
diff --git a/tests/testField.php b/tests/testField.php
index eeb88f4e..8e116ae9 100644
--- a/tests/testField.php
+++ b/tests/testField.php
@@ -23,8 +23,8 @@ function setUp() {
 		$this->post = get_post( $id );
 
 		// Setup some users to test our display logic.
-		$this->users['admin'] = $this->factory->user->create( [ 'role' => 'administrator' ] );
-		$this->users['author'] = $this->factory->user->create( [ 'role' => 'author' ] );
+		$this->users['admin'] = $this->factory->user->create( array( 'role' => 'administrator' ) );
+		$this->users['author'] = $this->factory->user->create( array( 'role' => 'author' ) );
 
 	}
 

From 9d28d19f7ff711345ed649dc3b8ea482b396e5ff Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Mon, 2 Jan 2017 17:28:56 +0100
Subject: [PATCH 031/148] Fixed missing default values issues

---
 fields/class-cmb-checkbox-multi.php | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/fields/class-cmb-checkbox-multi.php b/fields/class-cmb-checkbox-multi.php
index e405eff3..0b2a17c4 100644
--- a/fields/class-cmb-checkbox-multi.php
+++ b/fields/class-cmb-checkbox-multi.php
@@ -85,7 +85,7 @@ public function html() {
 
 		foreach ( $this->args['options'] as $i => $label ) :
 
-			$value = $this->get_value();
+			$value = $this->get_values();
 			?>
 
 			<div class="cmb-checkbox-wrap">
@@ -107,4 +107,23 @@ public function html() {
 		<?php
 		endforeach;
 	}
+
+	/**
+	 * Get multiple values for the checkbox-multi field.
+	 *
+	 * @return array
+	 */
+	public function &get_values() {
+		if ( ! empty( current( $this->values ) ) || empty( $this->args['default'] ) ) {
+			return $this->values;
+		}
+
+		$new_values = array();
+
+		foreach( $this->args['default'] as $item ) {
+			$new_values[ 'item-' . $item ] = 'on';
+		}
+
+		return $new_values;
+	}
 }

From 12573623574499b20014e345471215a82786ae8e Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Tue, 3 Jan 2017 11:41:08 +0100
Subject: [PATCH 032/148] Fixed checkbox field default and added check method
 to determine whether we're on a new or existing object screen

---
 classes.fields.php                  | 23 +++++++++++++++++++++++
 example-functions.php               | 16 +++++++++++++++-
 fields/class-cmb-checkbox-multi.php | 16 ++++++----------
 3 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/classes.fields.php b/classes.fields.php
index 2a52a417..a1aa1c79 100644
--- a/classes.fields.php
+++ b/classes.fields.php
@@ -498,6 +498,29 @@ protected function delete_button_markup() {
 		</button>
 		<?php
 	}
+
+	/**
+	 * Determine whether we're creating a new object or on an existing object.
+	 *
+	 * This is used so that the plugin has some awareness of whether we're dealing with an
+	 * existing or new object. This is important for things like knowing whether or not to
+	 * load default values when populating a field view.
+	 *
+	 * @return bool|null True if is new, false if existing, and null if not in the admin.
+	 */
+	protected function is_new_object() {
+		if ( ! $screen = get_current_screen() || ! $screen->in_admin ) {
+			return null;
+		}
+
+		$id = $GLOBALS['hook_suffix'];
+		$id = ( '.php' == substr( $id, -4 ) ) ? substr( $id, 0, -4 ) : $id;
+		if ( 'post-new' === $id || 'link-add' === $id || 'media-new' === $id || 'user-new' === $id ) {
+			return true;
+		}
+
+		return false;
+	}
 }
 
 /**
diff --git a/example-functions.php b/example-functions.php
index 697a51b8..2de62703 100644
--- a/example-functions.php
+++ b/example-functions.php
@@ -29,7 +29,21 @@ function cmb_sample_metaboxes( array $meta_boxes ) {
 
 		array( 'id' => 'field-6',  'name' => 'Radio input field', 'type' => 'radio', 'options' => array( 'Option 1', 'Option 2' ) ),
 		array( 'id' => 'field-7a',  'name' => 'Checkbox field', 'type' => 'checkbox' ),
-		array( 'id' => 'field-7b',  'name' => 'Checkbox-Multi field', 'type' => 'checkbox_multi', 'options' => array( 'Option with a really long label', 'Option 1', 'Option 2', 'Option 3', 'Option 4' ) ),
+
+		// Checkbox Multi Field.
+		array(
+			'id' => 'field-7b',
+			'name' => 'Checkbox-Multi field',
+			'type' => 'checkbox_multi',
+			'default' => [ 'option1' ],
+			'options' => array(
+				'option0' => 'Option with a really long label',
+				'option1' => 'Option 1',
+				'option2' => 'Option 2',
+				'option3' => 'Option 3',
+				'option4' => 'Option 4',
+			)
+		),
 
 		array( 'id' => 'field-8',  'name' => 'WYSIWYG field', 'type' => 'wysiwyg', 'options' => array( 'editor_height' => '100' ), 'repeatable' => true, 'sortable' => true ),
 
diff --git a/fields/class-cmb-checkbox-multi.php b/fields/class-cmb-checkbox-multi.php
index 0b2a17c4..36660cd6 100644
--- a/fields/class-cmb-checkbox-multi.php
+++ b/fields/class-cmb-checkbox-multi.php
@@ -94,8 +94,8 @@ public function html() {
 					<?php $this->id_attr( 'item-' . $i ); ?>
 					<?php $this->boolean_attr(); ?>
 					<?php $this->class_attr(); ?>
-					<?php $this->name_attr( '[item-' . $i . ']' ); ?>
-					<?php checked( isset( $value[ 'item-' . $i ] ) ); ?>
+					<?php $this->name_attr( '[' . $i . ']' ); ?>
+					<?php checked( isset( $value[ $i ] ) ); ?>
 				/>
 
 				<label <?php $this->for_attr( 'item-' . $i ); ?>>
@@ -114,16 +114,12 @@ public function html() {
 	 * @return array
 	 */
 	public function &get_values() {
-		if ( ! empty( current( $this->values ) ) || empty( $this->args['default'] ) ) {
-			return $this->values;
-		}
 
-		$new_values = array();
-
-		foreach( $this->args['default'] as $item ) {
-			$new_values[ 'item-' . $item ] = 'on';
+		// We always want to fetch the existing (possibly empty) values if it's an existing object.
+		if ( ! $this->is_new_object() ) {
+			return $this->values;
 		}
 
-		return $new_values;
+		return array_flip( $this->args['default'] );
 	}
 }

From bec8864adfe42d384487f71bb19f6f97477435a0 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Tue, 3 Jan 2017 11:52:59 +0100
Subject: [PATCH 033/148] Fixed unit tests and fixed small bug in is_new_object

---
 classes.fields.php               |  3 ++-
 tests/testCheckboxMultiField.php | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/classes.fields.php b/classes.fields.php
index a1aa1c79..8d785033 100644
--- a/classes.fields.php
+++ b/classes.fields.php
@@ -509,7 +509,8 @@ protected function delete_button_markup() {
 	 * @return bool|null True if is new, false if existing, and null if not in the admin.
 	 */
 	protected function is_new_object() {
-		if ( ! $screen = get_current_screen() || ! $screen->in_admin ) {
+		$screen = get_current_screen();
+		if ( null === $screen || ! $screen->in_admin ) {
 			return null;
 		}
 
diff --git a/tests/testCheckboxMultiField.php b/tests/testCheckboxMultiField.php
index 40599972..fb6be4d2 100644
--- a/tests/testCheckboxMultiField.php
+++ b/tests/testCheckboxMultiField.php
@@ -49,13 +49,24 @@ function testEmptyFieldOutput() {
 			$this->markTestSkipped( 'Post not found' );
 		}
 
-		$this->expectOutputRegex( '/(type=\"checkbox\".*?id=\"foo-cmb-field-0-item-value\".*?checked=\"checked\")/s' );
+		$this->expectOutputRegex( '/(type=\"checkbox\".*?id=\"foo-cmb-field-0-item-value\".*?checked=\'checked\')/s' );
 
 		// Trigger output.
 		$field->html();
 	}
 
 	function testSavedFieldOutput() {
+		$field        = new CMB_Checkbox_Multi( 'foo', 'Foo', array( 'value' => 'value' ), array( 'options' => array( 'value' => 'value', 'value2' => 'value2' ) ) );
 
+		if ( ! $this->post ) {
+			$this->markTestSkipped( 'Post not found' );
+		}
+
+		$field->save( $this->post->ID, array( 'value2' => 'on' ) );
+
+		$this->expectOutputRegex( '/(type=\"checkbox\".*?id=\"foo-cmb-field-0-item-value2\".*?checked=\'checked\')/s' );
+
+		// Trigger output.
+		$field->html();
 	}
 }

From d5454dc58b3ccd462adeeccf841ff01544fa86a0 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Tue, 3 Jan 2017 13:03:12 +0100
Subject: [PATCH 034/148] Spread out field arrays and added all available
 options to the applicable fields for more complete documentations

---
 example-functions.php | 372 +++++++++++++++++++++++++++++++++++++-----
 1 file changed, 329 insertions(+), 43 deletions(-)

diff --git a/example-functions.php b/example-functions.php
index 3a19f88d..27c6d8da 100644
--- a/example-functions.php
+++ b/example-functions.php
@@ -17,48 +17,300 @@ function cmb_sample_metaboxes( array $meta_boxes ) {
 	/**
 	 * Example of all available fields.
 	 */
-
 	$fields = array(
 
-		array( 'id' => 'field-1',  'name' => 'Text input field', 'type' => 'text' ),
-		array( 'id' => 'field-2', 'name' => 'Read-only text input field', 'type' => 'text', 'readonly' => true, 'default' => 'READ ONLY' ),
-		array( 'id' => 'field-3', 'name' => 'Repeatable text input field', 'type' => 'text', 'desc' => 'Add up to 5 fields.', 'repeatable' => true, 'repeatable_max' => 5, 'sortable' => true ),
+		/*
+		 * Basic Text Field.
+		 */
+		array(
+			'id'   => 'field-1',
+			'name' => 'Text input field',
+			'type' => 'text',
+		),
+
+		/*
+		 * Text Field with all options.
+		 */
+		array(
+			// Required. ID of CMB value to be inserted into database.
+			'id'              => 'field-2',
+
+			// Required.Type of field to call.
+			'type'            => 'text',
+
+			// Optional. Title that will show above field.
+			'name'            => __( 'Name', 'cmb' ),
 
-		array( 'id' => 'field-4',  'name' => 'Small text input field', 'type' => 'text_small' ),
-		array( 'id' => 'field-5',  'name' => 'URL field', 'type' => 'url' ),
+			// Optional. Contextual information. Will display underneath field.
+			'desc'            => __( 'Repeatable', 'cmb' ),
 
-		array( 'id' => 'field-6',  'name' => 'Radio input field', 'type' => 'radio', 'options' => array( 'Option 1', 'Option 2' ) ),
-		array( 'id' => 'field-7',  'name' => 'Checkbox field', 'type' => 'checkbox' ),
+			// Optional. Whether field should be repeatable.
+			'repeatable'      => true,
 
-		array( 'id' => 'field-8',  'name' => 'WYSIWYG field', 'type' => 'wysiwyg', 'options' => array( 'editor_height' => '100' ), 'repeatable' => true, 'sortable' => true ),
+			// Optional. Maximum number of repetitions allowed.
+			'repeatable_max'  => 5,
 
-		array( 'id' => 'field-9',  'name' => 'Textarea field', 'type' => 'textarea' ),
-		array( 'id' => 'field-10',  'name' => 'Code textarea field', 'type' => 'textarea_code' ),
+			// Optional. Whether repeated instances should be sortable.
+			'sortable'        => true,
 
-		array( 'id' => 'field-11', 'name' => 'File field', 'type' => 'file', 'file_type' => 'image', 'repeatable' => 1, 'sortable' => 1 ),
-		array( 'id' => 'field-12', 'name' => 'Image upload field', 'type' => 'image', 'repeatable' => true, 'show_size' => true ),
+			// Optional. Don't display field label if set to false.
+			'show_label'      => false,
 
-		array( 'id' => 'field-13', 'name' => 'Select field', 'type' => 'select', 'options' => array( 'option-1' => 'Option 1', 'option-2' => 'Option 2', 'option-3' => 'Option 3' ), 'allow_none' => true, 'sortable' => true, 'repeatable' => true ),
-		array( 'id' => 'field-14', 'name' => 'Select field', 'type' => 'select', 'options' => array( 'option-1' => 'Option 1', 'option-2' => 'Option 2', 'option-3' => 'Option 3' ), 'multiple' => true ),
-		array( 'id' => 'field-15', 'name' => 'Select taxonomy field', 'type' => 'taxonomy_select',  'taxonomy' => 'category' ),
-		array( 'id' => 'field-15b', 'name' => 'Select taxonomy field', 'type' => 'taxonomy_select',  'taxonomy' => 'category',  'multiple' => true ),
-		array( 'id' => 'field-16', 'name' => 'Post select field', 'type' => 'post_select', 'use_ajax' => false, 'query' => array( 'cat' => 1 ) ),
-		array( 'id' => 'field-17', 'name' => 'Post select field (AJAX)', 'type' => 'post_select', 'use_ajax' => true ),
-		array( 'id' => 'field-17b', 'name' => 'Post select field (AJAX)', 'type' => 'post_select', 'use_ajax' => true, 'query' => array( 'posts_per_page' => 8 ), 'multiple' => true ),
+			// Optional. Make a filed uneditable by user but value will still be saved.
+			'readonly'        => false,
 
-		array( 'id' => 'field-18', 'name' => 'Date input field', 'type' => 'date' ),
-		array( 'id' => 'field-19', 'name' => 'Time input field', 'type' => 'time' ),
-		array( 'id' => 'field-20', 'name' => 'Date (unix) input field', 'type' => 'date_unix' ),
-		array( 'id' => 'field-21', 'name' => 'Date & Time (unix) input field', 'type' => 'datetime_unix' ),
+			// Optional. Make field uneditable by user and value will NOT be saved.
+			'disabled'        => false,
 
-		array( 'id' => 'field-22', 'name' => 'Color', 'type' => 'colorpicker' ),
+			// Optional. Default value for new posts.
+			'default'         => '',
+
+			// Optional. Number of columns field should take up out of 12.
+			'cols'            => '12',
+
+			// Optional. Add custom styles to field.
+			'style'           => '',
+
+			// Optional. Add custom CSS classes to field.
+			'class'           => '',
+
+			// Optional. Custom data callback for field.
+			'data_delegate'   => null,
+
+			// Optional. Custom save method for field.
+			'save_callback'   => null,
+		),
 
-		array( 'id' => 'field-23', 'name' => 'Location', 'type' => 'gmap', 'google_api_key' => '{CUSTOM_KEY}' ),
+		/*
+		 * Small Text Field.
+		 */
+		array(
+			'id'   => 'field-3',
+			'name' => 'Small text input field',
+			'type' => 'text_small',
+		),
+
+		/*
+		 * URL Field.
+		 */
+		array(
+			'id'   => 'field-4',
+			'name' => 'URL field',
+			'type' => 'url',
+		),
+
+		/*
+		 * Radio Input Field.
+		 */
+		array(
+			'id'      => 'field-5',
+			'name'    => 'Radio input field',
+			'type'    => 'radio',
+			'options' => array( // Options for individual radio inputs.
+				'Option 1',
+				'Option 2',
+			),
+		),
+
+		/*
+		 * Single Checkbox Field.
+		 */
+		array(
+			'id'    => 'field-6',
+			'name' => 'Checkbox field',
+			'type' => 'checkbox',
+		),
 
-		array( 'id' => 'field-24', 'name' => 'Title Field', 'type' => 'title' ),
+		/*
+		 * WYSIWYG (What You See is What You Get) TinyMCE Field.
+		 */
+		array(
+			'id'         => 'field-7',
+			'name'       => 'WYSIWYG field',
+			'type'       => 'wysiwyg',
+			'options'    => array( // Options to pass into TinyMCE instance.
+				'editor_height' => '100',
+			),
+		),
+
+		/*
+		 * Textarea Field.
+		 */
+		array(
+			'id'   => 'field-8',
+			'name' => 'Textarea field',
+			'type' => 'textarea',
+		),
+
+		/*
+		 * Textarea Code Field.
+		 */
+		array(
+			'id'   => 'field-9',
+			'name' => 'Code textarea field',
+			'type' => 'textarea_code',
+		),
+
+		/*
+		 * File Upload Field.
+		 */
+		array(
+			'id'           => 'field-10',
+			'name'         => 'File field',
+			'type'         => 'file',
+			'library-type' => array( // Optional. Type of media allowed [ 'audio', 'video', 'text', 'application' ].
+				'video',
+			),
+		),
+
+		/*
+		 * Image Upload Field.
+		 */
+		array(
+			'id'         => 'field-11',
+			'name'       => 'Image upload field',
+			'type'       => 'image',
+			'repeatable' => true,
+			'size'       => 'thumbnail', // Optional. Registered media size to display.
+			'show_size'  => true,        // Optional. Whether to show the image dimensions underneath image itself.
+		),
+
+		/*
+		 * Select Field.
+		 */
+		array(
+			'id'              => 'field-12',
+			'name'            => 'Select field',
+			'type'            => 'select',
+			'options'         => array(
+				'option-1' => 'Option 1',
+				'option-2' => 'Option 2',
+				'option-3' => 'Option 3',
+			),
+			'allow_none'      => true,    // Optional. Allow a user to not select any options.
+			'multiple'        => true,    // Optional. Allow multi-select.
+			'select2_options' => array(), // Optional. Array of options to pass to Select2.
+		),
+
+		/*
+		 * Select for Taxonomies Field.
+		 */
+		array(
+			'id'         => 'field-13',
+			'name'       => 'Select taxonomy field',
+			'type'       => 'taxonomy_select',
+			'taxonomy'   => 'category', // Required. Name of taxonomy to pull options from.
+			'hide_empty' => false,      // Optional. Whether to hide empty terms or not.
+			'multiple'   => true,       // Optional. Allow multi-select.
+
+		),
+
+		/*
+		 * Select for Posts Field.
+		 */
+		array(
+			'id'       => 'field-14',
+			'name'     => 'Post select field',
+			'type'     => 'post_select',
+			'use_ajax' => false,  // Optional. Use AJAX for instant results or load on pageload.
+			'multiple' => true,   // Optional. Allow multi-select.
+			'query'    => array(  // Optional. WP_Query options to pass through.
+				'cat' => 1,
+			),
+		),
+
+		/*
+		 * Basic Date Field.
+		 */
+		array(
+			'id'   => 'field-18',
+			'name' => 'Date input field',
+			'type' => 'date',
+		),
+
+		/*
+		 * Basic Time Field.
+		 */
+		array(
+			'id'    => 'field-19',
+			'name' => 'Time input field',
+			'type' => 'time',
+		),
+
+		/*
+		 * Date UNIX Field.
+		 */
+		array(
+			'id'   => 'field-20',
+			'name' => 'Date (unix) input field',
+			'type' => 'date_unix',
+		),
+
+		/*
+		 * Date & Time UNIX Field.
+		 */
+		array(
+			'id'   => 'field-21',
+			'name' => 'Date & Time (unix) input field',
+			'type' => 'datetime_unix',
+		),
+
+		/*
+		 * Colorpicker Field.
+		 */
+		array(
+			'id'   => 'field-22',
+			'name' => 'Color',
+			'type' => 'colorpicker',
+		),
+
+		/*
+		 * Google Map Field.
+		 */
+		array(
+			'id'                          => 'field-23',
+			'name'                        => 'Location',
+			'type'                        => 'gmap',
+
+			// Required. Pass a Google Maps API key. Alternatively, set with CMB_GAPI_KEY constant.
+			'google_api_key'              => '{CUSTOM_KEY}',
+
+			// Optional. Width of address input + map display.
+			'field_width'                 => '100%',
+
+			// Optional. Static height of address input + map display.
+			'field_height'                => '250px',
+
+			// Optional Default latitude for map to display on page load.
+			'default_lat'                 => '51.5073509',
+
+			// Optional. Default longitude for map to display on page load.
+			'default_long'                => '-0.12775829999998223',
+
+			// Optional. Default zoom for map to display on page load. 1 = Whole world, 20 = Individual buildings
+			'default_zoom'                => '8',
+
+			// Optional. Override Marker title text.
+			'string-marker-title'         => esc_html__( 'Drag to set the exact location', 'cmb' ),
+
+			// Optional. Override maps error message.
+			'string-gmaps-api-not-loaded' => esc_html__( 'Google Maps API not loaded.', 'cmb' ),
+		),
+
+		/*
+		 * Plain Title Field.
+		 */
+		array(
+			'id'   => 'field-24',
+			'name' => 'Title Field',
+			'type' => 'title',
+		),
 
 	);
 
+	/**
+	 * Metabox instantiation.
+	 */
 	$meta_boxes[] = array(
 		'title' => 'CMB Test - all fields',
 		'pages' => 'post',
@@ -68,35 +320,69 @@ function cmb_sample_metaboxes( array $meta_boxes ) {
 	/**
 	 * Examples of Groups and Columns.
 	 */
-
 	$groups_and_cols = array(
-		array( 'id' => 'gac-1',  'name' => 'Text input field', 'type' => 'text', 'cols' => 4 ),
-		array( 'id' => 'gac-2',  'name' => 'Text input field', 'type' => 'text', 'cols' => 4 ),
-		array( 'id' => 'gac-3',  'name' => 'Text input field', 'type' => 'text', 'cols' => 4 ),
+
+		array(
+			'id' => 'gac-1',
+			'name' => 'Text input field',
+			'type' => 'text',
+			'cols' => 4,
+		),
+
+		array(
+			'id' => 'gac-2',
+			'name' => 'Text input field',
+			'type' => 'text',
+			'cols' => 4,
+		),
+
+		array(
+			'id' => 'gac-3',
+			'name' => 'Text input field',
+			'type' => 'text',
+			'cols' => 4,
+		),
+
+		/**
+		 * Group within a Group.
+		 */
 		array(
 			'id'     => 'gac-4',
 			'name'   => 'Group (4 columns)',
 			'type'   => 'group',
 			'cols'   => 4,
 			'fields' => array(
-				array( 'id' => 'gac-4-f-1',  'name' => 'Textarea field', 'type' => 'textarea' ),
+				array(
+					'id' => 'gac-4-f-1',
+					'name' => 'Textarea field',
+					'type' => 'textarea',
+				),
 			),
 		),
+
 		array(
 			'id'     => 'gac-5',
 			'name'   => 'Group (8 columns)',
 			'type'   => 'group',
 			'cols'   => 8,
 			'fields' => array(
-				array( 'id' => 'gac-4-f-1',  'name' => 'Text input field', 'type' => 'text' ),
-				array( 'id' => 'gac-4-f-2',  'name' => 'Text input field', 'type' => 'text' ),
+				array(
+					'id' => 'gac-4-f-1',
+					'name' => 'Text input field',
+					'type' => 'text',
+				),
+				array(
+					'id' => 'gac-4-f-2',
+					'name' => 'Text input field',
+					'type' => 'text',
+				),
 			),
 		),
 	);
 
 	$meta_boxes[] = array(
-		'title' => 'Groups and Columns',
-		'pages' => 'post',
+		'title'  => 'Groups and Columns',
+		'pages'  => 'post',
 		'fields' => $groups_and_cols,
 	);
 
@@ -115,13 +401,13 @@ function cmb_sample_metaboxes( array $meta_boxes ) {
 		'pages' => 'post',
 		'fields' => array(
 			array(
-				'id' => 'gp',
-				'name' => 'My Repeatable Group',
-				'type' => 'group',
+				'id'         => 'gp',
+				'name'       => 'My Repeatable Group',
+				'type'       => 'group',
 				'repeatable' => true,
-				'sortable' => true,
-				'fields' => $group_fields,
-				'desc' => 'This is the group description.',
+				'sortable'   => true,
+				'fields'     => $group_fields,
+				'desc'       => 'This is the group description.',
 			),
 		),
 	);
@@ -129,4 +415,4 @@ function cmb_sample_metaboxes( array $meta_boxes ) {
 	return $meta_boxes;
 
 }
-add_filter( 'cmb_meta_boxes', 'cmb_sample_metaboxes' );
\ No newline at end of file
+add_filter( 'cmb_meta_boxes', 'cmb_sample_metaboxes' );

From 979e9e2886137e3ebb7b09fa8b6ed2ea335f3d9c Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Tue, 3 Jan 2017 13:07:43 +0100
Subject: [PATCH 035/148] Moved fields around to a more logical order and
 renamed IDs to not be numerical so that we do not have to reorder them every
 time that we add a field type

---
 example-functions.php | 208 +++++++++++++++++++++---------------------
 1 file changed, 104 insertions(+), 104 deletions(-)

diff --git a/example-functions.php b/example-functions.php
index 27c6d8da..31de1fae 100644
--- a/example-functions.php
+++ b/example-functions.php
@@ -23,7 +23,7 @@ function cmb_sample_metaboxes( array $meta_boxes ) {
 		 * Basic Text Field.
 		 */
 		array(
-			'id'   => 'field-1',
+			'id'   => 'field-text',
 			'name' => 'Text input field',
 			'type' => 'text',
 		),
@@ -85,77 +85,116 @@ function cmb_sample_metaboxes( array $meta_boxes ) {
 		 * Small Text Field.
 		 */
 		array(
-			'id'   => 'field-3',
+			'id'   => 'field-small-text',
 			'name' => 'Small text input field',
 			'type' => 'text_small',
 		),
 
 		/*
-		 * URL Field.
+		 * Single Checkbox Field.
 		 */
 		array(
-			'id'   => 'field-4',
-			'name' => 'URL field',
-			'type' => 'url',
+			'id'    => 'field-checkbox',
+			'name' => 'Checkbox field',
+			'type' => 'checkbox',
 		),
 
 		/*
-		 * Radio Input Field.
+		 * Colorpicker Field.
 		 */
 		array(
-			'id'      => 'field-5',
-			'name'    => 'Radio input field',
-			'type'    => 'radio',
-			'options' => array( // Options for individual radio inputs.
-				'Option 1',
-				'Option 2',
-			),
+			'id'   => 'field-colorpicker',
+			'name' => 'Color',
+			'type' => 'colorpicker',
 		),
 
 		/*
-		 * Single Checkbox Field.
+		 * Basic Date Field.
 		 */
 		array(
-			'id'    => 'field-6',
-			'name' => 'Checkbox field',
-			'type' => 'checkbox',
+			'id'   => 'field-date',
+			'name' => 'Date input field',
+			'type' => 'date',
 		),
 
 		/*
-		 * WYSIWYG (What You See is What You Get) TinyMCE Field.
+		 * Basic Time Field.
 		 */
 		array(
-			'id'         => 'field-7',
-			'name'       => 'WYSIWYG field',
-			'type'       => 'wysiwyg',
-			'options'    => array( // Options to pass into TinyMCE instance.
-				'editor_height' => '100',
-			),
+			'id'    => 'field-time',
+			'name' => 'Time input field',
+			'type' => 'time',
 		),
 
 		/*
-		 * Textarea Field.
+		 * Date UNIX Field.
 		 */
 		array(
-			'id'   => 'field-8',
-			'name' => 'Textarea field',
-			'type' => 'textarea',
+			'id'   => 'field-date-unix',
+			'name' => 'Date (unix) input field',
+			'type' => 'date_unix',
 		),
 
 		/*
-		 * Textarea Code Field.
+		 * Date & Time UNIX Field.
 		 */
 		array(
-			'id'   => 'field-9',
-			'name' => 'Code textarea field',
-			'type' => 'textarea_code',
+			'id'   => 'field-datetime-unix',
+			'name' => 'Date & Time (unix) input field',
+			'type' => 'datetime_unix',
+		),
+
+		/*
+		 * Google Map Field.
+		 */
+		array(
+			'id'                          => 'field-gmap',
+			'name'                        => 'Location',
+			'type'                        => 'gmap',
+
+			// Required. Pass a Google Maps API key. Alternatively, set with CMB_GAPI_KEY constant.
+			'google_api_key'              => '{CUSTOM_KEY}',
+
+			// Optional. Width of address input + map display.
+			'field_width'                 => '100%',
+
+			// Optional. Static height of address input + map display.
+			'field_height'                => '250px',
+
+			// Optional Default latitude for map to display on page load.
+			'default_lat'                 => '51.5073509',
+
+			// Optional. Default longitude for map to display on page load.
+			'default_long'                => '-0.12775829999998223',
+
+			// Optional. Default zoom for map to display on page load. 1 = Whole world, 20 = Individual buildings
+			'default_zoom'                => '8',
+
+			// Optional. Override Marker title text.
+			'string-marker-title'         => esc_html__( 'Drag to set the exact location', 'cmb' ),
+
+			// Optional. Override maps error message.
+			'string-gmaps-api-not-loaded' => esc_html__( 'Google Maps API not loaded.', 'cmb' ),
+		),
+
+		/*
+		 * Radio Input Field.
+		 */
+		array(
+			'id'      => 'field-radio',
+			'name'    => 'Radio input field',
+			'type'    => 'radio',
+			'options' => array( // Options for individual radio inputs.
+				'Option 1',
+				'Option 2',
+			),
 		),
 
 		/*
 		 * File Upload Field.
 		 */
 		array(
-			'id'           => 'field-10',
+			'id'           => 'field-file',
 			'name'         => 'File field',
 			'type'         => 'file',
 			'library-type' => array( // Optional. Type of media allowed [ 'audio', 'video', 'text', 'application' ].
@@ -164,10 +203,10 @@ function cmb_sample_metaboxes( array $meta_boxes ) {
 		),
 
 		/*
-		 * Image Upload Field.
+		 * File Image Upload Field.
 		 */
 		array(
-			'id'         => 'field-11',
+			'id'         => 'field-image',
 			'name'       => 'Image upload field',
 			'type'       => 'image',
 			'repeatable' => true,
@@ -179,7 +218,7 @@ function cmb_sample_metaboxes( array $meta_boxes ) {
 		 * Select Field.
 		 */
 		array(
-			'id'              => 'field-12',
+			'id'              => 'field-select',
 			'name'            => 'Select field',
 			'type'            => 'select',
 			'options'         => array(
@@ -196,7 +235,7 @@ function cmb_sample_metaboxes( array $meta_boxes ) {
 		 * Select for Taxonomies Field.
 		 */
 		array(
-			'id'         => 'field-13',
+			'id'         => 'field-select-for-taxonomies',
 			'name'       => 'Select taxonomy field',
 			'type'       => 'taxonomy_select',
 			'taxonomy'   => 'category', // Required. Name of taxonomy to pull options from.
@@ -209,7 +248,7 @@ function cmb_sample_metaboxes( array $meta_boxes ) {
 		 * Select for Posts Field.
 		 */
 		array(
-			'id'       => 'field-14',
+			'id'       => 'field-select-for-posts',
 			'name'     => 'Post select field',
 			'type'     => 'post_select',
 			'use_ajax' => false,  // Optional. Use AJAX for instant results or load on pageload.
@@ -220,90 +259,51 @@ function cmb_sample_metaboxes( array $meta_boxes ) {
 		),
 
 		/*
-		 * Basic Date Field.
-		 */
-		array(
-			'id'   => 'field-18',
-			'name' => 'Date input field',
-			'type' => 'date',
-		),
-
-		/*
-		 * Basic Time Field.
-		 */
-		array(
-			'id'    => 'field-19',
-			'name' => 'Time input field',
-			'type' => 'time',
-		),
-
-		/*
-		 * Date UNIX Field.
+		 * Plain Title Field.
 		 */
 		array(
-			'id'   => 'field-20',
-			'name' => 'Date (unix) input field',
-			'type' => 'date_unix',
+			'id'   => 'field-title',
+			'name' => 'Title Field',
+			'type' => 'title',
 		),
 
 		/*
-		 * Date & Time UNIX Field.
+		 * Textarea Field.
 		 */
 		array(
-			'id'   => 'field-21',
-			'name' => 'Date & Time (unix) input field',
-			'type' => 'datetime_unix',
+			'id'   => 'field-textarea',
+			'name' => 'Textarea field',
+			'type' => 'textarea',
 		),
 
 		/*
-		 * Colorpicker Field.
+		 * Textarea Code Field.
 		 */
 		array(
-			'id'   => 'field-22',
-			'name' => 'Color',
-			'type' => 'colorpicker',
+			'id'   => 'field-textarea-code',
+			'name' => 'Code textarea field',
+			'type' => 'textarea_code',
 		),
 
 		/*
-		 * Google Map Field.
+		 * WYSIWYG (What You See is What You Get) TinyMCE Field.
 		 */
 		array(
-			'id'                          => 'field-23',
-			'name'                        => 'Location',
-			'type'                        => 'gmap',
-
-			// Required. Pass a Google Maps API key. Alternatively, set with CMB_GAPI_KEY constant.
-			'google_api_key'              => '{CUSTOM_KEY}',
-
-			// Optional. Width of address input + map display.
-			'field_width'                 => '100%',
-
-			// Optional. Static height of address input + map display.
-			'field_height'                => '250px',
-
-			// Optional Default latitude for map to display on page load.
-			'default_lat'                 => '51.5073509',
-
-			// Optional. Default longitude for map to display on page load.
-			'default_long'                => '-0.12775829999998223',
-
-			// Optional. Default zoom for map to display on page load. 1 = Whole world, 20 = Individual buildings
-			'default_zoom'                => '8',
-
-			// Optional. Override Marker title text.
-			'string-marker-title'         => esc_html__( 'Drag to set the exact location', 'cmb' ),
-
-			// Optional. Override maps error message.
-			'string-gmaps-api-not-loaded' => esc_html__( 'Google Maps API not loaded.', 'cmb' ),
+			'id'         => 'field-wysiwyg',
+			'name'       => 'WYSIWYG field',
+			'type'       => 'wysiwyg',
+			'options'    => array( // Options to pass into TinyMCE instance.
+				'editor_height' => '100',
+			),
 		),
 
 		/*
-		 * Plain Title Field.
+		 * URL Field.
 		 */
 		array(
-			'id'   => 'field-24',
-			'name' => 'Title Field',
-			'type' => 'title',
+			'id'   => 'field-url',
+			'name' => 'URL field',
+			'type' => 'url',
 		),
 
 	);
@@ -323,21 +323,21 @@ function cmb_sample_metaboxes( array $meta_boxes ) {
 	$groups_and_cols = array(
 
 		array(
-			'id' => 'gac-1',
+			'id'   => 'gac-1',
 			'name' => 'Text input field',
 			'type' => 'text',
 			'cols' => 4,
 		),
 
 		array(
-			'id' => 'gac-2',
+			'id'   => 'gac-2',
 			'name' => 'Text input field',
 			'type' => 'text',
 			'cols' => 4,
 		),
 
 		array(
-			'id' => 'gac-3',
+			'id'   => 'gac-3',
 			'name' => 'Text input field',
 			'type' => 'text',
 			'cols' => 4,

From 401d1be3c62a94ab28525c586caa1d55424a79c9 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Tue, 3 Jan 2017 13:19:13 +0100
Subject: [PATCH 036/148] Tied sortable logic into repeatable field so that
 sortable cannot be triggered unless repeatable also is

---
 class.cmb-meta-box.php | 2 +-
 classes.fields.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/class.cmb-meta-box.php b/class.cmb-meta-box.php
index 06892bbf..a4f6f519 100644
--- a/class.cmb-meta-box.php
+++ b/class.cmb-meta-box.php
@@ -388,7 +388,7 @@ static function layout_fields( array $fields ) {
 					$classes[] = 'repeatable';
 				}
 
-				if ( ! empty( $field->args['sortable'] ) ) {
+				if ( ! empty( $field->args['sortable'] ) && ! empty( $field->args['repeatable'] ) ) {
 					$classes[] = 'cmb-sortable';
 				}
 
diff --git a/classes.fields.php b/classes.fields.php
index 556a0965..437d76eb 100644
--- a/classes.fields.php
+++ b/classes.fields.php
@@ -105,7 +105,7 @@ public function get_default_args() {
 	 */
 	public function enqueue_scripts() {
 
-		if ( isset( $this->args['sortable'] ) && $this->args['sortable'] ) {
+		if ( isset( $this->args['sortable'] ) && $this->args['sortable'] && $this->args['repeatable'] ) {
 			wp_enqueue_script( 'jquery-ui-sortable' );
 		}
 

From c5ae187e8cf7407b6efe8a3129333523bb3759c8 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Tue, 3 Jan 2017 14:08:15 +0100
Subject: [PATCH 037/148] Fixed default array value for repeatable fields

---
 classes.fields.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/classes.fields.php b/classes.fields.php
index 556a0965..d99f836b 100644
--- a/classes.fields.php
+++ b/classes.fields.php
@@ -419,11 +419,11 @@ public function description() {
 	 */
 	public function display() {
 
-		// If there are no values and it's not repeateble, we want to do one with empty string.
+		// If there are no values, we need to start with an empty string since we're foreaching through.
 		if ( ! $this->get_values() && ! $this->args['repeatable'] ) {
 			$values = array( '' );
 		} else {
-			$values = $this->get_values();
+			$values = ( empty( $this->get_values() ) ) ? array( '' ) : $this->get_values();
 		}
 
 		// Print title if necessary.
@@ -1914,6 +1914,8 @@ public function display() {
 
 		if ( ! $this->args['repeatable'] && empty( $values ) ) {
 			$values = array( null );
+		} else {
+			$values = ( empty( $this->get_values() ) ) ? array( '' ) : $this->get_values();
 		}
 
 		if ( $values ) {

From 4b858a6ec51b3dbddc61eac32650bec1dceaa7f6 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Tue, 3 Jan 2017 14:13:19 +0100
Subject: [PATCH 038/148] Added tests for basic field display that would have
 caught this issue

---
 tests/testField.php | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/tests/testField.php b/tests/testField.php
index fc5be6a0..1ef0c9d3 100644
--- a/tests/testField.php
+++ b/tests/testField.php
@@ -144,7 +144,6 @@ function testEmptyFieldOutput() {
 
 		// Trigger output.
 		$field->html();
-
 	}
 
 	function testSavedFieldOutput() {
@@ -163,4 +162,37 @@ function testSavedFieldOutput() {
 		$field->html();
 	}
 
+	/**
+	 * A single empty field should  display upon load.
+	 */
+	function testEmptyFieldDisplay() {
+		$field = new CMB_Text_Field( 'foo', 'Title', array( 1 ) );
+
+		if ( ! $this->post ) {
+			$this->markTestSkipped( 'Post not found' );
+		}
+
+		// Test empty output
+		$this->expectOutputRegex( '/(div class\=\"field-title\"\>.*?type=\"text\".*?id=\"foo-cmb-field-0\".*?value=\"1\")/s' );
+
+		// Trigger output.
+		$field->display();
+	}
+
+	/**
+	 * A single empty field should still display on repeatable fields upon load.
+	 */
+	function testEmptyFieldDisplayRepeatable() {
+		$field = new CMB_Text_Field( 'foo', 'Title', array(), array( 'repeatable' => true ) );
+
+		if ( ! $this->post ) {
+			$this->markTestSkipped( 'Post not found' );
+		}
+
+		// Test empty output
+		$this->expectOutputRegex( '/(div class\=\"field-title\"\>.*?type=\"text\".*?id=\"foo-cmb-field-0\".*?value=\"\")/s' );
+
+		// Trigger output.
+		$field->display();
+	}
 }

From c4b409008bda4d871547903ffbc791ad85b65310 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Tue, 3 Jan 2017 15:22:34 +0100
Subject: [PATCH 039/148] Fixed PHP5.4 and under issue

---
 classes.fields.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/classes.fields.php b/classes.fields.php
index d99f836b..b7774a61 100644
--- a/classes.fields.php
+++ b/classes.fields.php
@@ -423,7 +423,8 @@ public function display() {
 		if ( ! $this->get_values() && ! $this->args['repeatable'] ) {
 			$values = array( '' );
 		} else {
-			$values = ( empty( $this->get_values() ) ) ? array( '' ) : $this->get_values();
+			$values = $this->get_values(); // Make PHP5.4 >= happy.
+			$values = ( empty( $values ) ) ? array( '' ) : $values;
 		}
 
 		// Print title if necessary.

From 8d6d46f79ed24044b83e0ea5cd53168a14c6e620 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Tue, 3 Jan 2017 15:26:54 +0100
Subject: [PATCH 040/148] one. more. stupd. php5.4. array.

---
 tests/testField.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/testField.php b/tests/testField.php
index 8e116ae9..ee207cca 100644
--- a/tests/testField.php
+++ b/tests/testField.php
@@ -4,7 +4,7 @@ class FieldTestCase extends WP_UnitTestCase {
 
 	private $post;
 
-	private $users = [];
+	private $users = array();
 
 	function setUp() {
 

From 4154b1b056db8584c1a7e7bb34e3a31daf091041 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Tue, 3 Jan 2017 15:30:00 +0100
Subject: [PATCH 041/148] One more small issues

---
 classes.fields.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/classes.fields.php b/classes.fields.php
index b7774a61..541c6b04 100644
--- a/classes.fields.php
+++ b/classes.fields.php
@@ -1916,7 +1916,8 @@ public function display() {
 		if ( ! $this->args['repeatable'] && empty( $values ) ) {
 			$values = array( null );
 		} else {
-			$values = ( empty( $this->get_values() ) ) ? array( '' ) : $this->get_values();
+			$values = $this->get_values(); // Make PHP5.4 >= happy.
+			$values = ( empty( $values ) ) ? array( '' ) : $values;
 		}
 
 		if ( $values ) {

From ba564cda322fc5b6c106d6a8857c66a64b27394f Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Tue, 3 Jan 2017 15:52:55 +0100
Subject: [PATCH 042/148] Remove unnecessary WP builds to speed up the total
 build time

---
 .travis.yml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ab1afeaf..314aa7a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,20 @@ matrix:
     - php: hhvm
   fast_finish: true
   exclude:
-  # Only test latest version of WP with HHVM
+    # We really only need to verify that each PHP/WP combination works generally, not that multisite works between them
+    - php: 5.3
+      env: WP_VERSION=3.8 WP_MULTISITE=1
+    - php: 5.3
+      env: WP_VERSION=latest WP_MULTISITE=1
+    - php: 5.4
+      env: WP_VERSION=3.8 WP_MULTISITE=1
+    - php: 5.4
+      env: WP_VERSION=latest WP_MULTISITE=1
+    - php: 5.5
+      env: WP_VERSION=3.8 WP_MULTISITE=1
+    - php: 5.5
+      env: WP_VERSION=latest WP_MULTISITE=1
+    # Only test latest version of WP with HHVM
     - php: hhvm
       env: WP_VERSION=3.8 WP_MULTISITE=0
     - php: hhvm

From 2dd2bfaec6f1e584ab4dbd4c43a90aec7d690003 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Tue, 3 Jan 2017 16:35:17 +0100
Subject: [PATCH 043/148] Added an email field type

---
 css/dist/cmb.min.css             |  4 +--
 css/src/generic.css              |  3 +-
 custom-meta-boxes.php            |  2 ++
 fields/class-cmb-email-field.php | 28 +++++++++++++++++
 tests/testEmailField.php         | 53 ++++++++++++++++++++++++++++++++
 5 files changed, 87 insertions(+), 3 deletions(-)
 create mode 100644 fields/class-cmb-email-field.php
 create mode 100644 tests/testEmailField.php

diff --git a/css/dist/cmb.min.css b/css/dist/cmb.min.css
index 620f51ba..c4b5a511 100644
--- a/css/dist/cmb.min.css
+++ b/css/dist/cmb.min.css
@@ -1,6 +1,6 @@
 /**
- * Custom-Meta-Boxes - v1.0.1 - 2017-01-02
+ * Custom-Meta-Boxes - v1.0.1 - 2017-01-03
  * https://github.com/humanmade/Custom-Meta-Boxes/
  * Copyright (c) 2017 Human Made Limited; License: GPL-2.0+
  */
-.cmb_metabox .field{overflow:hidden;padding:16px 0}.postbox>.inside>.cmb_metabox{margin:-10px 0;padding:5px 5px 0}.cmb_metabox .cmb-row{overflow:hidden;position:relative;margin:0 -10px;zoom:1}.cmb_metabox .cmb-row:after,.cmb_metabox .cmb-row:before{content:"";display:table}.cmb_metabox .cmb-row:after{content:" ";position:absolute;clear:both;display:block;border-bottom:1px solid #DFDFDF;left:10px;right:10px;bottom:0}.cmb_metabox>.cmb-row:last-child{margin-bottom:-15px}.cmb_metabox>.cmb-row:last-child:after{display:none}.cmb_metabox [class*=cmb-cell-]{float:left;padding:0 10px;-moz-box-sizing:border-box;box-sizing:border-box}.cmb_metabox .cmb-cell-1{width:8.333333333%}.cmb_metabox .cmb-cell-2{width:16.666666667%}.cmb_metabox .cmb-cell-3{width:25%}.cmb_metabox .cmb-cell-4{width:33.333333333%}.cmb_metabox .cmb-cell-5{width:41.666666667%}.cmb_metabox .cmb-cell-6{width:50%}.cmb_metabox .cmb-cell-7{width:58.333333333%}.cmb_metabox .cmb-cell-8{width:66.666666667%}.cmb_metabox .cmb-cell-9{width:75%}.cmb_metabox .cmb-cell-10{width:83.333333333%}.cmb_metabox .cmb-cell-11{width:91.666666667%}.cmb_metabox .cmb-cell-12{width:100%}@media all and (max-width:850px){.cmb_metabox [class*=cmb-cell-]{width:100%}}@media all and (min-width:850px){.cmb_metabox [class*=cmb-cell-].cmb-has-label+.cmb-no-label{padding-top:32px}}.cmb_metabox .field-item{position:relative}.cmb_metabox_description{color:#AAA;font-style:italic;margin:0 0 16px!important}.cmb_metabox input[type=text],.cmb_metabox select,.cmb_metabox textarea{width:100%;margin:0}.cmb_metabox input.cmb_text_small{width:100px}.cmb_metabox input.cmb_text_medium{width:230px;margin-right:15px}.cmb_metabox input[type=checkbox],.cmb_metabox input[type=radio]{margin:0 5px 0 0;padding:0}.cmb_metabox .field-title{margin-bottom:16px;margin-top:0;font-weight:700}.cmb_metabox .field-title label{vertical-align:baseline}.cmb_metabox .select2-search-choice-close{-webkit-transition:none;transition:none;top:3px}.cmb_metabox [disabled]{background:#F7F7F7}.cmb_metabox .field.repeatable>.field-item{padding-right:30px;margin-bottom:10px}.cmb_metabox .repeat-field{display:block!important;clear:both}.CMB_Date_Field.repeatable .field-item,.CMB_Date_Timestamp_Field.repeatable .field-item,.CMB_Datetime_Timestamp_Field.repeatable .field-item,.CMB_Text_Small_Field.repeatable .field-item,.CMB_Time_Field.repeatable .field-item{float:left;clear:both}.cmb-delete-field{display:inline-block;text-decoration:none;font-size:11px;line-height:20px;height:22px;width:22px;margin:0;padding:0;cursor:pointer;border-width:1px;border-style:solid;-webkit-border-radius:3px;-webkit-appearance:none;border-radius:3px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;color:#555;border-color:#ccc;background:#f7f7f7;-webkit-box-shadow:inset 0 1px 0 #fff,0 1px 0 rgba(0,0,0,.08);box-shadow:inset 0 1px 0 #fff,0 1px 0 rgba(0,0,0,.08);vertical-align:top;position:absolute;top:3px;right:0;text-indent:100%;overflow:hidden;white-space:nowrap}.cmb-delete-field:active,.cmb-delete-field:focus,.cmb-delete-field:hover{background:#fafafa;border-color:#999;color:#222}.cmb-delete-field .cmb-delete-field-icon{content:' ';display:block;position:absolute;height:8px;width:8px;top:50%;left:50%;margin-top:-4px;margin-left:-4px;background-image:url( '../../images/cmb-icon-remove.png');background-repeat:no-repeat;text-indent:8px;overflow:hidden}@media only screen and (-webkit-min-device-pixel-ratio :1.5),only screen and (min-device-pixel-ratio :1.5){.cmb-delete-field .cmb-delete-field-icon{background-image:url( '../../images/cmb-icon-remove@2x.png');background-size:8px 8px}}.cmb-sortable>.field-item{padding-left:15px}.cmb-sortable .cmb-handle{height:100%;width:3px;position:absolute;top:0;left:0;background:0 0;cursor:move;border-left:3px solid #DFDFDF;border-right:3px solid #DFDFDF}.cmb-sortable .ui-sortable-helper{opacity:.75}.cmb-sortable .ui-sortable-helper:before{content:' ';position:absolute;width:100%;height:100%;top:-6px;left:-6px;background-color:#F8F8F8;border:1px solid #DEDEDE;padding:5px;z-index:-1}.cmb-sortable>.ui-sortable-placeholder{border:1px dashed #DDD!important;background:transparent!important;visibility:visible!important;margin-bottom:8px!important}.cmb_metabox .CMB_Group_Field>.field-title{font-size:20px;clear:left;color:#222;font-family:'Open Sans',sans-serif;font-weight:400;margin:8px 0}.cmb_metabox .CMB_Group_Field.repeatable>.field-title{margin-bottom:16px}.cmb_metabox .CMB_Group_Field.repeatable>.field-item{padding:30px 15px 0;margin-bottom:16px;border:1px solid #DDD;background:#FAFAFA;position:relative}.cmb_metabox .CMB_Group_Field.repeatable>.field-item:before{content:' ';display:block;position:absolute;top:0;left:0;right:0;height:33px;border-bottom:1px solid #DDD}.cmb_metabox .CMB_Group_Field.repeatable>.field-item>.cmb-delete-field{top:5px;right:5px;width:auto;text-indent:0;padding-left:24px;padding-right:8px;height:22px;line-height:20px;font-size:11px;z-index:1}.cmb_metabox .CMB_Group_Field.repeatable>.field-item>.cmb-delete-field .cmb-delete-field-icon{left:12px}.CMB_Group_Field.cmb-sortable>.field-item{position:relative;padding-top:30px}.CMB_Group_Field.cmb-sortable>.field-item>.cmb-handle{top:-1px;left:-1px;right:-1px;height:34px;width:auto;border:0;border-bottom:1px solid #DDD}.CMB_Group_Field.cmb-sortable>.field-item.ui-sortable-helper>.cmb-handle{padding:0 5px}.cmb_metabox .CMB_Group_Field.repeatable.cmb-sortable>.field-item:before{display:none!important}.CMB_Group_Field.cmb-sortable>.ui-sortable-placeholder{margin-bottom:16px!important}.CMB_Group_Field .cmb_metabox>.cmb-row:last-child{margin-bottom:0}.CMB_File_Field .field-item,.CMB_Image_Field .field-item{float:left;margin:0 16px 16px 0!important;text-align:center;padding:0!important;z-index:1}.cmb-file-wrap{position:relative;overflow:hidden;width:150px;height:150px;line-height:150px}.cmb-file-wrap-placeholder{content:' ';position:absolute;top:0;left:0;display:block;height:142px;width:142px;border:4px dashed #DDD;z-index:-1}.cmb-file-wrap-placeholder .dimensions{line-height:normal;position:absolute;bottom:10px;right:10px;font-size:18px;font-weight:700;opacity:.2}.cmb-file-holder{position:relative;overflow:hidden;box-shadow:inset 0 0 15px rgba(0,0,0,.1),inset 0 0 0 1px rgba(0,0,0,.05);background:#eee;width:100%;height:100%}.cmb-file-holder.type-file img{position:absolute;top:43%;margin-top:-30px;left:50%;margin-left:-23px}.cmb-file-holder.type-img img{width:100%;height:auto;margin-top:0;vertical-align:top}.cmb-file-holder.type-img::after{content:'';display:block;position:absolute;top:0;left:0;right:0;bottom:0;box-shadow:inset 0 0 0 1px rgba(0,0,0,.1);overflow:hidden;z-index:1}.cmb-file-name{position:absolute;left:0;right:0;bottom:0;line-height:1.4;overflow:hidden;max-height:100%;word-wrap:break-word;text-align:center;font-weight:700;background:rgba(255,255,255,.8);box-shadow:inset 0 0 0 1px rgba(0,0,0,.15)}.cmb-file-name strong{padding:5px 10px;display:block}.CMB_File_Field .cmb-delete-field,.CMB_Image_Field .cmb-delete-field{z-index:10;top:10px;right:10px}.CMB_File_Field .cmb-remove-file,.CMB_Image_Field .cmb-remove-file{position:absolute;z-index:1;top:5px;right:5px}.CMB_File_Field.repeatable .cmb-remove-file,.CMB_Image_Field.repeatable .cmb-remove-file{display:none!important}.cmb-file-wrap .cmb-file-upload{vertical-align:middle}.cmb-loading::before{content:' ';display:block;background:url( '../../images/wpspin.gif' ) no-repeat;width:16px;height:16px;position:absolute;top:50%;left:50%;margin-top:-8px;margin-left:-8px}@media only screen and (-webkit-min-device-pixel-ratio :1.5),only screen and (min-device-pixel-ratio :1.5){.cmb-loading::before{background-image:url( '../../images/wpspin-2x.gif');background-size:16px 16px}}.CMB_File_Field.cmb-sortable .cmb-handle,.CMB_Image_Field.cmb-sortable .cmb-handle{border:0;background:0 0;height:100%;width:100%;z-index:1}.CMB_File_Field.cmb-sortable .cmb-file-upload,.CMB_Image_Field.cmb-sortable .cmb-file-upload{position:relative;z-index:5}.CMB_File_Field.cmb-sortable .ui-sortable-helper:before,.CMB_Image_Field.cmb-sortable .ui-sortable-helper:before{top:0;left:0;padding:0;border:0;background:#F9F9F9}.CMB_Title .field-title{margin:8px 0!important}.CMB_Title{border-bottom:0;padding-bottom:0;margin-top:16px}.CMB_Title h2{margin:0!important;padding:0!important}.CMB_Color_Picker .field-item{float:left;clear:both}.CMB_Color_Picker:after,.CMB_Color_Picker:before{content:"";display:table}.CMB_Color_Picker:after{clear:both}.CMB_Color_Picker{zoom:1}div.time-picker{position:absolute;height:191px;width:4em;overflow:auto;background:#fff;border:1px solid #aaa;z-index:99;margin:0}div.time-picker-12hours{width:6em}div.time-picker ul{list-style-type:none;margin:0;padding:0}div.time-picker li{cursor:pointer;height:10px;font:12px/1 Helvetica,Arial,sans-serif;padding:4px 3px}div.time-picker li.selected{background:#0063CE;color:#fff}.cmb_metabox input.cmb_timepicker{width:100px;margin-right:0}.CMB_Datetime_Timestamp_Field input+input{margin-left:4px}.cmb_select{width:100%}.select2-offscreen{display:none}
\ No newline at end of file
+.cmb_metabox .field{overflow:hidden;padding:16px 0}.postbox>.inside>.cmb_metabox{margin:-10px 0;padding:5px 5px 0}.cmb_metabox .cmb-row{overflow:hidden;position:relative;margin:0 -10px;zoom:1}.cmb_metabox .cmb-row:after,.cmb_metabox .cmb-row:before{content:"";display:table}.cmb_metabox .cmb-row:after{content:" ";position:absolute;clear:both;display:block;border-bottom:1px solid #DFDFDF;left:10px;right:10px;bottom:0}.cmb_metabox>.cmb-row:last-child{margin-bottom:-15px}.cmb_metabox>.cmb-row:last-child:after{display:none}.cmb_metabox [class*=cmb-cell-]{float:left;padding:0 10px;-moz-box-sizing:border-box;box-sizing:border-box}.cmb_metabox .cmb-cell-1{width:8.333333333%}.cmb_metabox .cmb-cell-2{width:16.666666667%}.cmb_metabox .cmb-cell-3{width:25%}.cmb_metabox .cmb-cell-4{width:33.333333333%}.cmb_metabox .cmb-cell-5{width:41.666666667%}.cmb_metabox .cmb-cell-6{width:50%}.cmb_metabox .cmb-cell-7{width:58.333333333%}.cmb_metabox .cmb-cell-8{width:66.666666667%}.cmb_metabox .cmb-cell-9{width:75%}.cmb_metabox .cmb-cell-10{width:83.333333333%}.cmb_metabox .cmb-cell-11{width:91.666666667%}.cmb_metabox .cmb-cell-12{width:100%}@media all and (max-width:850px){.cmb_metabox [class*=cmb-cell-]{width:100%}}@media all and (min-width:850px){.cmb_metabox [class*=cmb-cell-].cmb-has-label+.cmb-no-label{padding-top:32px}}.cmb_metabox .field-item{position:relative}.cmb_metabox_description{color:#AAA;font-style:italic;margin:0 0 16px!important}.cmb_metabox input[type=email],.cmb_metabox input[type=text],.cmb_metabox select,.cmb_metabox textarea{width:100%;margin:0}.cmb_metabox input.cmb_text_small{width:100px}.cmb_metabox input.cmb_text_medium{width:230px;margin-right:15px}.cmb_metabox input[type=checkbox],.cmb_metabox input[type=radio]{margin:0 5px 0 0;padding:0}.cmb_metabox .field-title{margin-bottom:16px;margin-top:0;font-weight:700}.cmb_metabox .field-title label{vertical-align:baseline}.cmb_metabox .select2-search-choice-close{-webkit-transition:none;transition:none;top:3px}.cmb_metabox [disabled]{background:#F7F7F7}.cmb_metabox .field.repeatable>.field-item{padding-right:30px;margin-bottom:10px}.cmb_metabox .repeat-field{display:block!important;clear:both}.CMB_Date_Field.repeatable .field-item,.CMB_Date_Timestamp_Field.repeatable .field-item,.CMB_Datetime_Timestamp_Field.repeatable .field-item,.CMB_Text_Small_Field.repeatable .field-item,.CMB_Time_Field.repeatable .field-item{float:left;clear:both}.cmb-delete-field{display:inline-block;text-decoration:none;font-size:11px;line-height:20px;height:22px;width:22px;margin:0;padding:0;cursor:pointer;border-width:1px;border-style:solid;-webkit-border-radius:3px;-webkit-appearance:none;border-radius:3px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;color:#555;border-color:#ccc;background:#f7f7f7;-webkit-box-shadow:inset 0 1px 0 #fff,0 1px 0 rgba(0,0,0,.08);box-shadow:inset 0 1px 0 #fff,0 1px 0 rgba(0,0,0,.08);vertical-align:top;position:absolute;top:3px;right:0;text-indent:100%;overflow:hidden;white-space:nowrap}.cmb-delete-field:active,.cmb-delete-field:focus,.cmb-delete-field:hover{background:#fafafa;border-color:#999;color:#222}.cmb-delete-field .cmb-delete-field-icon{content:' ';display:block;position:absolute;height:8px;width:8px;top:50%;left:50%;margin-top:-4px;margin-left:-4px;background-image:url( '../../images/cmb-icon-remove.png');background-repeat:no-repeat;text-indent:8px;overflow:hidden}@media only screen and (-webkit-min-device-pixel-ratio :1.5),only screen and (min-device-pixel-ratio :1.5){.cmb-delete-field .cmb-delete-field-icon{background-image:url( '../../images/cmb-icon-remove@2x.png');background-size:8px 8px}}.cmb-sortable>.field-item{padding-left:15px}.cmb-sortable .cmb-handle{height:100%;width:3px;position:absolute;top:0;left:0;background:0 0;cursor:move;border-left:3px solid #DFDFDF;border-right:3px solid #DFDFDF}.cmb-sortable .ui-sortable-helper{opacity:.75}.cmb-sortable .ui-sortable-helper:before{content:' ';position:absolute;width:100%;height:100%;top:-6px;left:-6px;background-color:#F8F8F8;border:1px solid #DEDEDE;padding:5px;z-index:-1}.cmb-sortable>.ui-sortable-placeholder{border:1px dashed #DDD!important;background:transparent!important;visibility:visible!important;margin-bottom:8px!important}.cmb_metabox .CMB_Group_Field>.field-title{font-size:20px;clear:left;color:#222;font-family:'Open Sans',sans-serif;font-weight:400;margin:8px 0}.cmb_metabox .CMB_Group_Field.repeatable>.field-title{margin-bottom:16px}.cmb_metabox .CMB_Group_Field.repeatable>.field-item{padding:30px 15px 0;margin-bottom:16px;border:1px solid #DDD;background:#FAFAFA;position:relative}.cmb_metabox .CMB_Group_Field.repeatable>.field-item:before{content:' ';display:block;position:absolute;top:0;left:0;right:0;height:33px;border-bottom:1px solid #DDD}.cmb_metabox .CMB_Group_Field.repeatable>.field-item>.cmb-delete-field{top:5px;right:5px;width:auto;text-indent:0;padding-left:24px;padding-right:8px;height:22px;line-height:20px;font-size:11px;z-index:1}.cmb_metabox .CMB_Group_Field.repeatable>.field-item>.cmb-delete-field .cmb-delete-field-icon{left:12px}.CMB_Group_Field.cmb-sortable>.field-item{position:relative;padding-top:30px}.CMB_Group_Field.cmb-sortable>.field-item>.cmb-handle{top:-1px;left:-1px;right:-1px;height:34px;width:auto;border:0;border-bottom:1px solid #DDD}.CMB_Group_Field.cmb-sortable>.field-item.ui-sortable-helper>.cmb-handle{padding:0 5px}.cmb_metabox .CMB_Group_Field.repeatable.cmb-sortable>.field-item:before{display:none!important}.CMB_Group_Field.cmb-sortable>.ui-sortable-placeholder{margin-bottom:16px!important}.CMB_Group_Field .cmb_metabox>.cmb-row:last-child{margin-bottom:0}.CMB_File_Field .field-item,.CMB_Image_Field .field-item{float:left;margin:0 16px 16px 0!important;text-align:center;padding:0!important;z-index:1}.cmb-file-wrap{position:relative;overflow:hidden;width:150px;height:150px;line-height:150px}.cmb-file-wrap-placeholder{content:' ';position:absolute;top:0;left:0;display:block;height:142px;width:142px;border:4px dashed #DDD;z-index:-1}.cmb-file-wrap-placeholder .dimensions{line-height:normal;position:absolute;bottom:10px;right:10px;font-size:18px;font-weight:700;opacity:.2}.cmb-file-holder{position:relative;overflow:hidden;box-shadow:inset 0 0 15px rgba(0,0,0,.1),inset 0 0 0 1px rgba(0,0,0,.05);background:#eee;width:100%;height:100%}.cmb-file-holder.type-file img{position:absolute;top:43%;margin-top:-30px;left:50%;margin-left:-23px}.cmb-file-holder.type-img img{width:100%;height:auto;margin-top:0;vertical-align:top}.cmb-file-holder.type-img::after{content:'';display:block;position:absolute;top:0;left:0;right:0;bottom:0;box-shadow:inset 0 0 0 1px rgba(0,0,0,.1);overflow:hidden;z-index:1}.cmb-file-name{position:absolute;left:0;right:0;bottom:0;line-height:1.4;overflow:hidden;max-height:100%;word-wrap:break-word;text-align:center;font-weight:700;background:rgba(255,255,255,.8);box-shadow:inset 0 0 0 1px rgba(0,0,0,.15)}.cmb-file-name strong{padding:5px 10px;display:block}.CMB_File_Field .cmb-delete-field,.CMB_Image_Field .cmb-delete-field{z-index:10;top:10px;right:10px}.CMB_File_Field .cmb-remove-file,.CMB_Image_Field .cmb-remove-file{position:absolute;z-index:1;top:5px;right:5px}.CMB_File_Field.repeatable .cmb-remove-file,.CMB_Image_Field.repeatable .cmb-remove-file{display:none!important}.cmb-file-wrap .cmb-file-upload{vertical-align:middle}.cmb-loading::before{content:' ';display:block;background:url( '../../images/wpspin.gif' ) no-repeat;width:16px;height:16px;position:absolute;top:50%;left:50%;margin-top:-8px;margin-left:-8px}@media only screen and (-webkit-min-device-pixel-ratio :1.5),only screen and (min-device-pixel-ratio :1.5){.cmb-loading::before{background-image:url( '../../images/wpspin-2x.gif');background-size:16px 16px}}.CMB_File_Field.cmb-sortable .cmb-handle,.CMB_Image_Field.cmb-sortable .cmb-handle{border:0;background:0 0;height:100%;width:100%;z-index:1}.CMB_File_Field.cmb-sortable .cmb-file-upload,.CMB_Image_Field.cmb-sortable .cmb-file-upload{position:relative;z-index:5}.CMB_File_Field.cmb-sortable .ui-sortable-helper:before,.CMB_Image_Field.cmb-sortable .ui-sortable-helper:before{top:0;left:0;padding:0;border:0;background:#F9F9F9}.CMB_Title .field-title{margin:8px 0!important}.CMB_Title{border-bottom:0;padding-bottom:0;margin-top:16px}.CMB_Title h2{margin:0!important;padding:0!important}.CMB_Color_Picker .field-item{float:left;clear:both}.CMB_Color_Picker:after,.CMB_Color_Picker:before{content:"";display:table}.CMB_Color_Picker:after{clear:both}.CMB_Color_Picker{zoom:1}div.time-picker{position:absolute;height:191px;width:4em;overflow:auto;background:#fff;border:1px solid #aaa;z-index:99;margin:0}div.time-picker-12hours{width:6em}div.time-picker ul{list-style-type:none;margin:0;padding:0}div.time-picker li{cursor:pointer;height:10px;font:12px/1 Helvetica,Arial,sans-serif;padding:4px 3px}div.time-picker li.selected{background:#0063CE;color:#fff}.cmb_metabox input.cmb_timepicker{width:100px;margin-right:0}.CMB_Datetime_Timestamp_Field input+input{margin-left:4px}.cmb_select{width:100%}.select2-offscreen{display:none}
\ No newline at end of file
diff --git a/css/src/generic.css b/css/src/generic.css
index 4b26337c..63d86f7c 100644
--- a/css/src/generic.css
+++ b/css/src/generic.css
@@ -8,7 +8,8 @@
 	margin: 0 0 16px !important;
 }
 
-.cmb_metabox input[type=text], 
+.cmb_metabox input[type=text],
+.cmb_metabox input[type=email],
 .cmb_metabox textarea, 
 .cmb_metabox select { 
 	width: 100%;
diff --git a/custom-meta-boxes.php b/custom-meta-boxes.php
index 959cfbc9..68f47a48 100755
--- a/custom-meta-boxes.php
+++ b/custom-meta-boxes.php
@@ -39,6 +39,7 @@
  */
 include_once( CMB_PATH . '/classes.fields.php' );
 include_once( CMB_PATH . '/class.cmb-meta-box.php' );
+include_once( CMB_PATH . 'fields/class-cmb-email-field.php' );
 
 /**
  * Make it possible to add fields in locations other than post edit screen. Optional.
@@ -94,6 +95,7 @@ function _cmb_available_fields() {
 		'text'				=> 'CMB_Text_Field',
 		'text_small' 		=> 'CMB_Text_Small_Field',
 		'text_url'			=> 'CMB_URL_Field',
+		'email'             => 'CMB_Email_Field',
 		'url'				=> 'CMB_URL_Field',
 		'radio'				=> 'CMB_Radio_Field',
 		'checkbox'			=> 'CMB_Checkbox',
diff --git a/fields/class-cmb-email-field.php b/fields/class-cmb-email-field.php
new file mode 100644
index 00000000..a764530f
--- /dev/null
+++ b/fields/class-cmb-email-field.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mike
+ * Date: 1/3/17
+ * Time: 4:07 PM
+ */
+
+/**
+ * Standard text meta box for an email.
+ *
+ * @since 1.1.0
+ *
+ * @extends CMB_Field
+ */
+class CMB_Email_Field extends CMB_Field {
+
+	/**
+	 * Print out field HTML.
+	 */
+	public function html() {
+		?>
+
+		<input type="email" <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr( 'cmb_email code' ); ?> <?php $this->name_attr(); ?> value="<?php echo esc_attr( $this->get_value() ); ?>" />
+
+		<?php
+	}
+}
\ No newline at end of file
diff --git a/tests/testEmailField.php b/tests/testEmailField.php
new file mode 100644
index 00000000..a0444057
--- /dev/null
+++ b/tests/testEmailField.php
@@ -0,0 +1,53 @@
+<?php
+
+class EmailFieldTestCase extends WP_UnitTestCase {
+
+	  function setUp() {
+		  parent::setUp();
+
+		  $args = array(
+			  'post_author'  => 1,
+			  'post_status'  => 'publish',
+			  'post_content' => rand_str(),
+			  'post_title'   => rand_str(),
+			  'post_type'    => 'post',
+		  );
+
+		  $id = wp_insert_post( $args );
+
+		  $this->post = get_post( $id );
+	  }
+
+	  function tearDown() {
+		  wp_delete_post( $this->post->ID, true );
+		  unset( $this->post );
+		  parent::tearDown();
+	  }
+
+	  function testSaveValue() {
+		  $value = array( 'value' );
+		  $field = new CMB_Email_Field( 'foo', 'Foo', $value );
+
+		  if ( ! $this->post ) {
+			  $this->markTestSkipped( 'Post not found' );
+		  }
+
+		  $field->save( $this->post->ID, $value );
+
+		  // Verify single value is properly saved.
+		  $this->assertEquals( get_post_meta( $this->post->ID, 'foo', false ), $value );
+	  }
+
+	  function testFieldOutput() {
+		  $field        = new CMB_Email_Field( 'foo', 'Foo', array( 'hm@hmn.md' ) );
+
+		  if ( ! $this->post ) {
+			  $this->markTestSkipped( 'Post not found' );
+		  }
+
+		  $this->expectOutputRegex( '/(type=\"email\".*?id=\"foo-cmb-field-0\".*?value=\"hm@hmn.md\")/s' );
+
+		  // Trigger output.
+		  $field->html();
+	  }
+  }
\ No newline at end of file

From be458fc615d196bd4d8ca187a475101349a18b63 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Tue, 3 Jan 2017 16:42:12 +0100
Subject: [PATCH 044/148] File doc blocks

---
 fields/class-cmb-email-field.php | 8 ++++----
 tests/testEmailField.php         | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/fields/class-cmb-email-field.php b/fields/class-cmb-email-field.php
index a764530f..2d1e598b 100644
--- a/fields/class-cmb-email-field.php
+++ b/fields/class-cmb-email-field.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: mike
- * Date: 1/3/17
- * Time: 4:07 PM
+ * Email field type.
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
  */
 
 /**
diff --git a/tests/testEmailField.php b/tests/testEmailField.php
index a0444057..530cc305 100644
--- a/tests/testEmailField.php
+++ b/tests/testEmailField.php
@@ -1,4 +1,10 @@
 <?php
+/**
+ * Tests for the email field type.
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
 
 class EmailFieldTestCase extends WP_UnitTestCase {
 

From e53f007bce553a1a4c79cee9aad953f1b44a465a Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Tue, 3 Jan 2017 16:50:07 +0100
Subject: [PATCH 045/148] Final CS sweep - also fixed issues in other test
 files

---
 fields/class-cmb-email-field.php |  2 +-
 tests/testCmbMetaBoxClass.php    | 26 ++++++-----
 tests/testEmailField.php         | 74 ++++++++++++++++----------------
 tests/testField.php              |  1 -
 4 files changed, 53 insertions(+), 50 deletions(-)

diff --git a/fields/class-cmb-email-field.php b/fields/class-cmb-email-field.php
index 2d1e598b..f56e9a97 100644
--- a/fields/class-cmb-email-field.php
+++ b/fields/class-cmb-email-field.php
@@ -25,4 +25,4 @@ public function html() {
 
 		<?php
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/testCmbMetaBoxClass.php b/tests/testCmbMetaBoxClass.php
index bf8b381b..6b8ac731 100644
--- a/tests/testCmbMetaBoxClass.php
+++ b/tests/testCmbMetaBoxClass.php
@@ -56,7 +56,7 @@ function setUp() {
 					'type'       => 'text',
 					'repeatable' => false,
 				),
-			)
+			),
 		);
 
 		$this->group_fields = array(
@@ -80,7 +80,7 @@ function setUp() {
 						),
 					),
 				),
-			)
+			),
 		);
 
 	}
@@ -121,10 +121,12 @@ function test_values_from_init_repeatable() {
 
 	function test_values_from_init_group_non_repeatable() {
 
-		$values = array( array(
-			'text'  => array( 'one', 'two', 'three' ),
-			'text2' => array( 'four', 'five', 'six' ),
-		) );
+		$values = array(
+			array(
+				'text'  => array( 'one', 'two', 'three' ),
+				'text2' => array( 'four', 'five', 'six' ),
+			)
+		);
 
 		$field = $this->intialize_fields( $this->group_fields, $values );
 
@@ -139,10 +141,12 @@ function test_values_from_init_group_repeatable() {
 		$this->group_fields['fields'][0]['fields'][0]['repeatable'] = true;
 		$this->group_fields['fields'][0]['fields'][1]['repeatable'] = true;
 
-		$values = array( array(
-			'text'  => array( 'one', 'two', 'three' ),
-			'text2' => array( 'four', 'five', 'six' ),
-		) );
+		$values = array(
+			array(
+				'text'  => array( 'one', 'two', 'three' ),
+				'text2' => array( 'four', 'five', 'six' ),
+			),
+		);
 
 		$field = $this->intialize_fields( $this->group_fields, $values );
 
@@ -153,7 +157,7 @@ function test_values_from_init_group_repeatable() {
 				array(
 					'text' => array( 'one', 'two', 'three' ),
 					'text2' => array( 'four', 'five', 'six' ),
-				)
+				),
 			),
 			$field->values
 		);
diff --git a/tests/testEmailField.php b/tests/testEmailField.php
index 530cc305..7f92be47 100644
--- a/tests/testEmailField.php
+++ b/tests/testEmailField.php
@@ -8,52 +8,52 @@
 
 class EmailFieldTestCase extends WP_UnitTestCase {
 
-	  function setUp() {
-		  parent::setUp();
+	function setUp() {
+		parent::setUp();
 
-		  $args = array(
-			  'post_author'  => 1,
-			  'post_status'  => 'publish',
-			  'post_content' => rand_str(),
-			  'post_title'   => rand_str(),
-			  'post_type'    => 'post',
-		  );
+		$args = array(
+			'post_author'  => 1,
+			'post_status'  => 'publish',
+			'post_content' => rand_str(),
+			'post_title'   => rand_str(),
+			'post_type'    => 'post',
+		);
 
-		  $id = wp_insert_post( $args );
+		$id = wp_insert_post( $args );
 
-		  $this->post = get_post( $id );
-	  }
+		$this->post = get_post( $id );
+	}
 
-	  function tearDown() {
-		  wp_delete_post( $this->post->ID, true );
-		  unset( $this->post );
-		  parent::tearDown();
-	  }
+	function tearDown() {
+		wp_delete_post( $this->post->ID, true );
+		unset( $this->post );
+		parent::tearDown();
+	}
 
-	  function testSaveValue() {
-		  $value = array( 'value' );
-		  $field = new CMB_Email_Field( 'foo', 'Foo', $value );
+	function testSaveValue() {
+		$value = array( 'hm@hmn.md' );
+		$field = new CMB_Email_Field( 'foo', 'Foo', $value );
 
-		  if ( ! $this->post ) {
-			  $this->markTestSkipped( 'Post not found' );
-		  }
+		if ( ! $this->post ) {
+			$this->markTestSkipped( 'Post not found' );
+		}
 
-		  $field->save( $this->post->ID, $value );
+		$field->save( $this->post->ID, $value );
 
-		  // Verify single value is properly saved.
-		  $this->assertEquals( get_post_meta( $this->post->ID, 'foo', false ), $value );
-	  }
+		// Verify single value is properly saved.
+		$this->assertEquals( get_post_meta( $this->post->ID, 'foo', false ), $value );
+	}
 
-	  function testFieldOutput() {
-		  $field        = new CMB_Email_Field( 'foo', 'Foo', array( 'hm@hmn.md' ) );
+	function testFieldOutput() {
+		$field        = new CMB_Email_Field( 'foo', 'Foo', array( 'hm@hmn.md' ) );
 
-		  if ( ! $this->post ) {
-			  $this->markTestSkipped( 'Post not found' );
-		  }
+		if ( ! $this->post ) {
+			$this->markTestSkipped( 'Post not found' );
+		}
 
-		  $this->expectOutputRegex( '/(type=\"email\".*?id=\"foo-cmb-field-0\".*?value=\"hm@hmn.md\")/s' );
+		$this->expectOutputRegex( '/(type=\"email\".*?id=\"foo-cmb-field-0\".*?value=\"hm@hmn.md\")/s' );
 
-		  // Trigger output.
-		  $field->html();
-	  }
-  }
\ No newline at end of file
+		// Trigger output.
+		$field->html();
+	}
+}
diff --git a/tests/testField.php b/tests/testField.php
index fc5be6a0..d984fa5b 100644
--- a/tests/testField.php
+++ b/tests/testField.php
@@ -162,5 +162,4 @@ function testSavedFieldOutput() {
 		// Trigger output.
 		$field->html();
 	}
-
 }

From a42c3dc912e292355803ae1115c42b8dc39f0ec9 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Wed, 4 Jan 2017 13:19:34 +0100
Subject: [PATCH 046/148] Added basic filters to our attribute calls to make
 modifications easier

---
 classes.fields.php | 52 ++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 48 insertions(+), 4 deletions(-)

diff --git a/classes.fields.php b/classes.fields.php
index 556a0965..d2d673bb 100644
--- a/classes.fields.php
+++ b/classes.fields.php
@@ -128,7 +128,15 @@ public function enqueue_styles() {}
 	 */
 	public function id_attr( $append = null ) {
 
-		printf( 'id="%s"', esc_attr( $this->get_the_id_attr( $append ) ) );
+		/**
+		 * Modify the id attribute of a field.
+		 *
+		 * @param string $id ID Attribute
+		 * @param array $args Arguments for this particular field.
+		 */
+		$id = apply_filters( 'cmb_field_id_attribute', $this->get_the_id_attr( $append ), $this->args );
+
+		printf( 'id="%s"', esc_attr( $id ) );
 
 	}
 
@@ -174,7 +182,15 @@ public function get_the_id_attr( $append = null ) {
 	 */
 	public function for_attr( $append = null ) {
 
-		printf( 'for="%s"', esc_attr( $this->get_the_id_attr( $append ) ) );
+		/**
+		 * Modify the for attribute of a field.
+		 *
+		 * @param string $for For attribute
+		 * @param array $args Arguments for this particular field.
+		 */
+		$for = apply_filters( 'cmb_field_for_attribute', $this->get_the_id_attr( $append ), $this->args );
+
+		printf( 'for="%s"', esc_attr( $for ) );
 
 	}
 
@@ -187,7 +203,15 @@ public function for_attr( $append = null ) {
 	 */
 	public function name_attr( $append = null ) {
 
-		printf( 'name="%s"', esc_attr( $this->get_the_name_attr( $append ) ) );
+		/**
+		 * Modify the name attribute of a field.
+		 *
+		 * @param string $name Name attribute
+		 * @param array $args Arguments for this particular field.
+		 */
+		$name = apply_filters( 'cmb_field_name_attribute', $this->get_the_name_attr( $append ), $this->args );
+
+		printf( 'name="%s"', esc_attr( $name ) );
 
 	}
 
@@ -223,7 +247,19 @@ public function get_the_name_attr( $append = null ) {
 	 */
 	public function class_attr( $classes = '' ) {
 
-		if ( $classes = implode( ' ', array_map( 'sanitize_html_class', array_filter( array_unique( explode( ' ', $classes . ' ' . $this->args['class'] ) ) ) ) ) ) { ?>
+		// Combine any passed-in classes and the ones defined in the arguments and sanitize them.
+		$all_classes = array_unique( explode( ' ', $classes . ' ' . $this->args['class'] ) );
+		$classes     = array_map( 'sanitize_html_class', $all_classes );
+
+		/**
+		 * Modify the classes assigned to a field.
+		 *
+		 * @param array $classes Classes currently assigned to the field
+		 * @param array $args Arguments for this particular field.
+		 */
+		$classes = apply_filters( 'cmb_field_classes', $classes, $this->args );
+
+		if ( $classes = implode( ' ', $classes ) ) { ?>
 
 			class="<?php echo esc_attr( $classes ); ?>"
 
@@ -261,6 +297,14 @@ public function boolean_attr( $attrs = array() ) {
 
 		$attrs = array_filter( array_unique( $attrs ) );
 
+		/**
+		 * Modify any boolean attributes assigned to a field.
+		 *
+		 * @param array $attrs Boolean attributes.
+		 * @param array $args Arguments for this particular field.
+		 */
+		$attrs = apply_filters( 'cmb_field_boolean_attributes', $attrs, $this->args );
+
 		foreach ( $attrs as $attr ) {
 			echo esc_html( $attr ) . '="' . esc_attr( $attr ) . '"';
 		}

From 5a430e5f4eaff88c408efd97b986d6ce0602c582 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@gmail.com>
Date: Wed, 4 Jan 2017 13:53:08 +0100
Subject: [PATCH 047/148] Made is_metabox_displayed into a filterable value
 instead of stacking the functions one on top of the other

---
 class.cmb-meta-box.php | 79 ++++++++++++++++++++++++++++--------------
 1 file changed, 53 insertions(+), 26 deletions(-)

diff --git a/class.cmb-meta-box.php b/class.cmb-meta-box.php
index 06892bbf..5319cefa 100644
--- a/class.cmb-meta-box.php
+++ b/class.cmb-meta-box.php
@@ -56,6 +56,11 @@ function __construct( $meta_box ) {
 		add_action( 'admin_enqueue_scripts', array( &$this, 'enqueue_scripts' ) );
 		add_action( 'admin_enqueue_scripts', array( &$this, 'enqueue_styles' ) );
 
+		// Default filters for whether to show a metabox block or not.
+		add_filter( 'cmb_is_metabox_displayed', array( $this, 'add_for_id' ), 2, 2 );
+		add_filter( 'cmb_is_metabox_displayed', array( $this, 'hide_for_id' ), 3, 2 );
+		add_filter( 'cmb_is_metabox_displayed', array( $this, 'add_for_page_template' ), 4, 2 );
+		add_filter( 'cmb_is_metabox_displayed', array( $this, 'hide_for_page_template' ), 5, 2 );
 	}
 
 	/**
@@ -207,12 +212,14 @@ function add() {
 	 * a CMB field collection.
 	 */
 	function is_metabox_displayed() {
-		$display = true;
-		$display = $this->add_for_id( $display );
-		$display = $this->hide_for_id( $display );
-		$display = $this->add_for_page_template( $display );
-		$display = $this->hide_for_page_template( $display );
-		return $display;
+
+		/**
+		 * Filter whether a metabox should be displayed or not.
+		 *
+		 * @param bool $is_displayed Current status of display
+		 * @param array $metabox Metabox information
+		 */
+		return apply_filters( 'cmb_is_metabox_displayed', true, $this->_meta_box );
 	}
 
 	/**
@@ -220,12 +227,17 @@ function is_metabox_displayed() {
 	 *
 	 * Only works for field collections that have the 'show_on' attribute of 'id'.
 	 *
-	 * @param bool $display Current display status.
+	 * @param bool  $display Current display status.
+	 * @param array $field Field arguments.
 	 * @return bool (Potentially) modified display status
 	 */
-	function add_for_id( $display ) {
+	function add_for_id( $display, $field = [] ) {
+
+		if ( empty( $field ) ) {
+			$field = $this->_meta_box;
+		}
 
-		if ( ! isset( $this->_meta_box['show_on']['id'] ) ) {
+		if ( ! isset( $field['show_on']['id'] ) ) {
 			return $display;
 		}
 
@@ -237,9 +249,9 @@ function add_for_id( $display ) {
 		}
 
 		// If value isn't an array, turn it into one.
-		$this->_meta_box['show_on']['id'] = ! is_array( $this->_meta_box['show_on']['id'] ) ? array( $this->_meta_box['show_on']['id'] ) : $this->_meta_box['show_on']['id'];
+		$field['show_on']['id'] = ! is_array( $field['show_on']['id'] ) ? array( $field['show_on']['id'] ) : $field['show_on']['id'];
 
-		return in_array( $post_id, $this->_meta_box['show_on']['id'] );
+		return in_array( $post_id, $field['show_on']['id'] );
 
 	}
 
@@ -248,12 +260,17 @@ function add_for_id( $display ) {
 	 *
 	 * Only works for field collections that have the 'hide_on' attribute of 'id'.
 	 *
-	 * @param bool $display Current display status.
+	 * @param bool  $display Current display status.
+	 * @param array $field Field arguments.
 	 * @return bool (Potentially) modified display status
 	 */
-	function hide_for_id( $display ) {
+	function hide_for_id( $display, $field = [] ) {
+
+		if ( empty( $field ) ) {
+			$field = $this->_meta_box;
+		}
 
-		if ( ! isset( $this->_meta_box['hide_on']['id'] ) ) {
+		if ( ! isset( $field['hide_on']['id'] ) ) {
 			return $display;
 		}
 
@@ -264,9 +281,9 @@ function hide_for_id( $display ) {
 		}
 
 		// If value isn't an array, turn it into one.
-		$this->_meta_box['hide_on']['id'] = ! is_array( $this->_meta_box['hide_on']['id'] ) ? array( $this->_meta_box['hide_on']['id'] ) : $this->_meta_box['hide_on']['id'];
+		$field['hide_on']['id'] = ! is_array( $field['hide_on']['id'] ) ? array( $field['hide_on']['id'] ) : $field['hide_on']['id'];
 
-		return ! in_array( $post_id, $this->_meta_box['hide_on']['id'] );
+		return ! in_array( $post_id, $field['hide_on']['id'] );
 
 	}
 
@@ -275,12 +292,17 @@ function hide_for_id( $display ) {
 	 *
 	 * Only works for field collections that have the 'show_on' attribute of 'page-template'.
 	 *
-	 * @param bool $display Current display status.
+	 * @param bool  $display Current display status.
+	 * @param array $field Field arguments.
 	 * @return bool (Potentially) modified display status
 	 */
-	function add_for_page_template( $display ) {
+	function add_for_page_template( $display, $field = [] ) {
 
-		if ( ! isset( $this->_meta_box['show_on']['page-template'] ) ) {
+		if ( empty( $field ) ) {
+			$field = $this->_meta_box;
+		}
+
+		if ( ! isset( $field['show_on']['page-template'] ) ) {
 			return $display;
 		}
 
@@ -294,9 +316,9 @@ function add_for_page_template( $display ) {
 		$current_template = get_post_meta( $post_id, '_wp_page_template', true );
 
 		// If value isn't an array, turn it into one.
-		$this->_meta_box['show_on']['page-template'] = ! is_array( $this->_meta_box['show_on']['page-template'] ) ? array( $this->_meta_box['show_on']['page-template'] ) : $this->_meta_box['show_on']['page-template'];
+		$field['show_on']['page-template'] = ! is_array( $field['show_on']['page-template'] ) ? array( $field['show_on']['page-template'] ) : $field['show_on']['page-template'];
 
-		return in_array( $current_template, $this->_meta_box['show_on']['page-template'] );
+		return in_array( $current_template, $field['show_on']['page-template'] );
 
 	}
 
@@ -305,12 +327,17 @@ function add_for_page_template( $display ) {
 	 *
 	 * Only works for field collections that have the 'hide_on' attribute of 'page-template'.
 	 *
-	 * @param bool $display Current display status.
+	 * @param bool  $display Current display status.
+	 * @param array $field Field arguments.
 	 * @return bool (Potentially) modified display status
 	 */
-	function hide_for_page_template( $display ) {
+	function hide_for_page_template( $display, $field = [] ) {
+
+		if ( empty( $field ) ) {
+			$field = $this->_meta_box;
+		}
 
-		if ( ! isset( $this->_meta_box['hide_on']['page-template'] ) ) {
+		if ( ! isset( $field['hide_on']['page-template'] ) ) {
 			return $display;
 		}
 
@@ -325,9 +352,9 @@ function hide_for_page_template( $display ) {
 		$current_template = get_post_meta( $post_id, '_wp_page_template', true );
 
 		// If value isn't an array, turn it into one.
-		$this->_meta_box['hide_on']['page-template'] = ! is_array( $this->_meta_box['hide_on']['page-template'] ) ? array( $this->_meta_box['hide_on']['page-template'] ) : $this->_meta_box['hide_on']['page-template'];
+		$field['hide_on']['page-template'] = ! is_array( $field['hide_on']['page-template'] ) ? array( $field['hide_on']['page-template'] ) : $field['hide_on']['page-template'];
 
-		return ! in_array( $current_template, $this->_meta_box['hide_on']['page-template'] );
+		return ! in_array( $current_template, $field['hide_on']['page-template'] );
 
 	}
 

From 53d2fc5a6be042acd24b5b2850f5fee616a61a4e Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Wed, 4 Jan 2017 13:56:34 +0100
Subject: [PATCH 048/148] Adjusted tests for is_displayed to be a little
 cleaner

---
 tests/testIsMetaBoxDisplayed.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/tests/testIsMetaBoxDisplayed.php b/tests/testIsMetaBoxDisplayed.php
index fd8c57e4..1f5eb061 100644
--- a/tests/testIsMetaBoxDisplayed.php
+++ b/tests/testIsMetaBoxDisplayed.php
@@ -100,18 +100,15 @@ function testHideForId() {
 		) );
 
 		// Test is shown when no ID is set.
-		$displayed = $mb->hide_for_id( true );
-		$this->assertTrue( $displayed );
+		$this->assertTrue( $mb->hide_for_id( true ) );
 
 		// Test hidden for post ID
 		$_GET['post'] = 2;
-		$displayed = $mb->hide_for_id( true );
-		$this->assertFalse( $displayed );
+		$this->assertFalse( $mb->hide_for_id( true ) );
 
 		// Test not hidden when post ID doesn't match.
 		$_GET['post'] = 3;
-		$displayed = $mb->hide_for_id( true );
-		$this->assertTrue( $displayed );
+		$this->assertTrue( $mb->hide_for_id( true ) );
 
 		unset( $_GET['post'] );
 

From 7b41547bc7b96bdc2c6fccd3c0aa4b245a8a64b8 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Fri, 6 Jan 2017 16:43:35 +0100
Subject: [PATCH 049/148] Made several adjustments to the file upload field to
 make it smoother

---
 classes.fields.php   |  2 +-
 css/dist/cmb.min.css |  4 ++--
 css/src/file.css     |  8 +++++---
 js/cmb.js            | 20 ++++++++++++++++++++
 js/file-upload.js    | 30 +++++++++++++++++++++---------
 package.json         |  2 +-
 6 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/classes.fields.php b/classes.fields.php
index 556a0965..3fa38b0a 100644
--- a/classes.fields.php
+++ b/classes.fields.php
@@ -681,7 +681,7 @@ public function html() {
 
 		?>
 
-		<div class="cmb-file-wrap" style="<?php echo esc_attr( $styles ); ?>" data-type="<?php echo esc_attr( $data_type ); ?>">
+		<div class="cmb-file-wrap" style="<?php echo esc_attr( $styles ); ?>" data-type="<?php echo esc_attr( $data_type ); ?>" data-max-width="<?php echo absint( $size['width'] ); ?>">
 
 			<div class="cmb-file-wrap-placeholder" style="<?php echo esc_attr( $placeholder_styles ); ?>">
 
diff --git a/css/dist/cmb.min.css b/css/dist/cmb.min.css
index 620f51ba..de320674 100644
--- a/css/dist/cmb.min.css
+++ b/css/dist/cmb.min.css
@@ -1,6 +1,6 @@
 /**
- * Custom-Meta-Boxes - v1.0.1 - 2017-01-02
+ * Custom-Meta-Boxes - v1.1.0 - 2017-01-06
  * https://github.com/humanmade/Custom-Meta-Boxes/
  * Copyright (c) 2017 Human Made Limited; License: GPL-2.0+
  */
-.cmb_metabox .field{overflow:hidden;padding:16px 0}.postbox>.inside>.cmb_metabox{margin:-10px 0;padding:5px 5px 0}.cmb_metabox .cmb-row{overflow:hidden;position:relative;margin:0 -10px;zoom:1}.cmb_metabox .cmb-row:after,.cmb_metabox .cmb-row:before{content:"";display:table}.cmb_metabox .cmb-row:after{content:" ";position:absolute;clear:both;display:block;border-bottom:1px solid #DFDFDF;left:10px;right:10px;bottom:0}.cmb_metabox>.cmb-row:last-child{margin-bottom:-15px}.cmb_metabox>.cmb-row:last-child:after{display:none}.cmb_metabox [class*=cmb-cell-]{float:left;padding:0 10px;-moz-box-sizing:border-box;box-sizing:border-box}.cmb_metabox .cmb-cell-1{width:8.333333333%}.cmb_metabox .cmb-cell-2{width:16.666666667%}.cmb_metabox .cmb-cell-3{width:25%}.cmb_metabox .cmb-cell-4{width:33.333333333%}.cmb_metabox .cmb-cell-5{width:41.666666667%}.cmb_metabox .cmb-cell-6{width:50%}.cmb_metabox .cmb-cell-7{width:58.333333333%}.cmb_metabox .cmb-cell-8{width:66.666666667%}.cmb_metabox .cmb-cell-9{width:75%}.cmb_metabox .cmb-cell-10{width:83.333333333%}.cmb_metabox .cmb-cell-11{width:91.666666667%}.cmb_metabox .cmb-cell-12{width:100%}@media all and (max-width:850px){.cmb_metabox [class*=cmb-cell-]{width:100%}}@media all and (min-width:850px){.cmb_metabox [class*=cmb-cell-].cmb-has-label+.cmb-no-label{padding-top:32px}}.cmb_metabox .field-item{position:relative}.cmb_metabox_description{color:#AAA;font-style:italic;margin:0 0 16px!important}.cmb_metabox input[type=text],.cmb_metabox select,.cmb_metabox textarea{width:100%;margin:0}.cmb_metabox input.cmb_text_small{width:100px}.cmb_metabox input.cmb_text_medium{width:230px;margin-right:15px}.cmb_metabox input[type=checkbox],.cmb_metabox input[type=radio]{margin:0 5px 0 0;padding:0}.cmb_metabox .field-title{margin-bottom:16px;margin-top:0;font-weight:700}.cmb_metabox .field-title label{vertical-align:baseline}.cmb_metabox .select2-search-choice-close{-webkit-transition:none;transition:none;top:3px}.cmb_metabox [disabled]{background:#F7F7F7}.cmb_metabox .field.repeatable>.field-item{padding-right:30px;margin-bottom:10px}.cmb_metabox .repeat-field{display:block!important;clear:both}.CMB_Date_Field.repeatable .field-item,.CMB_Date_Timestamp_Field.repeatable .field-item,.CMB_Datetime_Timestamp_Field.repeatable .field-item,.CMB_Text_Small_Field.repeatable .field-item,.CMB_Time_Field.repeatable .field-item{float:left;clear:both}.cmb-delete-field{display:inline-block;text-decoration:none;font-size:11px;line-height:20px;height:22px;width:22px;margin:0;padding:0;cursor:pointer;border-width:1px;border-style:solid;-webkit-border-radius:3px;-webkit-appearance:none;border-radius:3px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;color:#555;border-color:#ccc;background:#f7f7f7;-webkit-box-shadow:inset 0 1px 0 #fff,0 1px 0 rgba(0,0,0,.08);box-shadow:inset 0 1px 0 #fff,0 1px 0 rgba(0,0,0,.08);vertical-align:top;position:absolute;top:3px;right:0;text-indent:100%;overflow:hidden;white-space:nowrap}.cmb-delete-field:active,.cmb-delete-field:focus,.cmb-delete-field:hover{background:#fafafa;border-color:#999;color:#222}.cmb-delete-field .cmb-delete-field-icon{content:' ';display:block;position:absolute;height:8px;width:8px;top:50%;left:50%;margin-top:-4px;margin-left:-4px;background-image:url( '../../images/cmb-icon-remove.png');background-repeat:no-repeat;text-indent:8px;overflow:hidden}@media only screen and (-webkit-min-device-pixel-ratio :1.5),only screen and (min-device-pixel-ratio :1.5){.cmb-delete-field .cmb-delete-field-icon{background-image:url( '../../images/cmb-icon-remove@2x.png');background-size:8px 8px}}.cmb-sortable>.field-item{padding-left:15px}.cmb-sortable .cmb-handle{height:100%;width:3px;position:absolute;top:0;left:0;background:0 0;cursor:move;border-left:3px solid #DFDFDF;border-right:3px solid #DFDFDF}.cmb-sortable .ui-sortable-helper{opacity:.75}.cmb-sortable .ui-sortable-helper:before{content:' ';position:absolute;width:100%;height:100%;top:-6px;left:-6px;background-color:#F8F8F8;border:1px solid #DEDEDE;padding:5px;z-index:-1}.cmb-sortable>.ui-sortable-placeholder{border:1px dashed #DDD!important;background:transparent!important;visibility:visible!important;margin-bottom:8px!important}.cmb_metabox .CMB_Group_Field>.field-title{font-size:20px;clear:left;color:#222;font-family:'Open Sans',sans-serif;font-weight:400;margin:8px 0}.cmb_metabox .CMB_Group_Field.repeatable>.field-title{margin-bottom:16px}.cmb_metabox .CMB_Group_Field.repeatable>.field-item{padding:30px 15px 0;margin-bottom:16px;border:1px solid #DDD;background:#FAFAFA;position:relative}.cmb_metabox .CMB_Group_Field.repeatable>.field-item:before{content:' ';display:block;position:absolute;top:0;left:0;right:0;height:33px;border-bottom:1px solid #DDD}.cmb_metabox .CMB_Group_Field.repeatable>.field-item>.cmb-delete-field{top:5px;right:5px;width:auto;text-indent:0;padding-left:24px;padding-right:8px;height:22px;line-height:20px;font-size:11px;z-index:1}.cmb_metabox .CMB_Group_Field.repeatable>.field-item>.cmb-delete-field .cmb-delete-field-icon{left:12px}.CMB_Group_Field.cmb-sortable>.field-item{position:relative;padding-top:30px}.CMB_Group_Field.cmb-sortable>.field-item>.cmb-handle{top:-1px;left:-1px;right:-1px;height:34px;width:auto;border:0;border-bottom:1px solid #DDD}.CMB_Group_Field.cmb-sortable>.field-item.ui-sortable-helper>.cmb-handle{padding:0 5px}.cmb_metabox .CMB_Group_Field.repeatable.cmb-sortable>.field-item:before{display:none!important}.CMB_Group_Field.cmb-sortable>.ui-sortable-placeholder{margin-bottom:16px!important}.CMB_Group_Field .cmb_metabox>.cmb-row:last-child{margin-bottom:0}.CMB_File_Field .field-item,.CMB_Image_Field .field-item{float:left;margin:0 16px 16px 0!important;text-align:center;padding:0!important;z-index:1}.cmb-file-wrap{position:relative;overflow:hidden;width:150px;height:150px;line-height:150px}.cmb-file-wrap-placeholder{content:' ';position:absolute;top:0;left:0;display:block;height:142px;width:142px;border:4px dashed #DDD;z-index:-1}.cmb-file-wrap-placeholder .dimensions{line-height:normal;position:absolute;bottom:10px;right:10px;font-size:18px;font-weight:700;opacity:.2}.cmb-file-holder{position:relative;overflow:hidden;box-shadow:inset 0 0 15px rgba(0,0,0,.1),inset 0 0 0 1px rgba(0,0,0,.05);background:#eee;width:100%;height:100%}.cmb-file-holder.type-file img{position:absolute;top:43%;margin-top:-30px;left:50%;margin-left:-23px}.cmb-file-holder.type-img img{width:100%;height:auto;margin-top:0;vertical-align:top}.cmb-file-holder.type-img::after{content:'';display:block;position:absolute;top:0;left:0;right:0;bottom:0;box-shadow:inset 0 0 0 1px rgba(0,0,0,.1);overflow:hidden;z-index:1}.cmb-file-name{position:absolute;left:0;right:0;bottom:0;line-height:1.4;overflow:hidden;max-height:100%;word-wrap:break-word;text-align:center;font-weight:700;background:rgba(255,255,255,.8);box-shadow:inset 0 0 0 1px rgba(0,0,0,.15)}.cmb-file-name strong{padding:5px 10px;display:block}.CMB_File_Field .cmb-delete-field,.CMB_Image_Field .cmb-delete-field{z-index:10;top:10px;right:10px}.CMB_File_Field .cmb-remove-file,.CMB_Image_Field .cmb-remove-file{position:absolute;z-index:1;top:5px;right:5px}.CMB_File_Field.repeatable .cmb-remove-file,.CMB_Image_Field.repeatable .cmb-remove-file{display:none!important}.cmb-file-wrap .cmb-file-upload{vertical-align:middle}.cmb-loading::before{content:' ';display:block;background:url( '../../images/wpspin.gif' ) no-repeat;width:16px;height:16px;position:absolute;top:50%;left:50%;margin-top:-8px;margin-left:-8px}@media only screen and (-webkit-min-device-pixel-ratio :1.5),only screen and (min-device-pixel-ratio :1.5){.cmb-loading::before{background-image:url( '../../images/wpspin-2x.gif');background-size:16px 16px}}.CMB_File_Field.cmb-sortable .cmb-handle,.CMB_Image_Field.cmb-sortable .cmb-handle{border:0;background:0 0;height:100%;width:100%;z-index:1}.CMB_File_Field.cmb-sortable .cmb-file-upload,.CMB_Image_Field.cmb-sortable .cmb-file-upload{position:relative;z-index:5}.CMB_File_Field.cmb-sortable .ui-sortable-helper:before,.CMB_Image_Field.cmb-sortable .ui-sortable-helper:before{top:0;left:0;padding:0;border:0;background:#F9F9F9}.CMB_Title .field-title{margin:8px 0!important}.CMB_Title{border-bottom:0;padding-bottom:0;margin-top:16px}.CMB_Title h2{margin:0!important;padding:0!important}.CMB_Color_Picker .field-item{float:left;clear:both}.CMB_Color_Picker:after,.CMB_Color_Picker:before{content:"";display:table}.CMB_Color_Picker:after{clear:both}.CMB_Color_Picker{zoom:1}div.time-picker{position:absolute;height:191px;width:4em;overflow:auto;background:#fff;border:1px solid #aaa;z-index:99;margin:0}div.time-picker-12hours{width:6em}div.time-picker ul{list-style-type:none;margin:0;padding:0}div.time-picker li{cursor:pointer;height:10px;font:12px/1 Helvetica,Arial,sans-serif;padding:4px 3px}div.time-picker li.selected{background:#0063CE;color:#fff}.cmb_metabox input.cmb_timepicker{width:100px;margin-right:0}.CMB_Datetime_Timestamp_Field input+input{margin-left:4px}.cmb_select{width:100%}.select2-offscreen{display:none}
\ No newline at end of file
+.cmb_metabox .field{overflow:hidden;padding:16px 0}.postbox>.inside>.cmb_metabox{margin:-10px 0;padding:5px 5px 0}.cmb_metabox .cmb-row{overflow:hidden;position:relative;margin:0 -10px;zoom:1}.cmb_metabox .cmb-row:after,.cmb_metabox .cmb-row:before{content:"";display:table}.cmb_metabox .cmb-row:after{content:" ";position:absolute;clear:both;display:block;border-bottom:1px solid #DFDFDF;left:10px;right:10px;bottom:0}.cmb_metabox>.cmb-row:last-child{margin-bottom:-15px}.cmb_metabox>.cmb-row:last-child:after{display:none}.cmb_metabox [class*=cmb-cell-]{float:left;padding:0 10px;-moz-box-sizing:border-box;box-sizing:border-box}.cmb_metabox .cmb-cell-1{width:8.333333333%}.cmb_metabox .cmb-cell-2{width:16.666666667%}.cmb_metabox .cmb-cell-3{width:25%}.cmb_metabox .cmb-cell-4{width:33.333333333%}.cmb_metabox .cmb-cell-5{width:41.666666667%}.cmb_metabox .cmb-cell-6{width:50%}.cmb_metabox .cmb-cell-7{width:58.333333333%}.cmb_metabox .cmb-cell-8{width:66.666666667%}.cmb_metabox .cmb-cell-9{width:75%}.cmb_metabox .cmb-cell-10{width:83.333333333%}.cmb_metabox .cmb-cell-11{width:91.666666667%}.cmb_metabox .cmb-cell-12{width:100%}@media all and (max-width:850px){.cmb_metabox [class*=cmb-cell-]{width:100%}}@media all and (min-width:850px){.cmb_metabox [class*=cmb-cell-].cmb-has-label+.cmb-no-label{padding-top:32px}}.cmb_metabox .field-item{position:relative}.cmb_metabox_description{color:#AAA;font-style:italic;margin:0 0 16px!important}.cmb_metabox input[type=text],.cmb_metabox select,.cmb_metabox textarea{width:100%;margin:0}.cmb_metabox input.cmb_text_small{width:100px}.cmb_metabox input.cmb_text_medium{width:230px;margin-right:15px}.cmb_metabox input[type=checkbox],.cmb_metabox input[type=radio]{margin:0 5px 0 0;padding:0}.cmb_metabox .field-title{margin-bottom:16px;margin-top:0;font-weight:700}.cmb_metabox .field-title label{vertical-align:baseline}.cmb_metabox .select2-search-choice-close{-webkit-transition:none;transition:none;top:3px}.cmb_metabox [disabled]{background:#F7F7F7}.cmb_metabox .field.repeatable>.field-item{padding-right:30px;margin-bottom:10px}.cmb_metabox .repeat-field{display:block!important;clear:both}.CMB_Date_Field.repeatable .field-item,.CMB_Date_Timestamp_Field.repeatable .field-item,.CMB_Datetime_Timestamp_Field.repeatable .field-item,.CMB_Text_Small_Field.repeatable .field-item,.CMB_Time_Field.repeatable .field-item{float:left;clear:both}.cmb-delete-field{display:inline-block;text-decoration:none;font-size:11px;line-height:20px;height:22px;width:22px;margin:0;padding:0;cursor:pointer;border-width:1px;border-style:solid;-webkit-border-radius:3px;-webkit-appearance:none;border-radius:3px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;color:#555;border-color:#ccc;background:#f7f7f7;-webkit-box-shadow:inset 0 1px 0 #fff,0 1px 0 rgba(0,0,0,.08);box-shadow:inset 0 1px 0 #fff,0 1px 0 rgba(0,0,0,.08);vertical-align:top;position:absolute;top:3px;right:0;text-indent:100%;overflow:hidden;white-space:nowrap}.cmb-delete-field:active,.cmb-delete-field:focus,.cmb-delete-field:hover{background:#fafafa;border-color:#999;color:#222}.cmb-delete-field .cmb-delete-field-icon{content:' ';display:block;position:absolute;height:8px;width:8px;top:50%;left:50%;margin-top:-4px;margin-left:-4px;background-image:url( '../../images/cmb-icon-remove.png');background-repeat:no-repeat;text-indent:8px;overflow:hidden}@media only screen and (-webkit-min-device-pixel-ratio :1.5),only screen and (min-device-pixel-ratio :1.5){.cmb-delete-field .cmb-delete-field-icon{background-image:url( '../../images/cmb-icon-remove@2x.png');background-size:8px 8px}}.cmb-sortable>.field-item{padding-left:15px}.cmb-sortable .cmb-handle{height:100%;width:3px;position:absolute;top:0;left:0;background:0 0;cursor:move;border-left:3px solid #DFDFDF;border-right:3px solid #DFDFDF}.cmb-sortable .ui-sortable-helper{opacity:.75}.cmb-sortable .ui-sortable-helper:before{content:' ';position:absolute;width:100%;height:100%;top:-6px;left:-6px;background-color:#F8F8F8;border:1px solid #DEDEDE;padding:5px;z-index:-1}.cmb-sortable>.ui-sortable-placeholder{border:1px dashed #DDD!important;background:transparent!important;visibility:visible!important;margin-bottom:8px!important}.cmb_metabox .CMB_Group_Field>.field-title{font-size:20px;clear:left;color:#222;font-family:'Open Sans',sans-serif;font-weight:400;margin:8px 0}.cmb_metabox .CMB_Group_Field.repeatable>.field-title{margin-bottom:16px}.cmb_metabox .CMB_Group_Field.repeatable>.field-item{padding:30px 15px 0;margin-bottom:16px;border:1px solid #DDD;background:#FAFAFA;position:relative}.cmb_metabox .CMB_Group_Field.repeatable>.field-item:before{content:' ';display:block;position:absolute;top:0;left:0;right:0;height:33px;border-bottom:1px solid #DDD}.cmb_metabox .CMB_Group_Field.repeatable>.field-item>.cmb-delete-field{top:5px;right:5px;width:auto;text-indent:0;padding-left:24px;padding-right:8px;height:22px;line-height:20px;font-size:11px;z-index:1}.cmb_metabox .CMB_Group_Field.repeatable>.field-item>.cmb-delete-field .cmb-delete-field-icon{left:12px}.CMB_Group_Field.cmb-sortable>.field-item{position:relative;padding-top:30px}.CMB_Group_Field.cmb-sortable>.field-item>.cmb-handle{top:-1px;left:-1px;right:-1px;height:34px;width:auto;border:0;border-bottom:1px solid #DDD}.CMB_Group_Field.cmb-sortable>.field-item.ui-sortable-helper>.cmb-handle{padding:0 5px}.cmb_metabox .CMB_Group_Field.repeatable.cmb-sortable>.field-item:before{display:none!important}.CMB_Group_Field.cmb-sortable>.ui-sortable-placeholder{margin-bottom:16px!important}.CMB_Group_Field .cmb_metabox>.cmb-row:last-child{margin-bottom:0}.CMB_File_Field .field-item,.CMB_Image_Field .field-item{float:left;margin:0 16px 16px 0!important;text-align:center;padding:0!important;z-index:1;max-width:100%}.cmb-file-wrap{position:relative;overflow:hidden;width:150px;height:150px;line-height:150px}.cmb-file-wrap-placeholder{content:' ';position:absolute;top:0;left:0;display:block;height:142px;width:142px;border:4px dashed #DDD;z-index:-1;box-sizing:border-box}.cmb-file-wrap-placeholder .dimensions{line-height:normal;position:absolute;bottom:10px;right:10px;font-size:18px;font-weight:700;opacity:.2}.cmb-file-holder{position:relative;overflow:hidden;box-shadow:inset 0 0 15px rgba(0,0,0,.1),inset 0 0 0 1px rgba(0,0,0,.05);background:#eee;width:100%;height:100%}.cmb-file-holder.type-file img{position:absolute;top:43%;margin-top:-30px;left:50%;margin-left:-23px}.cmb-file-holder.type-img img{width:100%;height:auto;margin-top:0;vertical-align:top}.cmb-file-holder.type-img::after{content:'';display:block;position:absolute;top:0;left:0;right:0;bottom:0;box-shadow:inset 0 0 0 1px rgba(0,0,0,.1);overflow:hidden;z-index:1}.cmb-file-name{position:absolute;left:0;right:0;bottom:0;line-height:1.4;overflow:hidden;max-height:100%;word-wrap:break-word;text-align:center;font-weight:700;background:rgba(255,255,255,.8);box-shadow:inset 0 0 0 1px rgba(0,0,0,.15)}.cmb-file-name strong{padding:5px 10px;display:block}.CMB_File_Field .cmb-delete-field,.CMB_Image_Field .cmb-delete-field{z-index:10;top:10px;right:10px}.CMB_File_Field .cmb-remove-file,.CMB_Image_Field .cmb-remove-file{position:absolute;z-index:1;top:5px;right:5px}.CMB_File_Field.repeatable .cmb-remove-file,.CMB_Image_Field.repeatable .cmb-remove-file{display:none!important}.cmb-file-wrap .cmb-file-upload{vertical-align:middle}.cmb-loading::before{content:' ';display:block;background:url( '../../images/wpspin.gif' ) no-repeat;width:16px;height:16px;position:absolute;top:50%;left:50%;margin-top:-8px;margin-left:-8px}@media only screen and (-webkit-min-device-pixel-ratio :1.5),only screen and (min-device-pixel-ratio :1.5){.cmb-loading::before{background-image:url( '../../images/wpspin-2x.gif');background-size:16px 16px}}.CMB_File_Field.cmb-sortable .cmb-handle,.CMB_Image_Field.cmb-sortable .cmb-handle{border:0;background:0 0;height:100%;width:100%;z-index:1}.CMB_File_Field.cmb-sortable .cmb-file-upload,.CMB_Image_Field.cmb-sortable .cmb-file-upload{position:relative;z-index:5}.CMB_File_Field.cmb-sortable .ui-sortable-helper:before,.CMB_Image_Field.cmb-sortable .ui-sortable-helper:before{top:0;left:0;padding:0;border:0;background:#F9F9F9}.CMB_Title .field-title{margin:8px 0!important}.CMB_Title{border-bottom:0;padding-bottom:0;margin-top:16px}.CMB_Title h2{margin:0!important;padding:0!important}.CMB_Color_Picker .field-item{float:left;clear:both}.CMB_Color_Picker:after,.CMB_Color_Picker:before{content:"";display:table}.CMB_Color_Picker:after{clear:both}.CMB_Color_Picker{zoom:1}div.time-picker{position:absolute;height:191px;width:4em;overflow:auto;background:#fff;border:1px solid #aaa;z-index:99;margin:0}div.time-picker-12hours{width:6em}div.time-picker ul{list-style-type:none;margin:0;padding:0}div.time-picker li{cursor:pointer;height:10px;font:12px/1 Helvetica,Arial,sans-serif;padding:4px 3px}div.time-picker li.selected{background:#0063CE;color:#fff}.cmb_metabox input.cmb_timepicker{width:100px;margin-right:0}.CMB_Datetime_Timestamp_Field input+input{margin-left:4px}.cmb_select{width:100%}.select2-offscreen{display:none}
\ No newline at end of file
diff --git a/css/src/file.css b/css/src/file.css
index ce5f8d4d..3566e669 100644
--- a/css/src/file.css
+++ b/css/src/file.css
@@ -5,7 +5,8 @@
 	margin: 0 16px 16px 0 !important; 
 	text-align: center; 
 	padding: 0 !important; 
-	z-index: 1; 
+	z-index: 1;
+	max-width: 100%;
 }
 
 .cmb-file-wrap { 
@@ -13,7 +14,7 @@
 	overflow: hidden; 
 	width: 150px; 
 	height: 150px; 
-	line-height: 150px; 
+	line-height: 150px;
 }
 
 .cmb-file-wrap-placeholder { 
@@ -25,7 +26,8 @@
 	height: 142px; 
 	width: 142px; 
 	border: 4px dashed #DDD; 
-	z-index: -1; 
+	z-index: -1;
+	box-sizing: border-box;
 }
 
 .cmb-file-wrap-placeholder .dimensions { 
diff --git a/js/cmb.js b/js/cmb.js
index 1c7c761d..ac896fbc 100644
--- a/js/cmb.js
+++ b/js/cmb.js
@@ -325,6 +325,26 @@ var CMB = {
 		this._sortEndCallbacks[fieldName] = this._sortEndCallbacks[fieldName] ? this._sortEndCallbacks[fieldName] : [];
 		this._sortEndCallbacks[fieldName].push( callback );
 
+	},
+
+	debounce: function debounce( func, wait, immediate ) {
+		var timeout;
+		return function() {
+			var context = this,
+				args = arguments;
+			var later = function() {
+				timeout = null;
+				if ( ! immediate ) {
+					func.apply( context, args );
+				}
+			};
+			var callNow = immediate && ! timeout;
+			clearTimeout( timeout );
+			timeout = setTimeout( later, wait );
+			if ( callNow ) {
+				func.apply( context, args );
+			}
+		};
 	}
 
 };
diff --git a/js/file-upload.js b/js/file-upload.js
index ebd07886..39d35c5f 100644
--- a/js/file-upload.js
+++ b/js/file-upload.js
@@ -99,8 +99,7 @@ jQuery( document ).ready( function() {
 
 			var el        = jQuery( this ),
 				container = el.closest( '.postbox' ),
-				width     = container.width() - 12 - 10 - 10,
-				ratio     = el.height() / el.width();
+				width     = container.width() - 12 - 10 - 10 - 2;
 
 			if ( el.attr( 'data-original-width' ) ) {
 				el.width( el.attr( 'data-original-width' ) );
@@ -114,18 +113,31 @@ jQuery( document ).ready( function() {
 				el.attr( 'data-original-height', el.height() );
 			}
 
-			if ( el.width() > width ) {
-				el.width( width );
-				el.find( '.cmb-file-wrap-placeholder' ).width( width - 8 );
-				el.height( width * ratio );
-				el.css( 'line-height', ( width * ratio ) + 'px' );
-				el.find( '.cmb-file-wrap-placeholder' ).height( ( width * ratio ) - 8 );
+			var ratio = el.height() / el.width();
+
+			if ( el.width() > width || ( width > el.width() && width <= el.data( 'max-width' ) ) ) {
+				resizeFileBox( el, width, ratio );
 			}
 
 		} );
+
+		function resizeFileBox( element, width, ratio ) {
+			element.width( width );
+			element.find( '.cmb-file-wrap-placeholder' ).width( width - 8 );
+			element.height( width * ratio );
+			element.css( 'line-height', ( width * ratio ) + 'px' );
+			element.find( '.cmb-file-wrap-placeholder' ).height( ( width * ratio ) - 8 );
+		}
 	};
 
 	recalculateFileFieldSize();
-	jQuery( window ).resize( recalculateFileFieldSize );
+
+	var debounce = CMB.debounce( function() {
+		recalculateFileFieldSize();
+	}, 100 );
+
+	// Recheck the width every time that the window is re-sized, debounced.
+	window.addEventListener( 'resize', debounce );
+
 
 } );
diff --git a/package.json b/package.json
index a560acb7..7454a104 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Custom-Meta-Boxes",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "Lets you easily create metaboxes with custom fields that will blow your mind.",
   "homepage": "https://github.com/humanmade/Custom-Meta-Boxes/",
   "repository": {

From e68a90687237951498bf11ec0e699dfc44d9979d Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Tue, 10 Jan 2017 09:20:05 +0100
Subject: [PATCH 050/148] Moved map field to its own file

---
 classes.fields.php              | 107 -----------------------------
 custom-meta-boxes.php           |   1 +
 fields/class-cmb-gmap-field.php | 115 ++++++++++++++++++++++++++++++++
 3 files changed, 116 insertions(+), 107 deletions(-)
 create mode 100644 fields/class-cmb-gmap-field.php

diff --git a/classes.fields.php b/classes.fields.php
index 556a0965..1c247396 100644
--- a/classes.fields.php
+++ b/classes.fields.php
@@ -2066,110 +2066,3 @@ public function set_values( array $values ) {
 
 	}
 }
-
-
-/**
- * Google map field class for CMB
- *
- * It enables the google places API and doesn't store the place
- * name. It only stores latitude and longitude of the selected area.
- *
- * Note - you need a Google API key for field to work correctly.
- *
- * @since 1.0.2
- *
- * @extends CMB_Field
- */
-class CMB_Gmap_Field extends CMB_Field {
-
-	/**
-	 * Get default arguments for field including custom parameters.
-	 *
-	 * @return array Default arguments for field.
-	 */
-	public function get_default_args() {
-		return array_merge(
-			parent::get_default_args(),
-			array(
-				'field_width'                 => '100%',
-				'field_height'                => '250px',
-				'default_lat'                 => '51.5073509',
-				'default_long'                => '-0.12775829999998223',
-				'default_zoom'                => '8',
-				'string-marker-title'         => esc_html__( 'Drag to set the exact location', 'cmb' ),
-				'string-gmaps-api-not-loaded' => esc_html__( 'Google Maps API not loaded.', 'cmb' ),
-				'google_api_key'              => '',
-			)
-		);
-	}
-
-	/**
-	 * Enqueue all scripts required by the field.
-	 *
-	 * @uses wp_enqueue_script()
-	 */
-	public function enqueue_scripts() {
-
-		parent::enqueue_scripts();
-
-		wp_enqueue_script( 'cmb-google-maps-script', trailingslashit( CMB_URL ) . 'js/field-gmap.js', array( 'jquery' ) );
-
-		// Check for our key with either a field argument or constant.
-		$key = '';
-		if ( ! empty( $this->args['google_api_key'] ) ) {
-			$key = $this->args['google_api_key'];
-		} elseif ( defined( 'CMB_GAPI_KEY' ) ) {
-			$key = CMB_GAPI_KEY;
-		}
-
-		wp_localize_script( 'cmb-google-maps-script', 'CMBGmaps', array(
-			'key'      => $key,
-			'defaults' => array(
-				'latitude'  => $this->args['default_lat'],
-				'longitude' => $this->args['default_long'],
-				'zoom'      => $this->args['default_zoom'],
-			),
-			'strings'  => array(
-				'markerTitle'            => $this->args['string-marker-title'],
-				'googleMapsApiNotLoaded' => $this->args['string-gmaps-api-not-loaded'],
-			),
-		) );
-
-	}
-
-	/**
-	 * Print out field HTML.
-	 */
-	public function html() {
-
-		// Ensure all args used are set.
-		$value = wp_parse_args(
-			$this->get_value(),
-			array(
-				'lat'       => null,
-				'long'      => null,
-				'elevation' => null,
-				'text'      => null,
-			)
-		);
-
-		$style = array(
-			sprintf( 'width: %s;', $this->args['field_width'] ),
-			sprintf( 'height: %s;', $this->args['field_height'] ),
-			'border: 1px solid #eee;',
-			'margin-top: 8px;',
-		);
-
-		?>
-
-		<input type="text" <?php $this->class_attr( 'map-search' ); ?> <?php $this->id_attr(); ?> <?php $this->name_attr( '[text]' ); ?> value="<?php echo esc_attr( $value['text'] ); ?>" />
-
-		<div class="map" style="<?php echo esc_attr( implode( ' ', $style ) ); ?>"></div>
-
-		<input type="hidden" class="latitude"  <?php $this->name_attr( '[lat]' ); ?>       value="<?php echo esc_attr( $value['lat'] ); ?>" />
-		<input type="hidden" class="longitude" <?php $this->name_attr( '[long]' ); ?>      value="<?php echo esc_attr( $value['long'] ); ?>" />
-		<input type="hidden" class="elevation" <?php $this->name_attr( '[elevation]' ); ?> value="<?php echo esc_attr( $value['elevation'] ); ?>" />
-
-		<?php
-	}
-}
diff --git a/custom-meta-boxes.php b/custom-meta-boxes.php
index 959cfbc9..d0610336 100755
--- a/custom-meta-boxes.php
+++ b/custom-meta-boxes.php
@@ -44,6 +44,7 @@
  * Make it possible to add fields in locations other than post edit screen. Optional.
  */
 include_once( CMB_PATH . '/fields-anywhere.php' );
+include_once( CMB_PATH . 'fields/class-cmb-gmap-field.php' );
 
 /**
  * Get all the meta boxes on init.
diff --git a/fields/class-cmb-gmap-field.php b/fields/class-cmb-gmap-field.php
new file mode 100644
index 00000000..2a9c8530
--- /dev/null
+++ b/fields/class-cmb-gmap-field.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * Gmap field type.
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
+
+/**
+ * Google map field class for CMB
+ *
+ * It enables the google places API and doesn't store the place
+ * name. It only stores latitude and longitude of the selected area.
+ *
+ * Note - you need a Google API key for field to work correctly.
+ *
+ * @since 1.0.2
+ *
+ * @extends CMB_Field
+ */
+class CMB_Gmap_Field extends CMB_Field {
+
+	/**
+	 * Get default arguments for field including custom parameters.
+	 *
+	 * @return array Default arguments for field.
+	 */
+	public function get_default_args() {
+		return array_merge(
+			parent::get_default_args(),
+			array(
+				'field_width'                 => '100%',
+				'field_height'                => '250px',
+				'default_lat'                 => '51.5073509',
+				'default_long'                => '-0.12775829999998223',
+				'default_zoom'                => '8',
+				'string-marker-title'         => esc_html__( 'Drag to set the exact location', 'cmb' ),
+				'string-gmaps-api-not-loaded' => esc_html__( 'Google Maps API not loaded.', 'cmb' ),
+				'google_api_key'              => '',
+			)
+		);
+	}
+
+	/**
+	 * Enqueue all scripts required by the field.
+	 *
+	 * @uses wp_enqueue_script()
+	 */
+	public function enqueue_scripts() {
+
+		parent::enqueue_scripts();
+
+		wp_enqueue_script( 'cmb-google-maps-script', trailingslashit( CMB_URL ) . 'js/field-gmap.js', array( 'jquery' ) );
+
+		// Check for our key with either a field argument or constant.
+		$key = '';
+		if ( ! empty( $this->args['google_api_key'] ) ) {
+			$key = $this->args['google_api_key'];
+		} elseif ( defined( 'CMB_GAPI_KEY' ) ) {
+			$key = CMB_GAPI_KEY;
+		}
+
+		wp_localize_script( 'cmb-google-maps-script', 'CMBGmaps', array(
+			'key'      => $key,
+			'defaults' => array(
+				'latitude'  => $this->args['default_lat'],
+				'longitude' => $this->args['default_long'],
+				'zoom'      => $this->args['default_zoom'],
+			),
+			'strings'  => array(
+				'markerTitle'            => $this->args['string-marker-title'],
+				'googleMapsApiNotLoaded' => $this->args['string-gmaps-api-not-loaded'],
+			),
+		) );
+
+	}
+
+	/**
+	 * Print out field HTML.
+	 */
+	public function html() {
+
+		echo $this->get_value();
+
+		// Ensure all args used are set.
+		$value = wp_parse_args(
+			$this->get_value(),
+			array(
+				'lat'       => null,
+				'long'      => null,
+				'elevation' => null,
+				'text'      => null,
+			)
+		);
+
+		$style = array(
+			sprintf( 'width: %s;', $this->args['field_width'] ),
+			sprintf( 'height: %s;', $this->args['field_height'] ),
+			'border: 1px solid #eee;',
+			'margin-top: 8px;',
+		);
+
+		?>
+
+		<input type="text" <?php $this->class_attr( 'map-search' ); ?> <?php $this->id_attr(); ?> <?php $this->name_attr( '[text]' ); ?> value="<?php echo esc_attr( $value['text'] ); ?>" />
+
+		<div class="map" style="<?php echo esc_attr( implode( ' ', $style ) ); ?>"></div>
+
+		<input type="hidden" class="latitude"  <?php $this->name_attr( '[lat]' ); ?>       value="<?php echo esc_attr( $value['lat'] ); ?>" />
+		<input type="hidden" class="longitude" <?php $this->name_attr( '[long]' ); ?>      value="<?php echo esc_attr( $value['long'] ); ?>" />
+		<input type="hidden" class="elevation" <?php $this->name_attr( '[elevation]' ); ?> value="<?php echo esc_attr( $value['elevation'] ); ?>" />
+
+		<?php
+	}
+}

From c5a63432d56655f19345c8e99875da5ef376b7d3 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Tue, 10 Jan 2017 09:31:43 +0100
Subject: [PATCH 051/148] Wrapped incoming values in an array

---
 fields/class-cmb-gmap-field.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/fields/class-cmb-gmap-field.php b/fields/class-cmb-gmap-field.php
index 2a9c8530..eed784dc 100644
--- a/fields/class-cmb-gmap-field.php
+++ b/fields/class-cmb-gmap-field.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Gmap field type.
+ * Google Map field type.
  *
  * @package WordPress
  * @subpackage Custom Meta Boxes
@@ -75,13 +75,20 @@ public function enqueue_scripts() {
 
 	}
 
+	/**
+	 * Get multiple values for a field.
+	 *
+	 * @return array
+	 */
+	public function &get_values() {
+		return array( $this->values );
+	}
+
 	/**
 	 * Print out field HTML.
 	 */
 	public function html() {
 
-		echo $this->get_value();
-
 		// Ensure all args used are set.
 		$value = wp_parse_args(
 			$this->get_value(),

From 72c7bc788dbf615ee73446376399172e6cdb4170 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Tue, 10 Jan 2017 09:49:10 +0100
Subject: [PATCH 052/148] Fixed repeatable field values for Gmaps field

---
 fields/class-cmb-gmap-field.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fields/class-cmb-gmap-field.php b/fields/class-cmb-gmap-field.php
index eed784dc..854c3c78 100644
--- a/fields/class-cmb-gmap-field.php
+++ b/fields/class-cmb-gmap-field.php
@@ -81,7 +81,7 @@ public function enqueue_scripts() {
 	 * @return array
 	 */
 	public function &get_values() {
-		return array( $this->values );
+		return ( ! $this->args['repeatable'] ) ? array( $this->values ) : $this->values;
 	}
 
 	/**

From 390ef46951386df84836f8eb1d9f0f8f84e2093c Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Tue, 10 Jan 2017 11:36:58 +0100
Subject: [PATCH 053/148] Added a filter to allow for greater extensibility of
 the group field class

---
 class.cmb-meta-box.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/class.cmb-meta-box.php b/class.cmb-meta-box.php
index 06892bbf..a9453aa4 100644
--- a/class.cmb-meta-box.php
+++ b/class.cmb-meta-box.php
@@ -83,8 +83,18 @@ public function init_fields( $post_id = 0 ) {
 				$values = (array) get_post_meta( $post_id, $field['id'], $single );
 			}
 
+			/**
+			 * Filter which fields are consdered to be "group" types.
+			 *
+			 * This is useful if you want to extend the group field for your own use and still
+			 * use the array mapping below.
+			 *
+			 * @param array $group_fields Group field types
+			 */
+			$group_field_types = apply_filters( 'cmb_group_field_types', array( 'group' ) );
+
 			// Handle repeatable values for group fields.
-			if ( 'group' === $field['type'] && $single ) {
+			if ( in_array( $field['type'], $group_field_types ) && $single ) {
 				$values = array( $values );
 			}
 

From db65794ccb2b1b8bd212b6a3bdfa300d3622ad72 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Tue, 10 Jan 2017 11:45:27 +0100
Subject: [PATCH 054/148] Fixed PHP5.4 style arrys. Every. Single. Time.

---
 class.cmb-meta-box.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/class.cmb-meta-box.php b/class.cmb-meta-box.php
index 5319cefa..9fcc59b3 100644
--- a/class.cmb-meta-box.php
+++ b/class.cmb-meta-box.php
@@ -231,7 +231,7 @@ function is_metabox_displayed() {
 	 * @param array $field Field arguments.
 	 * @return bool (Potentially) modified display status
 	 */
-	function add_for_id( $display, $field = [] ) {
+	function add_for_id( $display, $field = array() ) {
 
 		if ( empty( $field ) ) {
 			$field = $this->_meta_box;
@@ -264,7 +264,7 @@ function add_for_id( $display, $field = [] ) {
 	 * @param array $field Field arguments.
 	 * @return bool (Potentially) modified display status
 	 */
-	function hide_for_id( $display, $field = [] ) {
+	function hide_for_id( $display, $field = array() ) {
 
 		if ( empty( $field ) ) {
 			$field = $this->_meta_box;
@@ -296,7 +296,7 @@ function hide_for_id( $display, $field = [] ) {
 	 * @param array $field Field arguments.
 	 * @return bool (Potentially) modified display status
 	 */
-	function add_for_page_template( $display, $field = [] ) {
+	function add_for_page_template( $display, $field = array() ) {
 
 		if ( empty( $field ) ) {
 			$field = $this->_meta_box;
@@ -331,7 +331,7 @@ function add_for_page_template( $display, $field = [] ) {
 	 * @param array $field Field arguments.
 	 * @return bool (Potentially) modified display status
 	 */
-	function hide_for_page_template( $display, $field = [] ) {
+	function hide_for_page_template( $display, $field = array() ) {
 
 		if ( empty( $field ) ) {
 			$field = $this->_meta_box;

From 15e745da45348caf03d8c3fe3c46eba9be097a17 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Wed, 11 Jan 2017 10:12:59 +0100
Subject: [PATCH 055/148] Added example function to match the new style

---
 example-functions.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/example-functions.php b/example-functions.php
index 0cf9d20b..30d6780e 100644
--- a/example-functions.php
+++ b/example-functions.php
@@ -214,6 +214,16 @@ function cmb_sample_metaboxes( array $meta_boxes ) {
 			'show_size'  => true,        // Optional. Whether to show the image dimensions underneath image itself.
 		),
 
+		/*
+		 * Hidden Field.
+		 */
+		array(
+			'id'      => 'field-hidden',
+			'name'    => 'Hidden field',
+			'type'    => 'hidden',
+			'default' => 'hidden default value',
+		),
+
 		/*
 		 * Select Field.
 		 */
@@ -306,8 +316,6 @@ function cmb_sample_metaboxes( array $meta_boxes ) {
 			'type' => 'url',
 		),
 
-		array( 'id' => 'field-25', 'name' => 'Hidden Field', 'type' => 'hidden', 'default' => 'my valuuuuuuue' ),
-
 	);
 
 	/**

From 10c1086f008594c97d4fec0d353b2f74e427ef46 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Wed, 11 Jan 2017 10:15:29 +0100
Subject: [PATCH 056/148] Added example field to example-functions

---
 example-functions.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/example-functions.php b/example-functions.php
index 31de1fae..d5c12b57 100644
--- a/example-functions.php
+++ b/example-functions.php
@@ -144,6 +144,15 @@ function cmb_sample_metaboxes( array $meta_boxes ) {
 			'type' => 'datetime_unix',
 		),
 
+		/**
+		 * Email Field.
+		 */
+		array(
+			'id'   => 'field-email',
+			'name' => 'Email field',
+			'type' => 'email',
+		),
+
 		/*
 		 * Google Map Field.
 		 */

From 064fc754e033e45c56ccf76bf63514c4d5e8cc8f Mon Sep 17 00:00:00 2001
From: Barry Ceelen <barry@multipop.org>
Date: Wed, 11 Jan 2017 11:08:31 +0100
Subject: [PATCH 057/148] Add brackets, update attribute check

---
 class.cmb-meta-box.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/class.cmb-meta-box.php b/class.cmb-meta-box.php
index 6f557dca..ec23f1d2 100644
--- a/class.cmb-meta-box.php
+++ b/class.cmb-meta-box.php
@@ -296,8 +296,9 @@ static function layout_fields( array $fields ) { ?>
 					$attrs[] = sprintf( 'data-rep-max="%s"', intval( $field->args['repeatable_max'] ) );
 
 				// Ask for confirmation before removing field.
-				if ( ! empty( $field->args['confirm_delete_field'] ) )
+				if ( isset( $field->args['confirm_delete_field'] ) ) {
 					$attrs[] = sprintf( 'data-confirm-delete="%s"', (bool) $field->args['confirm_delete_field'] );
+				}
 				?>
 
 				<div class="cmb-cell-<?php echo intval( $field->args['cols'] ); ?> <?php echo esc_attr( $label_designation ); ?>">

From 0667b91f80b1153feabbf6673221afb42afc4134 Mon Sep 17 00:00:00 2001
From: Barry Ceelen <barry@multipop.org>
Date: Wed, 11 Jan 2017 11:24:58 +0100
Subject: [PATCH 058/148] Fix missing closing bracket

---
 class.cmb-meta-box.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/class.cmb-meta-box.php b/class.cmb-meta-box.php
index 288e94dd..48fba8c7 100644
--- a/class.cmb-meta-box.php
+++ b/class.cmb-meta-box.php
@@ -407,6 +407,7 @@ static function layout_fields( array $fields ) {
 				// Field Repeatable Max.
 				if ( isset( $field->args['repeatable_max'] ) ) {
 					$attrs[] = sprintf( 'data-rep-max="%s"', intval( $field->args['repeatable_max'] ) );
+				}
 
 				// Ask for confirmation before removing field.
 				if ( isset( $field->args['confirm_delete_field'] ) ) {

From 4adb9d04be504b563ffaf8259198e675ebadc297 Mon Sep 17 00:00:00 2001
From: Barry Ceelen <barry@multipop.org>
Date: Wed, 11 Jan 2017 12:11:59 +0100
Subject: [PATCH 059/148] Update data attribute check

---
 class.cmb-meta-box.php | 4 ++--
 js/cmb.js              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/class.cmb-meta-box.php b/class.cmb-meta-box.php
index 48fba8c7..66f76ee3 100644
--- a/class.cmb-meta-box.php
+++ b/class.cmb-meta-box.php
@@ -410,8 +410,8 @@ static function layout_fields( array $fields ) {
 				}
 
 				// Ask for confirmation before removing field.
-				if ( isset( $field->args['confirm_delete_field'] ) ) {
-					$attrs[] = sprintf( 'data-confirm-delete="%s"', (bool) $field->args['confirm_delete_field'] );
+				if ( isset( $field->args['confirm_delete'] ) ) {
+					$attrs[] = sprintf( 'data-confirm-delete="%s"', $field->args['confirm_delete'] ? 'true' : 'false' );
 				}
 				?>
 
diff --git a/js/cmb.js b/js/cmb.js
index 8848ba3d..faf1c99a 100644
--- a/js/cmb.js
+++ b/js/cmb.js
@@ -104,7 +104,7 @@ var CMB = {
 		fieldItem = jQuery( this ).closest('.field-item' );
 		field = fieldItem.closest( '.field' );
 
-		if ( 1 === field.data('confirm-delete') && ! confirm( CMBData.strings.confirmDeleteField ) ) {
+		if ( false !== field.data('confirm-delete') && ! confirm( CMBData.strings.confirmDeleteField ) ) {
 			return;
 		}
 

From 20ea3e6118b106a4e667320b3572a69302a3df5a Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Thu, 12 Jan 2017 16:04:55 +0100
Subject: [PATCH 060/148] Fixed escaping in WYSIWYG field type - props @ocean90

---
 classes.fields.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes.fields.php b/classes.fields.php
index 556a0965..62f4cfc3 100644
--- a/classes.fields.php
+++ b/classes.fields.php
@@ -1279,7 +1279,7 @@ public function html() {
 			<script>
 				if ( 'undefined' === typeof( cmb_wysiwyg_editors ) )
 					var cmb_wysiwyg_editors = {};
-				cmb_wysiwyg_editors.<?php echo esc_js( $field_id ); ?> = '<?php echo esc_js( $editor ); ?>';
+				cmb_wysiwyg_editors.<?php echo esc_js( $field_id ); ?> = <?php echo json_encode( $editor ); ?>;
 			</script>
 
 			<?php

From ebaa0ef5f5bc3c0dad4e628a1024e7d6f56045f0 Mon Sep 17 00:00:00 2001
From: Ajit Bohra <ajit@lubus.in>
Date: Thu, 12 Jan 2017 23:55:49 +0530
Subject: [PATCH 061/148] India Hindi Translation

---
 languages/cmb-hi_IN.mo | Bin 0 -> 2477 bytes
 languages/cmb-hi_IN.po |  90 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 languages/cmb-hi_IN.mo
 create mode 100644 languages/cmb-hi_IN.po

diff --git a/languages/cmb-hi_IN.mo b/languages/cmb-hi_IN.mo
new file mode 100644
index 0000000000000000000000000000000000000000..611dab989879e86c4ebbf60cc62de03b13f144b8
GIT binary patch
literal 2477
zcmb_d-)|H}9A6Pc&mRbh@j;`bFN*DM?^+4XHno95p|LF&tm4~cx;wpH+?~1X&e7|O
zK}?`T4T%v+fIvv*A^`$~M5T$5Kf-r1FFyEy@r8FkGjsHc*7%^COg}U8{m%FM`Fv(B
zy}x7gSr6ZKj8`!f#>*IkPv8%}72wmr)4*qdUjw%SF9M$jD&PR{4$#!N4}1;y2k;f(
zwoRV512_P@27C{=8TcFUDd6wG=YS7^F90_^>FRC=23WriyoA^s(C~Y(#bE`9&H63i
zPT)S^NgxLf0v`fX;F};j1^f~?0{jK|D{w1B8J!P++kjgj&eVAcSOrc1jlLGp@c0x6
zNgile{QwWN>}T|t8Ycf)j0y&5dM{!a@62a3f|C7=Pbg<UquG9Y;+RaO8S~6!I;TxH
zn`29M2S^SSqTTZL6pSp3HYwY^$r9y~NI_zjG0BKb(vmEuEQ=?+$#yA4PG*^;WUuJ3
z(%V<irb#Xt&LoVm4vi$qL_}pOxOYH^X2!@YZIxtCeVTA#f;47v;2mt|lp_=~GLz=1
zWU)8HWNFDTTBg}Di3&zRAxFOj(~c~qG9i&;VL6rPN+tHQj4Whg$($}op7J;#hl;eB
za+;wKC5xi?gos6wNZBgGp`j)!wHJa&<U>bk!D1?-WXS3BjXvAYr#$wjjP}w;0sn|7
z;(Ec#GVtaEXWn6!i(`+V=jZ%#3#J)IXb~lz>4$bn&VxL*tG{$lj14(lSl``u?$!%&
zltt2?j{T2VQNq!X{Ot}Z^+WUiq;U#ye;*7B$#Au{+ppIA+AtX&35Q1qs=G$2Nc0c0
zW2vdLVcxD0mp4O8>CYFGml>6!2uWpz@@5-v$e(94U$+iPk~XI2DznqG`}-7YLA5d|
zxMUn<U`I$K>&T&2MpHgUqJ$QBF5@50Px+($JkxHG75;u6i8$rWkc=**vhuNifN@qh
z9(BRuRFYaS8tg{IE&aW;WGyO_kOV=0_elL9gR5Zg-ivQuk#DaxXeF&mJ!=;<^QT0S
zmm%RTyDZ0t$B3Jbzs<=T<D|B8tY7m3Jg$gMIsqYZ3f6eM&z6_)K+2i4lp$#}#u{v_
z!Nc0%@K~c`Ai~b03GamOMuR5C%BVr5EO20L%KFpZ0TW7Op7pZq)MeS}TG<8{qUCz>
zj$4elK8*%%GHGsNEoYrF`&#R8(XYbCjRN~SQP##U*Cf0X94#xJR@b%qS*uf8-62|C
z)ZH(%x}v*SpFr?}R^MxNZ(T(Fv=+Ro)h!(Ux8Pl^ZtCs{tyVYAJgL<+M9}dr;JWS}
z2N&J_3Oukr3q}C+`qA!PwtMQf-7>w;TmGwBDG<YYRd-iF9<yHIySn?C&AzAA54Hx5
zV6OVf6P{_LkcqCB!51NL1|=*^lN*)@f=D@q<ZmrYXgcrQKni4Dw!3HT!c^*7YFDua
zeRRBS>wjl=A)v<rjjbBX9&(L{J2ra8)9ReH?wq?GaDujLwu~|Bj9nbJQdjITdwrOp
zA&fxegzhTOE<os(Ep`)Oq&R`bW7iGaU<3`2eTCpm&p!aP;f-8HL1Y^X0RP|@A~$sR
z^m@N=1iRlrCehtXmR0Y5*Mz`dFg8x36)Hb|mym#ndqm)>wEFyi`X}I7o_HP?(4g;`
zQI8j8F5eNu`mtx+f0eKde31r8FwXpF@Hp@zx@Zk^POZOFG;)3;%^vtq|6cwCo2l%R

literal 0
HcmV?d00001

diff --git a/languages/cmb-hi_IN.po b/languages/cmb-hi_IN.po
new file mode 100644
index 00000000..167bec6b
--- /dev/null
+++ b/languages/cmb-hi_IN.po
@@ -0,0 +1,90 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Custom Meta Boxes\n"
+"POT-Creation-Date: 2017-01-12 23:28+0530\n"
+"PO-Revision-Date: 2017-01-12 23:53+0530\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: hi_IN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.7\n"
+"X-Poedit-Basepath: ..\n"
+"X-Poedit-WPHeader: custom-meta-boxes.php\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-KeywordsList: __;_e;_n:1,2;_x:1,2c;_ex:1,2c;_nx:4c,1,2;esc_attr__;"
+"esc_attr_e;esc_attr_x:1,2c;esc_html__;esc_html_e;esc_html_x:1,2c;_n_noop:1,2;"
+"_nx_noop:3c,1,2;__ngettext_noop:1,2\n"
+"X-Poedit-SearchPath-0: .\n"
+"X-Poedit-SearchPathExcluded-0: *.js\n"
+
+#: class.cmb-meta-box.php:144
+msgid "Are you sure you want to delete this field?"
+msgstr "आप इस फील्ड को नष्ट करना चाहते हैं आप सुनिश्चित हैं?"
+
+#: classes.fields.php:94
+msgid "Add New"
+msgstr "नया जोड़ें"
+
+#: classes.fields.php:95 classes.fields.php:622 classes.fields.php:709
+msgid "Remove"
+msgstr "हटाना"
+
+#: classes.fields.php:600
+msgid "Add File"
+msgstr "फाइल जोडें"
+
+#: classes.fields.php:697
+msgid "Add Image"
+msgstr "छवि जोड़ें"
+
+#: classes.fields.php:1433
+msgid "None"
+msgstr "कुछ नहीं "
+
+#: classes.fields.php:1466
+msgid "Type to search"
+msgstr "खोजने के लिए लिखें"
+
+#: classes.fields.php:1862
+msgid "Add New Group"
+msgstr "नया समूह जोड़ें"
+
+#: classes.fields.php:1863
+msgid "Remove Group"
+msgstr "समूह को निकालें"
+
+#: classes.fields.php:2099
+msgid "Drag to set the exact location"
+msgstr "खींचें सटीक स्थान निर्धारित करने के लिए"
+
+#: classes.fields.php:2100
+msgid "Google Maps API not loaded."
+msgstr "गूगल मैप्स एपीआई लोड नहीं।"
+
+#. Plugin Name of the plugin/theme
+msgid "Custom Meta Boxes"
+msgstr "कस्टम मेटा बक्से"
+
+#. Plugin URI of the plugin/theme
+msgid "https://github.com/humanmade/Custom-Meta-Boxes"
+msgstr "https://github.com/humanmade/Custom-Meta-Boxes"
+
+#. Description of the plugin/theme
+msgid ""
+"Lets you easily create metaboxes with custom fields that will blow your "
+"mind. Originally a fork of https://github.com/jaredatch/Custom-Metaboxes-and-"
+"Fields-for-WordPress."
+msgstr ""
+"आप आसानी से कस्टम मेट बॉक्सेस और फ़ील्ड्स बना सकते हैं। मूलतः https://github.com/"
+"jaredatch/Custom-Metaboxes-and-Fields-for-WordPress"
+
+#. Author of the plugin/theme
+msgid "Human Made Limited"
+msgstr "ह्यूमन मेड लिमिटेड "
+
+#. Author URI of the plugin/theme
+msgid "http://hmn.md"
+msgstr "http://hmn.md"

From 032f698e4ee2cb88296c860610588dc1389a2424 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Sat, 14 Jan 2017 17:30:08 +0100
Subject: [PATCH 062/148] wp_json_encode

---
 classes.fields.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes.fields.php b/classes.fields.php
index 62f4cfc3..7b4f7da0 100644
--- a/classes.fields.php
+++ b/classes.fields.php
@@ -1279,7 +1279,7 @@ public function html() {
 			<script>
 				if ( 'undefined' === typeof( cmb_wysiwyg_editors ) )
 					var cmb_wysiwyg_editors = {};
-				cmb_wysiwyg_editors.<?php echo esc_js( $field_id ); ?> = <?php echo json_encode( $editor ); ?>;
+				cmb_wysiwyg_editors.<?php echo esc_js( $field_id ); ?> = <?php echo wp_json_encode( $editor ); ?>;
 			</script>
 
 			<?php

From aec9cdb1b203c61370848df51354c4f98b76531b Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Fri, 20 Jan 2017 14:46:00 +1000
Subject: [PATCH 063/148] Moved default args into a non-getting function and
 now using the getter to filter those arguments

---
 classes.fields.php | 100 +++++++++++++++++++++++++--------------------
 1 file changed, 56 insertions(+), 44 deletions(-)

diff --git a/classes.fields.php b/classes.fields.php
index 7b4f7da0..8ad7e7a8 100644
--- a/classes.fields.php
+++ b/classes.fields.php
@@ -38,9 +38,9 @@ abstract class CMB_Field {
 	 */
 	public function __construct( $name, $title, array $values, $args = array() ) {
 
-		$this->id 		= $name;
-		$this->name		= $name . '[]';
-		$this->title 	= $title;
+		$this->id    = $name;
+		$this->name  = $name . '[]';
+		$this->title = $title;
 		$this->args  = wp_parse_args( $args, $this->get_default_args() );
 
 		// Deprecated argument: 'std'
@@ -68,6 +68,31 @@ public function __construct( $name, $title, array $values, $args = array() ) {
 
 	}
 
+	/**
+	 * Establish baseline default arguments for a field.
+	 *
+	 * @return array Default arguments.
+	 */
+	public function default_args() {
+		return array(
+			'desc'                => '',
+			'repeatable'          => false,
+			'sortable'            => false,
+			'repeatable_max'      => null,
+			'show_label'          => false,
+			'readonly'            => false,
+			'disabled'            => false,
+			'default'             => '',
+			'cols'                => '12',
+			'style'               => '',
+			'class'               => '',
+			'data_delegate'       => null,
+			'save_callback'       => null,
+			'string-repeat-field' => __( 'Add New', 'cmb' ),
+			'string-delete-field' => __( 'Remove', 'cmb' ),
+		);
+	}
+
 	/**
 	 * Get the default args for the abstract field.
 	 * These args are available to all fields.
@@ -75,27 +100,14 @@ public function __construct( $name, $title, array $values, $args = array() ) {
 	 * @return array $args
 	 */
 	public function get_default_args() {
-		return apply_filters(
-			'cmb_field_default_args',
-			array(
-				'desc'                => '',
-				'repeatable'          => false,
-				'sortable'            => false,
-				'repeatable_max'      => null,
-				'show_label'          => false,
-				'readonly'            => false,
-				'disabled'            => false,
-				'default'             => '',
-				'cols'                => '12',
-				'style'               => '',
-				'class'               => '',
-				'data_delegate'       => null,
-				'save_callback'       => null,
-				'string-repeat-field' => __( 'Add New', 'cmb' ),
-				'string-delete-field' => __( 'Remove', 'cmb' ),
-			),
-			get_class( $this )
-		);
+
+		/**
+		 * Filter the default arguments passed by a field class.
+		 *
+		 * @param array $args default field arguments.
+		 * @param string $class Field class being called
+		 */
+		return apply_filters( 'cmb_field_default_args', $this->default_args(), get_class( $this ) );
 	}
 
 	/**
@@ -546,9 +558,9 @@ class CMB_File_Field extends CMB_Field {
 	 *
 	 * @return array Default arguments for field.
 	 */
-	public function get_default_args() {
+	public function default_args() {
 		return array_merge(
-			parent::get_default_args(),
+			parent::default_args(),
 			array(
 				'library-type' => array(
 					'video',
@@ -648,9 +660,9 @@ class CMB_Image_Field extends CMB_File_Field {
 	 *
 	 * @return array Default arguments for field.
 	 */
-	public function get_default_args() {
+	public function default_args() {
 		return array_merge(
-			parent::get_default_args(),
+			parent::default_args(),
 			array(
 				'size' => 'thumbnail',
 				'library-type' => array(
@@ -801,9 +813,9 @@ class CMB_Number_Field extends CMB_Field {
 	 *
 	 * @return array Default arguments for field.
 	 */
-	public function get_default_args() {
+	public function default_args() {
 		return array_merge(
-			parent::get_default_args(),
+			parent::default_args(),
 			array(
 				'step' => '',
 			)
@@ -1122,9 +1134,9 @@ class CMB_Radio_Field extends CMB_Field {
 	 *
 	 * @return array Default arguments for field.
 	 */
-	public function get_default_args() {
+	public function default_args() {
 		return array_merge(
-			parent::get_default_args(),
+			parent::default_args(),
 			array(
 				'options' => array(),
 			)
@@ -1226,9 +1238,9 @@ class CMB_wysiwyg extends CMB_Field {
 	 *
 	 * @return array Default arguments for field.
 	 */
-	public function get_default_args() {
+	public function default_args() {
 		return array_merge(
-			parent::get_default_args(),
+			parent::default_args(),
 			array(
 				'options' => array(),
 			)
@@ -1343,9 +1355,9 @@ public function __construct() {
 	 *
 	 * @return array Default arguments for field.
 	 */
-	public function get_default_args() {
+	public function default_args() {
 		return array_merge(
-			parent::get_default_args(),
+			parent::default_args(),
 			array(
 				'options'         => array(),
 				'multiple'        => false,
@@ -1503,9 +1515,9 @@ class CMB_Taxonomy extends CMB_Select {
 	 *
 	 * @return array Default arguments for field.
 	 */
-	public function get_default_args() {
+	public function default_args() {
 		return array_merge(
-			parent::get_default_args(),
+			parent::default_args(),
 			array(
 				'taxonomy'   => '',
 				'hide_empty' => false,
@@ -1600,9 +1612,9 @@ public function __construct() {
 	 *
 	 * @return array Default arguments for field.
 	 */
-	public function get_default_args() {
+	public function default_args() {
 		return array_merge(
-			parent::get_default_args(),
+			parent::default_args(),
 			array(
 				'query'    => array(),
 				'use_ajax' => false,
@@ -1854,9 +1866,9 @@ function __construct() {
 	 *
 	 * @return array Default arguments for field.
 	 */
-	public function get_default_args() {
+	public function default_args() {
 		return array_merge(
-			parent::get_default_args(),
+			parent::default_args(),
 			array(
 				'fields'              => array(),
 				'string-repeat-field' => __( 'Add New Group', 'cmb' ),
@@ -2087,9 +2099,9 @@ class CMB_Gmap_Field extends CMB_Field {
 	 *
 	 * @return array Default arguments for field.
 	 */
-	public function get_default_args() {
+	public function default_args() {
 		return array_merge(
-			parent::get_default_args(),
+			parent::default_args(),
 			array(
 				'field_width'                 => '100%',
 				'field_height'                => '250px',

From 089af66f641e2af3f2e40f25a782298cc0335cc3 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Fri, 20 Jan 2017 15:44:26 +1000
Subject: [PATCH 064/148] Aligned spacing and removed unnecessary slashes

---
 custom-meta-boxes.php | 54 ++++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/custom-meta-boxes.php b/custom-meta-boxes.php
index 68f47a48..81d77d5d 100755
--- a/custom-meta-boxes.php
+++ b/custom-meta-boxes.php
@@ -34,11 +34,13 @@
 	define( 'CMB_URL', plugins_url( '', __FILE__ ) );
 }
 
+error_log( CMB_PATH );
+
 /**
  * Include base, required files.
  */
-include_once( CMB_PATH . '/classes.fields.php' );
-include_once( CMB_PATH . '/class.cmb-meta-box.php' );
+include_once( CMB_PATH . 'classes.fields.php' );
+include_once( CMB_PATH . 'class.cmb-meta-box.php' );
 include_once( CMB_PATH . 'fields/class-cmb-email-field.php' );
 
 /**
@@ -92,30 +94,30 @@ function _cmb_available_fields() {
 	 * @param $types All available field types.
 	 */
 	return apply_filters( 'cmb_field_types', array(
-		'text'				=> 'CMB_Text_Field',
-		'text_small' 		=> 'CMB_Text_Small_Field',
-		'text_url'			=> 'CMB_URL_Field',
-		'email'             => 'CMB_Email_Field',
-		'url'				=> 'CMB_URL_Field',
-		'radio'				=> 'CMB_Radio_Field',
-		'checkbox'			=> 'CMB_Checkbox',
-		'file'				=> 'CMB_File_Field',
-		'image' 			=> 'CMB_Image_Field',
-		'wysiwyg'			=> 'CMB_wysiwyg',
-		'textarea'			=> 'CMB_Textarea_Field',
-		'textarea_code'		=> 'CMB_Textarea_Field_Code',
-		'select'			=> 'CMB_Select',
-		'taxonomy_select'	=> 'CMB_Taxonomy',
-		'post_select'		=> 'CMB_Post_Select',
-		'date'				=> 'CMB_Date_Field',
-		'date_unix'			=> 'CMB_Date_Timestamp_Field',
-		'datetime_unix'		=> 'CMB_Datetime_Timestamp_Field',
-		'time'				=> 'CMB_Time_Field',
-		'colorpicker'		=> 'CMB_Color_Picker',
-		'title'				=> 'CMB_Title',
-		'group'				=> 'CMB_Group_Field',
-		'gmap'				=> 'CMB_Gmap_Field',
-		'number'			=> 'CMB_Number_Field',
+		'text'            => 'CMB_Text_Field',
+		'text_small'      => 'CMB_Text_Small_Field',
+		'text_url'        => 'CMB_URL_Field',
+		'email'           => 'CMB_Email_Field',
+		'url'             => 'CMB_URL_Field',
+		'radio'           => 'CMB_Radio_Field',
+		'checkbox'        => 'CMB_Checkbox',
+		'file'            => 'CMB_File_Field',
+		'image'           => 'CMB_Image_Field',
+		'wysiwyg'         => 'CMB_wysiwyg',
+		'textarea'        => 'CMB_Textarea_Field',
+		'textarea_code'   => 'CMB_Textarea_Field_Code',
+		'select'          => 'CMB_Select',
+		'taxonomy_select' => 'CMB_Taxonomy',
+		'post_select'     => 'CMB_Post_Select',
+		'date'            => 'CMB_Date_Field',
+		'date_unix'       => 'CMB_Date_Timestamp_Field',
+		'datetime_unix'   => 'CMB_Datetime_Timestamp_Field',
+		'time'            => 'CMB_Time_Field',
+		'colorpicker'     => 'CMB_Color_Picker',
+		'title'           => 'CMB_Title',
+		'group'           => 'CMB_Group_Field',
+		'gmap'            => 'CMB_Gmap_Field',
+		'number'          => 'CMB_Number_Field',
 	) );
 
 }

From 3dcadb78315015567b6f4b8de2da246d45f3ebd8 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Fri, 20 Jan 2017 15:57:23 +1000
Subject: [PATCH 065/148] Added a doing_it_wrong message pertaining to sortable
 non-repeatable fields

---
 class.cmb-meta-box.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/class.cmb-meta-box.php b/class.cmb-meta-box.php
index a4f6f519..f26549c3 100644
--- a/class.cmb-meta-box.php
+++ b/class.cmb-meta-box.php
@@ -390,6 +390,9 @@ static function layout_fields( array $fields ) {
 
 				if ( ! empty( $field->args['sortable'] ) && ! empty( $field->args['repeatable'] ) ) {
 					$classes[] = 'cmb-sortable';
+				} elseif ( ! empty( $field->args['sortable'] ) && empty( $field->args['repeatable'] ) ) {
+					// Throw an error if calling the wrong combination of sortable and repeatable.
+					_doing_it_wrong( 'cmb_meta_boxes', __( 'Calling sortable on a non-repeatable field. A field cannot be sortable without being repeatable.', 'cmb' ), 4.7 );
 				}
 
 				// Assign extra class for has label or has no label.

From 71975982a72fda5c0246107cd2254beff9ab128d Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Fri, 20 Jan 2017 16:02:51 +1000
Subject: [PATCH 066/148] Added append to id filter and replaced array_filter

---
 classes.fields.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/classes.fields.php b/classes.fields.php
index d2d673bb..8c7de6f6 100644
--- a/classes.fields.php
+++ b/classes.fields.php
@@ -132,9 +132,10 @@ public function id_attr( $append = null ) {
 		 * Modify the id attribute of a field.
 		 *
 		 * @param string $id ID Attribute
+		 * @param string $append ID to place.
 		 * @param array $args Arguments for this particular field.
 		 */
-		$id = apply_filters( 'cmb_field_id_attribute', $this->get_the_id_attr( $append ), $this->args );
+		$id = apply_filters( 'cmb_field_id_attribute', $this->get_the_id_attr( $append ), $append, $this->args );
 
 		printf( 'id="%s"', esc_attr( $id ) );
 
@@ -249,7 +250,7 @@ public function class_attr( $classes = '' ) {
 
 		// Combine any passed-in classes and the ones defined in the arguments and sanitize them.
 		$all_classes = array_unique( explode( ' ', $classes . ' ' . $this->args['class'] ) );
-		$classes     = array_map( 'sanitize_html_class', $all_classes );
+		$classes     = array_map( 'sanitize_html_class', array_filter( $all_classes ) );
 
 		/**
 		 * Modify the classes assigned to a field.

From a6511addc53cffeb0305a6d6ff7eb62e6c2323ca Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Fri, 20 Jan 2017 16:08:37 +1000
Subject: [PATCH 067/148] Added more explicit check around class variable

---
 classes.fields.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes.fields.php b/classes.fields.php
index 1136dfb7..ae33e413 100644
--- a/classes.fields.php
+++ b/classes.fields.php
@@ -1843,7 +1843,7 @@ function __construct() {
 
 				$class = _cmb_field_class_for_type( $f['type'] );
 
-				if ( $class && class_exists( $class ) ) {
+				if ( ! empty( $class ) && class_exists( $class ) ) {
 					$this->add_field( new $class( $f['id'], $f['name'], array(), $f ) );
 				}
 			}
@@ -1878,7 +1878,7 @@ public function enqueue_scripts() {
 
 		foreach ( $this->args['fields'] as $f ) {
 			$class = _cmb_field_class_for_type( $f['type'] );
-			if ( $class && class_exists( $class ) ) {
+			if ( ! empty( $class ) && class_exists( $class ) ) {
 				$field = new $class( '', '', array(), $f );
 				$field->enqueue_scripts();
 			}
@@ -1897,7 +1897,7 @@ public function enqueue_styles() {
 
 		foreach ( $this->args['fields'] as $f ) {
 			$class = _cmb_field_class_for_type( $f['type'] );
-			if ( $class && class_exists( $class ) ) {
+			if ( ! empty( $class ) && class_exists( $class ) ) {
 				$field = new $class( '', '', array(), $f );
 				$field->enqueue_styles();
 			}

From 1b65bc945d14c495eed5c401c31707e6b23cee9e Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascal.birchler@gmail.com>
Date: Fri, 20 Jan 2017 08:53:22 +0100
Subject: [PATCH 068/148] Put strict paramt at the right place

---
 class.cmb-meta-box.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/class.cmb-meta-box.php b/class.cmb-meta-box.php
index bcf04204..9734783e 100644
--- a/class.cmb-meta-box.php
+++ b/class.cmb-meta-box.php
@@ -479,7 +479,7 @@ function save( $post_id = 0 ) {
 		}
 
 		// Verify this meta box is for the right post type
-		if ( ! in_array( get_post_type( $post_id ), (array) $this->_meta_box['pages'] ), true ) {
+		if ( ! in_array( get_post_type( $post_id ), (array) $this->_meta_box['pages'], true ) ) {
 			return $post_id;
 		}
 

From aff270f4d1a9282629ba39583d6dc4d8a921c0f8 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Mon, 23 Jan 2017 10:14:05 +1000
Subject: [PATCH 069/148] Small review adjustments

---
 class.cmb-meta-box.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/class.cmb-meta-box.php b/class.cmb-meta-box.php
index d644a73d..0dfd5341 100644
--- a/class.cmb-meta-box.php
+++ b/class.cmb-meta-box.php
@@ -93,7 +93,6 @@ public function init_fields( $post_id = 0 ) {
 				if ( $field->is_displayed() ) {
 					$this->fields[] = $field;
 				}
-				unset( $field );
 			}
 		}
 
@@ -350,7 +349,7 @@ function check_capabilities( $display ) {
 			return $display;
 		}
 
-		return current_user_can( sanitize_text_field( $this->_meta_box['capability'] ) );
+		return current_user_can( $this->_meta_box['capability'] );
 
 	}
 

From 967180bbd4f5c9bae52d9cde973d0c9ee6fb590e Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Fri, 27 Jan 2017 17:12:03 +1000
Subject: [PATCH 070/148] Removed redundant check and brackets

---
 classes.fields.php | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/classes.fields.php b/classes.fields.php
index e3af2311..6c8629e3 100644
--- a/classes.fields.php
+++ b/classes.fields.php
@@ -482,7 +482,7 @@ public function display() {
 			$values = array( '' );
 		} else {
 			$values = $this->get_values(); // Make PHP5.4 >= happy.
-			$values = ( empty( $values ) ) ? array( '' ) : $values;
+			$values = empty( $values ) ? array( '' ) : $values;
 		}
 
 		// Print title if necessary.
@@ -1984,25 +1984,22 @@ public function display() {
 			$values = ( empty( $values ) ) ? array( '' ) : $values;
 		}
 
-		if ( $values ) {
-
-			$i = 0;
-			foreach ( $values as $value ) {
+		$i = 0;
+		foreach ( $values as $value ) {
 
-				$this->field_index = $i;
-				$this->value = $value;
+			$this->field_index = $i;
+			$this->value = $value;
 
-				?>
+			?>
 
-				<div class="field-item" data-class="<?php echo esc_attr( get_class( $this ) ) ?>" style="<?php echo esc_attr( $this->args['style'] ); ?>">
-					<?php $this->html(); ?>
-				</div>
+			<div class="field-item" data-class="<?php echo esc_attr( get_class( $this ) ) ?>" style="<?php echo esc_attr( $this->args['style'] ); ?>">
+				<?php $this->html(); ?>
+			</div>
 
-				<?php
+			<?php
 
-				$i++;
+			$i++;
 
-			}
 		}
 
 		if ( $this->args['repeatable'] ) {

From 7ae8e6a7af9c020fcd8063daab51e775b6ea949e Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Fri, 3 Feb 2017 12:36:43 +1000
Subject: [PATCH 071/148] Added docblock and small CS cleanup

---
 js/cmb.js         | 12 ++++++++++--
 js/file-upload.js |  1 -
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/js/cmb.js b/js/cmb.js
index a8bbe98c..7c9a664a 100644
--- a/js/cmb.js
+++ b/js/cmb.js
@@ -101,10 +101,10 @@ var CMB = {
 		e.preventDefault();
 		jQuery( this ).blur();
 
-		fieldItem = jQuery( this ).closest('.field-item' );
+		fieldItem = jQuery( this ).closest( '.field-item' );
 		field = fieldItem.closest( '.field' );
 
-		if ( false !== field.data('confirm-delete') && ! confirm( CMBData.strings.confirmDeleteField ) ) {
+		if ( false !== field.data( 'confirm-delete' ) && ! confirm( CMBData.strings.confirmDeleteField ) ) {
 			return;
 		}
 
@@ -330,6 +330,14 @@ var CMB = {
 
 	},
 
+	/**
+	 * Simple debouncing function.
+	 *
+	 * @param func func function to run after wait period.
+	 * @param wait int Wait interval.
+	 * @param immediate bool Whether to run immediately or not.
+	 * @returns {Function}
+	 */
 	debounce: function debounce( func, wait, immediate ) {
 		var timeout;
 		return function() {
diff --git a/js/file-upload.js b/js/file-upload.js
index 39d35c5f..14a81881 100644
--- a/js/file-upload.js
+++ b/js/file-upload.js
@@ -139,5 +139,4 @@ jQuery( document ).ready( function() {
 	// Recheck the width every time that the window is re-sized, debounced.
 	window.addEventListener( 'resize', debounce );
 
-
 } );

From a36f7be63c8b459d7c8575483a41bd98c94ff575 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Fri, 3 Feb 2017 14:34:23 +1000
Subject: [PATCH 072/148] Fixed 5.4 array

---
 example-functions.php            | 2 +-
 tests/testCheckboxMultiField.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/example-functions.php b/example-functions.php
index ea2174a1..7a57b9ed 100644
--- a/example-functions.php
+++ b/example-functions.php
@@ -106,7 +106,7 @@ function cmb_sample_metaboxes( array $meta_boxes ) {
 			'id' => 'field-7b',
 			'name' => 'Checkbox-Multi field',
 			'type' => 'checkbox_multi',
-			'default' => [ 'option1' ],
+			'default' => array( 'option1' ),
 			'options' => array(
 				'option0' => 'Option with a really long label',
 				'option1' => 'Option 1',
diff --git a/tests/testCheckboxMultiField.php b/tests/testCheckboxMultiField.php
index fb6be4d2..0f49c3fb 100644
--- a/tests/testCheckboxMultiField.php
+++ b/tests/testCheckboxMultiField.php
@@ -8,8 +8,8 @@ function setUp() {
 		$args = array(
 			'post_author'  => 1,
 			'post_status'  => 'publish',
-			'post_content' => rand_str(),
-			'post_title'   => rand_str(),
+			'post_content' => 'My random and unimportant test string',
+			'post_title'   => 'Random Post',
 			'post_type'    => 'post',
 		);
 

From 8278dd04c28752cc4dc0e7732c03e47e4f8d413a Mon Sep 17 00:00:00 2001
From: Barry Ceelen <barry@multipop.org>
Date: Mon, 6 Feb 2017 16:26:51 +0100
Subject: [PATCH 073/148] Remove call to error_log()

---
 custom-meta-boxes.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/custom-meta-boxes.php b/custom-meta-boxes.php
index 95bfc438..2c1f8e94 100755
--- a/custom-meta-boxes.php
+++ b/custom-meta-boxes.php
@@ -34,8 +34,6 @@
 	define( 'CMB_URL', plugins_url( '', __FILE__ ) );
 }
 
-error_log( CMB_PATH );
-
 /**
  * Include base, required files.
  */

From 3ed1df232078bfd0f3aa31ab15b5c882eae2258c Mon Sep 17 00:00:00 2001
From: Joe Hoyle <joehoyle@gmail.com>
Date: Tue, 7 Feb 2017 16:24:25 +0700
Subject: [PATCH 074/148] Only attempt to call getimagesize() if the icon is
 local.

If it's not, or this perticular string replace doesn't work then we dont' want to be calling `getimagesize()` on remote images. Not having the size information really isn't a big deal so it's an ok compromise I think.
---
 classes.fields.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/classes.fields.php b/classes.fields.php
index 556a0965..80246572 100644
--- a/classes.fields.php
+++ b/classes.fields.php
@@ -584,8 +584,12 @@ public function html() {
 
 		if ( $this->get_value() ) {
 			$src = wp_mime_type_icon( $this->get_value() );
-			$size = getimagesize( str_replace( site_url(), ABSPATH, $src ) );
-			$icon_img = '<img src="' . $src . '" ' . $size[3] . ' />';
+			if ( strpos( $src, site_url() !== false ) ) {
+				$size = getimagesize( str_replace( site_url(), ABSPATH, $src ) );
+			} else {
+				$size = null;
+			}
+			$icon_img = '<img src="' . $src . '" ' . ( $size ? $size[3] : '' ) . ' />';
 		}
 
 		$data_type = ( ! empty( $this->args['library-type'] ) ? implode( ',', $this->args['library-type'] ) : null );

From c2fec552c6f24e148a89caeb0cd7f38b790dea02 Mon Sep 17 00:00:00 2001
From: Barry Ceelen <barry@multipop.org>
Date: Tue, 7 Feb 2017 11:16:29 +0100
Subject: [PATCH 075/148] Add dutch and german translations

---
 languages/cmb-de_DE.mo | Bin 0 -> 1755 bytes
 languages/cmb-de_DE.po | 104 +++++++++++++++++++++++++++++++++++++++++
 languages/cmb-nl_NL.mo | Bin 0 -> 1714 bytes
 languages/cmb-nl_NL.po | 104 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 208 insertions(+)
 create mode 100644 languages/cmb-de_DE.mo
 create mode 100644 languages/cmb-de_DE.po
 create mode 100644 languages/cmb-nl_NL.mo
 create mode 100644 languages/cmb-nl_NL.po

diff --git a/languages/cmb-de_DE.mo b/languages/cmb-de_DE.mo
new file mode 100644
index 0000000000000000000000000000000000000000..07460485353da9a50fe04f702f593caef89bee19
GIT binary patch
literal 1755
zcmZvcO>Y}T7{>=FZ>GFnIDp_GC!pEIYY>grN~63uA!-t=B&CRp8Sg&!PP3k|W@c+Q
z0xodjTEP(^apH^+C&Yn%0KNgAh5vXRJ1re)_BSuj`_9b2uU+|3puLR#Ci)NPucKdm
z0w1&jd=6CL^PmNv1-}Ac1iu5Xf%m~L!N0(_z_*_i;tlWycm@1o&K~#-<~ev3JOdlx
z6nqK%7W^6gKKiSex1JW_6>tX(G2Q}0d<=dJehq#P{tj+{H()&Y{{{?xe*&>3egQ-L
zzk<QeZ(#8MH~0eh4~WpkQ|KYzu!az3E!YV<K|bUh;tV!J3$+L><Ny<k7JNO_HuIcz
zRmma@_D6D9kB)dUTLEd$nrbXIEz><yk*nr|iPWCFp`1(hOukT#28zpkLu|{kRC-9x
zSTFk}lhGte8y#65v#i%<vN3JeN|Z^hji){@wI<3JrV4Ap*itnXJ5~;ZZ^sCsVB)FF
zJe4MsUKuU+j2Xh~p&UEf?C!&J*pxZvu{e?=7Dq<2IOdVLdx3eD$BX#H>Af+s3O=OG
z3emOZ4re~v&!f-SI=D$`yK>%)=#agnEi+};=ze+{ZCj*>{b)yePN~&Qu1C#Q)Vxkf
zk|xQuX3}gzFgoVDD%g3vT&tElkj_V^R%%yDZ){491F44<{!?_ya&&2);!pH;I*r5q
z!_G3qByKjgjrOcz1{tN~dFnqHms06AWreh;;rgx9-Dqto7u*flMjf4*9JNnrt*?CJ
z^JtGX+d7V};aqu2;<Y$QuvO2aE$MhHeUVZeFIR7OKVg&~;b*gwMI)3f>W7lW<6_+C
zmX(!dv}^3hrKHERsatQgsUEJstLdF}O5STPZJwCQX1rZzkW!t(B95DUZ(?lj4wUmL
z^?L0dw|hEGR$J}fG$6yu#XwKfkFwRU$1dwh?=2J-LtYN&3Sq18qjD}a8`e^@;lgZB
z8#Atb>S;asu=dmI=^^{@D;6@BGMk;aE~*$cQOCz^bf#HZ;XDU{_v1URA;Mu(R49F3
z4IcbCWG%K-nLo5}#MPs7#<{P?IOvxZPn6E-MByf?tYEuJxpZ!}kSliVXcxDf$_IZq
zY-^gBvShu12pp|kT=^B+L>W~d*B5_)aDz$1nvW)maS#eq_NBcrbzTh_>yC9y9Z1gX
zpW#8MbuL?V!P11W1?8DVT3NmfE5TVTy0|Onit$h(U_1l%43kO^SE(A|mS{qGWCfmh
zsdGG1G++dIUQx-Ra{qfjLgY{?afbE$3Au?tSah_<MbSa0uH!{j#O+IYijyiU`aHC1
HFcAL%%(L?2

literal 0
HcmV?d00001

diff --git a/languages/cmb-de_DE.po b/languages/cmb-de_DE.po
new file mode 100644
index 00000000..b10e2b2f
--- /dev/null
+++ b/languages/cmb-de_DE.po
@@ -0,0 +1,104 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Custom Meta Boxes\n"
+"POT-Creation-Date: 2017-02-07 11:11+0100\n"
+"PO-Revision-Date: 2017-02-07 11:12+0100\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: de_DE\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.11\n"
+"X-Poedit-Basepath: ..\n"
+"X-Poedit-WPHeader: custom-meta-boxes.php\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-KeywordsList: __;_e;_n:1,2;_x:1,2c;_ex:1,2c;_nx:4c,1,2;esc_attr__;"
+"esc_attr_e;esc_attr_x:1,2c;esc_html__;esc_html_e;esc_html_x:1,2c;_n_noop:1,2;"
+"_nx_noop:3c,1,2;__ngettext_noop:1,2\n"
+"X-Poedit-SearchPath-0: .\n"
+"X-Poedit-SearchPathExcluded-0: *.js\n"
+
+#: class.cmb-meta-box.php:163
+msgid "Are you sure you want to delete this field?"
+msgstr "Sind Sie sicher, dass Sie dieses Feld löschen wollen?"
+
+#: class.cmb-meta-box.php:455
+msgid ""
+"Calling sortable on a non-repeatable field. A field cannot be sortable "
+"without being repeatable."
+msgstr ""
+"Das \"sortable\" Attribut ist ein nicht-wiederholbares Feld zugewiesen. Ein "
+"Feld kann nicht \"sortable\" sein wenn es nicht \"repeatable\" ist."
+
+#: classes.fields.php:92
+msgid "Add New"
+msgstr "Neu hinzufügen"
+
+#: classes.fields.php:93 classes.fields.php:729 classes.fields.php:816
+msgid "Remove"
+msgstr "Entfernen"
+
+#: classes.fields.php:707
+msgid "Add File"
+msgstr "Datei hinzufügen"
+
+#: classes.fields.php:804
+msgid "Add Image"
+msgstr "Bild hinzufügen"
+
+#: classes.fields.php:1539
+msgid "None"
+msgstr "Keine"
+
+#: classes.fields.php:1572
+msgid "Type to search"
+msgstr "Suchbegriff"
+
+#: classes.fields.php:1970
+msgid "Add New Group"
+msgstr "Neue Gruppe hinzufügen"
+
+#: classes.fields.php:1971
+msgid "Remove Group"
+msgstr "Gruppe löschen"
+
+#: example-functions.php:42
+msgid "Name"
+msgstr "Name"
+
+#: example-functions.php:45
+msgid "Repeatable"
+msgstr "Wiederholbar"
+
+#: example-functions.php:200 fields/class-cmb-gmap-field.php:37
+msgid "Drag to set the exact location"
+msgstr "Platziere die Markierung, um den genauen Standort fest zu legen"
+
+#: example-functions.php:203 fields/class-cmb-gmap-field.php:38
+msgid "Google Maps API not loaded."
+msgstr "Google Maps API nicht geladen."
+
+#. Plugin Name of the plugin/theme
+msgid "Custom Meta Boxes"
+msgstr ""
+
+#. Plugin URI of the plugin/theme
+msgid "https://github.com/humanmade/Custom-Meta-Boxes"
+msgstr ""
+
+#. Description of the plugin/theme
+msgid ""
+"Lets you easily create metaboxes with custom fields that will blow your "
+"mind. Originally a fork of https://github.com/jaredatch/Custom-Metaboxes-and-"
+"Fields-for-WordPress."
+msgstr ""
+
+#. Author of the plugin/theme
+msgid "Human Made Limited"
+msgstr ""
+
+#. Author URI of the plugin/theme
+msgid "http://hmn.md"
+msgstr ""
diff --git a/languages/cmb-nl_NL.mo b/languages/cmb-nl_NL.mo
new file mode 100644
index 0000000000000000000000000000000000000000..c385b83edfa4d5f52f91ac211c941782e3b28133
GIT binary patch
literal 1714
zcmZvcTW{nv6vquLEDQ^15dw+p;SJbLm<*t;GAgUyx1#Ni+JOaLf+snhWSX%f+v!Xz
zBp%=$X$4O_z!M*X2R;a&g};;OOc86z`5oKG=N8-lyn5qTf%Xde+vvZbzkz=1DSXg!
z@OiKRUjPkw6Z{^03H%AX13m`71OEcw1>bvGh_}Gc!5iSW3nt)m7-!%u@C@vLbMR&G
zNAP#_$LO~)?ma8SYv4BM{eJ_#4yK^@dkI?bPp}8R3FGg8hoJX+wqOPN{Wa)w{Q-Ot
z{2BE2eghG@cn00)>(>xM)4UzO$H(h)_Hn{p(|j#_^Etr8vUy+sX&YHayG6;u3;R<!
zZlxohH8UXX8C_Rm!!TXwnryugW>PtFnldigF}b|3bXstk-4|Q3EDJRztBsSRl1VF)
zq_heQS1jAPMmMC5b`zyiDeY*)t6j6g<+}EB-q>nuD7K9pd*7B3Le9i<nK~+UDqW$K
z*wcCpuZOa-v@zI+XTK;j&O&h{r!0=NVsXq<eSU>SmdDHZ#PFg*R^Ep+X)XpvPdIhK
zeinSi#==cZTeWq1N{8$uZR$DO&fwuN*fK~F>%q2k98<3w-3z+CpnH#^D2{q}x>2_a
z#o(CF3vcJidY`p=2hzG=Xr!{GblSw!Ign~x<39yMmeXtFm{ge@9dr)&4|i4}Mq#(J
zrIlj^Gsq|=$8+~_Rmwv3Db1xp4cEUM?gncsJ@4+6O|YX<ouT$It&IxT`8wER#ios8
zpgAiXMd4Z)MObRb!KSoaNteeIhO5~}g9nWABmA@}SujP(f{`y-Smjk`P}WA4!LBw_
zi#)1kXxDpvYQ^;r6urMr(TDw&%@bXll(*UpVro-Z#_<JT%(ThuL1A4?NzzZapQt#x
z+v_KDj}$Xkf||#lrg!}s+cc5R8EjaJyb>21{8H|w<wC0wTdhW1noX3}RqIpD+rcNT
zpCnOZcK%l^b*^RBoVWq17<5s`CoSyE)3U~S_6i?`6WbA+Y@JjY4K<%@9<ve~rz6I7
z^moTCCs)fy1=lmCvC&*zQ+UL<QxpFCk4rvdLz(m=^1u2V#%NZQ4j*e--4`dz`&|*U
zB2};payGe?<w)Y4XtwBT%-#vBkanQeOrFVBy}9koW+bJd%VMJFQY)O4#&M2NmgcZt
z*if95jCeDqsWd)7+&>JO2Y?qZ08^oG%*i?~OBCXN&jG@uF_$=z%0CElD)tb*z`dRo
c6F6T<ZF$6ltDK~1--WzrUBk<zMxm7W7r$QLwEzGB

literal 0
HcmV?d00001

diff --git a/languages/cmb-nl_NL.po b/languages/cmb-nl_NL.po
new file mode 100644
index 00000000..8c052f32
--- /dev/null
+++ b/languages/cmb-nl_NL.po
@@ -0,0 +1,104 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Custom Meta Boxes\n"
+"POT-Creation-Date: 2017-02-07 11:12+0100\n"
+"PO-Revision-Date: 2017-02-07 11:15+0100\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: nl_NL\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.11\n"
+"X-Poedit-Basepath: ..\n"
+"X-Poedit-WPHeader: custom-meta-boxes.php\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-KeywordsList: __;_e;_n:1,2;_x:1,2c;_ex:1,2c;_nx:4c,1,2;esc_attr__;"
+"esc_attr_e;esc_attr_x:1,2c;esc_html__;esc_html_e;esc_html_x:1,2c;_n_noop:1,2;"
+"_nx_noop:3c,1,2;__ngettext_noop:1,2\n"
+"X-Poedit-SearchPath-0: .\n"
+"X-Poedit-SearchPathExcluded-0: *.js\n"
+
+#: class.cmb-meta-box.php:163
+msgid "Are you sure you want to delete this field?"
+msgstr "Weet je zeker dat je dit veld wilt wissen?"
+
+#: class.cmb-meta-box.php:455
+msgid ""
+"Calling sortable on a non-repeatable field. A field cannot be sortable "
+"without being repeatable."
+msgstr ""
+"Sortable op een niet-herhaalbare veld opgeroepen. Een veld kan niet "
+"sorteerbaar zijn zonder dat het herhaalbaar is."
+
+#: classes.fields.php:92
+msgid "Add New"
+msgstr "Toevoegen"
+
+#: classes.fields.php:93 classes.fields.php:729 classes.fields.php:816
+msgid "Remove"
+msgstr "Verwijder"
+
+#: classes.fields.php:707
+msgid "Add File"
+msgstr "Bestand Toevoegen"
+
+#: classes.fields.php:804
+msgid "Add Image"
+msgstr "Afbeelding toevoegen"
+
+#: classes.fields.php:1539
+msgid "None"
+msgstr "Geen"
+
+#: classes.fields.php:1572
+msgid "Type to search"
+msgstr "Type hier om te zoeken"
+
+#: classes.fields.php:1970
+msgid "Add New Group"
+msgstr "Nieuwe groep toevoegen"
+
+#: classes.fields.php:1971
+msgid "Remove Group"
+msgstr "Verwijder groep"
+
+#: example-functions.php:42
+msgid "Name"
+msgstr "Naam"
+
+#: example-functions.php:45
+msgid "Repeatable"
+msgstr "Herhaalbaar"
+
+#: example-functions.php:200 fields/class-cmb-gmap-field.php:37
+msgid "Drag to set the exact location"
+msgstr "Sleep de marker om de exacte locatie in te stellen"
+
+#: example-functions.php:203 fields/class-cmb-gmap-field.php:38
+msgid "Google Maps API not loaded."
+msgstr "Google Maps API niet geladen."
+
+#. Plugin Name of the plugin/theme
+msgid "Custom Meta Boxes"
+msgstr ""
+
+#. Plugin URI of the plugin/theme
+msgid "https://github.com/humanmade/Custom-Meta-Boxes"
+msgstr ""
+
+#. Description of the plugin/theme
+msgid ""
+"Lets you easily create metaboxes with custom fields that will blow your "
+"mind. Originally a fork of https://github.com/jaredatch/Custom-Metaboxes-and-"
+"Fields-for-WordPress."
+msgstr ""
+
+#. Author of the plugin/theme
+msgid "Human Made Limited"
+msgstr ""
+
+#. Author URI of the plugin/theme
+msgid "http://hmn.md"
+msgstr ""

From e498ae78217cbf0320f8fb2f6384ee192579432d Mon Sep 17 00:00:00 2001
From: Tarei King <tareiking@gmail.com>
Date: Thu, 23 Feb 2017 13:29:58 +1300
Subject: [PATCH 076/148] Refactor `ed.render` to correct position.

---
 js/field-wysiwyg.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/field-wysiwyg.js b/js/field-wysiwyg.js
index b7640210..a2c311ef 100644
--- a/js/field-wysiwyg.js
+++ b/js/field-wysiwyg.js
@@ -63,8 +63,8 @@ CMB.addCallbackForClonedField( 'CMB_wysiwyg', function( newT ) {
 				var ed = tinymce.init( tinyMCEPreInit.mceInit[id] );
 			} else if ( tinyMCE.majorVersion === '3' ) {
 				var ed = new tinymce.Editor( id, tinyMCEPreInit.mceInit[id] );
+				ed.render();
 			}
-			ed.render();
 		}
 
 		// Init Quicktags.

From 11d04a49cbb49922476a45f465e8bf182e8ff21e Mon Sep 17 00:00:00 2001
From: Tarei King <tareiking@gmail.com>
Date: Thu, 23 Feb 2017 13:51:06 +1300
Subject: [PATCH 077/148] Check QuickTags on wysiwyg should be inited.

---
 js/field-wysiwyg.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/js/field-wysiwyg.js b/js/field-wysiwyg.js
index a2c311ef..a1c32ea8 100644
--- a/js/field-wysiwyg.js
+++ b/js/field-wysiwyg.js
@@ -67,12 +67,13 @@ CMB.addCallbackForClonedField( 'CMB_wysiwyg', function( newT ) {
 			}
 		}
 
-		// Init Quicktags.
-		QTags.instances[0] = undefined;
-		try {
-			quicktags( tinyMCEPreInit.qtInit[ id ] );
-		} catch ( e ) {}
-
+		// Init Quicktags, only if we have have QuickTags specified.
+		if ( ! jQuery.isEmptyObject( newQTS ) ) {
+			QTags.instances[ 0 ] = undefined;
+			try {
+				quicktags( tinyMCEPreInit.qtInit[ id ] );
+			} catch ( e ) {}
+		}
 	} );
 
 } );

From f54918f672076b5e0374739e42ba5fbce41a667b Mon Sep 17 00:00:00 2001
From: Tarei King <tareiking@gmail.com>
Date: Thu, 23 Feb 2017 17:15:29 +1300
Subject: [PATCH 078/148] Add CMB_VERSION const.

---
 class.cmb-meta-box.php          |  6 +++---
 classes.fields.php              | 16 ++++++++--------
 custom-meta-boxes.php           |  2 ++
 fields/class-cmb-gmap-field.php |  2 +-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/class.cmb-meta-box.php b/class.cmb-meta-box.php
index cbf97b17..ebaf3e26 100644
--- a/class.cmb-meta-box.php
+++ b/class.cmb-meta-box.php
@@ -156,7 +156,7 @@ public function init_fields_for_post() {
 	 */
 	function enqueue_scripts() {
 
-		wp_enqueue_script( 'cmb-scripts', trailingslashit( CMB_URL ) . 'js/cmb.js', array( 'jquery' ) );
+		wp_enqueue_script( 'cmb-scripts', trailingslashit( CMB_URL ) . 'js/cmb.js', array( 'jquery' ), CMB_VERSION );
 
 		wp_localize_script( 'cmb-scripts', 'CMBData', array(
 			'strings' => array(
@@ -180,9 +180,9 @@ function enqueue_styles() {
 		$suffix = CMB_DEV ? '' : '.min';
 
 		if ( version_compare( get_bloginfo( 'version' ), '3.8', '>=' ) ) {
-			wp_enqueue_style( 'cmb-styles', trailingslashit( CMB_URL ) . "css/dist/cmb$suffix.css" );
+			wp_enqueue_style( 'cmb-styles', trailingslashit( CMB_URL ) . "css/dist/cmb$suffix.css", CMB_VERSION );
 		} else {
-			wp_enqueue_style( 'cmb-styles', trailingslashit( CMB_URL ) . 'css/legacy.css' );
+			wp_enqueue_style( 'cmb-styles', trailingslashit( CMB_URL ) . 'css/legacy.css', CMB_VERSION );
 		}
 
 		foreach ( $this->fields as $field ) {
diff --git a/classes.fields.php b/classes.fields.php
index b3d99864..e41a4a45 100644
--- a/classes.fields.php
+++ b/classes.fields.php
@@ -676,7 +676,7 @@ function enqueue_scripts() {
 		parent::enqueue_scripts();
 
 		wp_enqueue_media( array( 'post' => $post_ID ) );
-		wp_enqueue_script( 'cmb-file-upload', trailingslashit( CMB_URL ) . 'js/file-upload.js', array( 'jquery', 'cmb-scripts' ) );
+		wp_enqueue_script( 'cmb-file-upload', trailingslashit( CMB_URL ) . 'js/file-upload.js', array( 'jquery', 'cmb-scripts' ), CMB_VERSION );
 
 	}
 
@@ -967,7 +967,7 @@ class CMB_Date_Field extends CMB_Field {
 	public function enqueue_scripts() {
 		parent::enqueue_scripts();
 		wp_enqueue_style( 'cmb-jquery-ui', trailingslashit( CMB_URL ) . 'css/vendor/jquery-ui/jquery-ui.css', '1.10.3' );
-		wp_enqueue_script( 'cmb-datetime', trailingslashit( CMB_URL ) . 'js/field.datetime.js', array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'cmb-scripts' ) );
+		wp_enqueue_script( 'cmb-datetime', trailingslashit( CMB_URL ) . 'js/field.datetime.js', array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'cmb-scripts' ), CMB_VERSION );
 	}
 
 	/**
@@ -1006,7 +1006,7 @@ public function enqueue_scripts() {
 		wp_enqueue_style( 'cmb-jquery-ui', trailingslashit( CMB_URL ) . 'css/vendor/jquery-ui/jquery-ui.css', '1.10.3' );
 
 		wp_enqueue_script( 'cmb-timepicker', trailingslashit( CMB_URL ) . 'js/jquery.timePicker.min.js', array( 'jquery', 'cmb-scripts' ) );
-		wp_enqueue_script( 'cmb-datetime', trailingslashit( CMB_URL ) . 'js/field.datetime.js', array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'cmb-scripts' ) );
+		wp_enqueue_script( 'cmb-datetime', trailingslashit( CMB_URL ) . 'js/field.datetime.js', array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'cmb-scripts' ), CMB_VERSION );
 	}
 
 	/**
@@ -1042,7 +1042,7 @@ public function enqueue_scripts() {
 		wp_enqueue_style( 'cmb-jquery-ui', trailingslashit( CMB_URL ) . 'css/vendor/jquery-ui/jquery-ui.css', '1.10.3' );
 
 		wp_enqueue_script( 'cmb-timepicker', trailingslashit( CMB_URL ) . 'js/jquery.timePicker.min.js', array( 'jquery', 'cmb-scripts' ) );
-		wp_enqueue_script( 'cmb-datetime', trailingslashit( CMB_URL ) . 'js/field.datetime.js', array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'cmb-scripts' ) );
+		wp_enqueue_script( 'cmb-datetime', trailingslashit( CMB_URL ) . 'js/field.datetime.js', array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'cmb-scripts' ), CMB_VERSION );
 
 	}
 
@@ -1092,7 +1092,7 @@ public function enqueue_scripts() {
 		wp_enqueue_style( 'cmb-jquery-ui', trailingslashit( CMB_URL ) . 'css/vendor/jquery-ui/jquery-ui.css', '1.10.3' );
 
 		wp_enqueue_script( 'cmb-timepicker', trailingslashit( CMB_URL ) . 'js/jquery.timePicker.min.js', array( 'jquery', 'cmb-scripts' ) );
-		wp_enqueue_script( 'cmb-datetime', trailingslashit( CMB_URL ) . 'js/field.datetime.js', array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'cmb-scripts' ) );
+		wp_enqueue_script( 'cmb-datetime', trailingslashit( CMB_URL ) . 'js/field.datetime.js', array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'cmb-scripts' ), CMB_VERSION );
 	}
 
 	/**
@@ -1196,7 +1196,7 @@ public function enqueue_scripts() {
 
 		parent::enqueue_scripts();
 
-		wp_enqueue_script( 'cmb-colorpicker', trailingslashit( CMB_URL ) . 'js/field.colorpicker.js', array( 'jquery', 'wp-color-picker', 'cmb-scripts' ) );
+		wp_enqueue_script( 'cmb-colorpicker', trailingslashit( CMB_URL ) . 'js/field.colorpicker.js', array( 'jquery', 'wp-color-picker', 'cmb-scripts' ), CMB_VERSION );
 		wp_enqueue_style( 'wp-color-picker' );
 	}
 
@@ -1350,7 +1350,7 @@ function enqueue_scripts() {
 
 		parent::enqueue_scripts();
 
-		wp_enqueue_script( 'cmb-wysiwyg', trailingslashit( CMB_URL ) . 'js/field-wysiwyg.js', array( 'jquery', 'cmb-scripts' ) );
+		wp_enqueue_script( 'cmb-wysiwyg', trailingslashit( CMB_URL ) . 'js/field-wysiwyg.js', array( 'jquery', 'cmb-scripts' ), CMB_VERSION );
 	}
 
 	/**
@@ -1496,7 +1496,7 @@ public function enqueue_scripts() {
 		parent::enqueue_scripts();
 
 		wp_enqueue_script( 'select2', trailingslashit( CMB_URL ) . 'js/vendor/select2/select2.js', array( 'jquery' ) );
-		wp_enqueue_script( 'field-select', trailingslashit( CMB_URL ) . 'js/field.select.js', array( 'jquery', 'select2', 'cmb-scripts' ) );
+		wp_enqueue_script( 'field-select', trailingslashit( CMB_URL ) . 'js/field.select.js', array( 'jquery', 'select2', 'cmb-scripts' ), CMB_VERSION );
 	}
 
 	/**
diff --git a/custom-meta-boxes.php b/custom-meta-boxes.php
index 2c1f8e94..de6a1611 100755
--- a/custom-meta-boxes.php
+++ b/custom-meta-boxes.php
@@ -22,6 +22,8 @@
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+define( 'CMB_VERSION', '1.0.3' );
+
 if ( ! defined( 'CMB_DEV' ) ) {
 	define( 'CMB_DEV', false );
 }
diff --git a/fields/class-cmb-gmap-field.php b/fields/class-cmb-gmap-field.php
index 854c3c78..cbb864b0 100644
--- a/fields/class-cmb-gmap-field.php
+++ b/fields/class-cmb-gmap-field.php
@@ -50,7 +50,7 @@ public function enqueue_scripts() {
 
 		parent::enqueue_scripts();
 
-		wp_enqueue_script( 'cmb-google-maps-script', trailingslashit( CMB_URL ) . 'js/field-gmap.js', array( 'jquery' ) );
+		wp_enqueue_script( 'cmb-google-maps-script', trailingslashit( CMB_URL ) . 'js/field-gmap.js', array( 'jquery' ), CMB_VERSION );
 
 		// Check for our key with either a field argument or constant.
 		$key = '';

From fcf9c889400bb9b52c72abeb61d7331fc54c7864 Mon Sep 17 00:00:00 2001
From: Tarei King <tareiking@gmail.com>
Date: Thu, 23 Feb 2017 17:25:24 +1300
Subject: [PATCH 079/148] Add missing deps param. Props @mikeselander

---
 class.cmb-meta-box.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/class.cmb-meta-box.php b/class.cmb-meta-box.php
index ebaf3e26..c5634fab 100644
--- a/class.cmb-meta-box.php
+++ b/class.cmb-meta-box.php
@@ -180,9 +180,9 @@ function enqueue_styles() {
 		$suffix = CMB_DEV ? '' : '.min';
 
 		if ( version_compare( get_bloginfo( 'version' ), '3.8', '>=' ) ) {
-			wp_enqueue_style( 'cmb-styles', trailingslashit( CMB_URL ) . "css/dist/cmb$suffix.css", CMB_VERSION );
+			wp_enqueue_style( 'cmb-styles', trailingslashit( CMB_URL ) . "css/dist/cmb$suffix.css", array(), CMB_VERSION );
 		} else {
-			wp_enqueue_style( 'cmb-styles', trailingslashit( CMB_URL ) . 'css/legacy.css', CMB_VERSION );
+			wp_enqueue_style( 'cmb-styles', trailingslashit( CMB_URL ) . 'css/legacy.css', array(), CMB_VERSION );
 		}
 
 		foreach ( $this->fields as $field ) {

From 92d87b5a7d50f28ac58f271398f5831f95a6f1bc Mon Sep 17 00:00:00 2001
From: Tarei King <tareiking@gmail.com>
Date: Thu, 23 Feb 2017 17:25:54 +1300
Subject: [PATCH 080/148] Let's check whether CMB_VERSION is already specified.

---
 custom-meta-boxes.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/custom-meta-boxes.php b/custom-meta-boxes.php
index de6a1611..43a4639a 100755
--- a/custom-meta-boxes.php
+++ b/custom-meta-boxes.php
@@ -22,7 +22,9 @@
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-define( 'CMB_VERSION', '1.0.3' );
+if ( ! defined( 'CMB_VERSION' ) ) {
+	define( 'CMB_VERSION', '1.0.3' );
+}
 
 if ( ! defined( 'CMB_DEV' ) ) {
 	define( 'CMB_DEV', false );

From e9909752c42b30ba741c009b3c8d53e99ad24c87 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Fri, 24 Feb 2017 11:04:32 +1300
Subject: [PATCH 081/148] Moved all fields to their own files

---
 class.cmb-meta-box.php                        |   31 +
 classes.fields.php                            | 2180 -----------------
 custom-meta-boxes.php                         |   33 +-
 fields/class-cmb-checkbox-multi.php           |   11 +-
 fields/class-cmb-checkbox.php                 |   31 +
 fields/class-cmb-color-picker.php             |   38 +
 fields/class-cmb-date-field.php               |   39 +
 fields/class-cmb-date-timestamp-field.php     |   55 +
 fields/class-cmb-datetime-timestamp-field.php |   63 +
 fields/class-cmb-email-field.php              |   11 +-
 fields/class-cmb-field.php                    |  588 +++++
 fields/class-cmb-file-field.php               |  112 +
 fields/class-cmb-gmap-field.php               |   11 +-
 fields/class-cmb-group-field.php              |  270 ++
 fields/class-cmb-hidden-field.php             |   11 +-
 fields/class-cmb-image-field.php              |  159 ++
 fields/class-cmb-number-field.php             |   39 +
 fields/class-cmb-post-select.php              |  215 ++
 fields/class-cmb-radio-field.php              |   52 +
 fields/class-cmb-select.php                   |  181 ++
 fields/class-cmb-taxonomy.php                 |   78 +
 fields/class-cmb-text-field.php               |   25 +
 fields/class-cmb-text-small-field.php         |   25 +
 fields/class-cmb-textarea-field-code.php      |   28 +
 fields/class-cmb-textarea-field.php           |   28 +
 fields/class-cmb-time-field.php               |   40 +
 fields/class-cmb-title.php                    |   35 +
 fields/class-cmb-url-field.php                |   25 +
 fields/class-cmb-wysiwyg.php                  |  104 +
 29 files changed, 2308 insertions(+), 2210 deletions(-)
 delete mode 100644 classes.fields.php
 create mode 100644 fields/class-cmb-checkbox.php
 create mode 100644 fields/class-cmb-color-picker.php
 create mode 100644 fields/class-cmb-date-field.php
 create mode 100644 fields/class-cmb-date-timestamp-field.php
 create mode 100644 fields/class-cmb-datetime-timestamp-field.php
 create mode 100644 fields/class-cmb-field.php
 create mode 100644 fields/class-cmb-file-field.php
 create mode 100644 fields/class-cmb-group-field.php
 create mode 100644 fields/class-cmb-image-field.php
 create mode 100644 fields/class-cmb-number-field.php
 create mode 100644 fields/class-cmb-post-select.php
 create mode 100644 fields/class-cmb-radio-field.php
 create mode 100644 fields/class-cmb-select.php
 create mode 100644 fields/class-cmb-taxonomy.php
 create mode 100644 fields/class-cmb-text-field.php
 create mode 100644 fields/class-cmb-text-small-field.php
 create mode 100644 fields/class-cmb-textarea-field-code.php
 create mode 100644 fields/class-cmb-textarea-field.php
 create mode 100644 fields/class-cmb-time-field.php
 create mode 100644 fields/class-cmb-title.php
 create mode 100644 fields/class-cmb-url-field.php
 create mode 100644 fields/class-cmb-wysiwyg.php

diff --git a/class.cmb-meta-box.php b/class.cmb-meta-box.php
index c5634fab..409cb882 100644
--- a/class.cmb-meta-box.php
+++ b/class.cmb-meta-box.php
@@ -55,6 +55,7 @@ function __construct( $meta_box ) {
 
 		add_action( 'admin_enqueue_scripts', array( &$this, 'enqueue_scripts' ) );
 		add_action( 'admin_enqueue_scripts', array( &$this, 'enqueue_styles' ) );
+		add_action( 'wp_ajax_cmb_post_select', array( $this, 'cmb_ajax_post_select' ) );
 
 		// Default filters for whether to show a metabox block or not.
 		add_filter( 'cmb_is_metabox_displayed', array( $this, 'add_for_id' ), 2, 2 );
@@ -608,4 +609,34 @@ function get_post_id() {
 		return (int) $post_id;
 
 	}
+
+	/**
+	 * AJAX callback for select fields.
+	 */
+	public function cmb_ajax_post_select() {
+
+		$post_id = ! empty( $_POST['post_id'] ) ? absint( $_POST['post_id'] ) : false;
+		$nonce   = ! empty( $_POST['nonce'] ) ? $_POST['nonce'] : false;
+		$args    = ! empty( $_POST['query'] ) ? $_POST['query'] : array();
+
+		if ( ! $nonce || ! wp_verify_nonce( $nonce, 'cmb_select_field' ) || ! current_user_can( 'edit_post', $post_id ) ) {
+			echo json_encode( array( 'total' => 0, 'posts' => array() ) );
+			exit;
+		}
+
+		$args['fields'] = 'ids'; // Only need to retrieve post IDs.
+
+		$query = new WP_Query( $args );
+
+		$json = array( 'total' => $query->found_posts, 'posts' => array() );
+
+		foreach ( $query->posts as $post_id ) {
+			array_push( $json['posts'], array( 'id' => $post_id, 'text' => html_entity_decode( get_the_title( $post_id ) ) ) );
+		}
+
+		echo json_encode( $json );
+
+		exit;
+
+	}
 }
diff --git a/classes.fields.php b/classes.fields.php
deleted file mode 100644
index e41a4a45..00000000
--- a/classes.fields.php
+++ /dev/null
@@ -1,2180 +0,0 @@
-<?php
-/**
- * All HM CMB field classes and definitions.
- *
- * @package WordPress
- * @subpackage Custom Meta Boxes
- */
-
-/**
- * Abstract class for all fields.
- * Subclasses need only override html()
- *
- * @abstract
- */
-abstract class CMB_Field {
-
-	/**
-	 * Current field value.
-	 *
-	 * @var mixed
-	 */
-	public $value;
-
-	/**
-	 * Current field placement index.
-	 *
-	 * @var int
-	 */
-	public $field_index = 0;
-
-	/**
-	 * CMB_Field constructor.
-	 *
-	 * @param string $name Field name/ID.
-	 * @param string $title Title to display in field.
-	 * @param array  $values Values to populate field(s) with.
-	 * @param array  $args Optional. Field definitions/arguments.
-	 */
-	public function __construct( $name, $title, array $values, $args = array() ) {
-
-		$this->id    = $name;
-		$this->name  = $name . '[]';
-		$this->title = $title;
-		$this->args  = wp_parse_args( $args, $this->get_default_args() );
-
-		// Deprecated argument: 'std'
-		if ( ! empty( $this->args['std'] ) && empty( $this->args['default'] ) ) {
-			$this->args['default'] = $this->args['std'];
-			_deprecated_argument( 'CMB_Field', '0.9', "field argument 'std' is deprecated, use 'default' instead" );
-		}
-
-		if ( ! empty( $this->args['options'] ) && is_array( reset( $this->args['options'] ) ) ) {
-			$re_format = array();
-			foreach ( $this->args['options'] as $option ) {
-				$re_format[ $option['value'] ] = $option['name'];
-			}
-			$this->args['options'] = $re_format;
-		}
-
-		// If the field has a custom value populator callback.
-		if ( ! empty( $args['values_callback'] ) ) {
-			$this->values = call_user_func( $args['values_callback'], get_the_id() );
-		} else {
-			$this->values = $values;
-		}
-
-		$this->value = reset( $this->values );
-
-	}
-
-	/**
-	 * Establish baseline default arguments for a field.
-	 *
-	 * @return array Default arguments.
-	 */
-	public function default_args() {
-		return array(
-			'desc'                => '',
-			'repeatable'          => false,
-			'sortable'            => false,
-			'repeatable_max'      => null,
-			'show_label'          => false,
-			'readonly'            => false,
-			'disabled'            => false,
-			'default'             => '',
-			'cols'                => '12',
-			'style'               => '',
-			'class'               => '',
-			'data_delegate'       => null,
-			'save_callback'       => null,
-			'capability'          => 'edit_posts',
-			'string-repeat-field' => __( 'Add New', 'cmb' ),
-			'string-delete-field' => __( 'Remove', 'cmb' ),
-			'confirm_delete'      => true,
-		);
-	}
-
-	/**
-	 * Get the default args for the abstract field.
-	 * These args are available to all fields.
-	 *
-	 * @return array $args
-	 */
-	public function get_default_args() {
-
-		/**
-		 * Filter the default arguments passed by a field class.
-		 *
-		 * @param array $args default field arguments.
-		 * @param string $class Field class being called
-		 */
-		return apply_filters( 'cmb_field_default_args', $this->default_args(), get_class( $this ) );
-	}
-
-	/**
-	 * Enqueue all scripts required by the field.
-	 *
-	 * @uses wp_enqueue_script()
-	 */
-	public function enqueue_scripts() {
-
-		if ( isset( $this->args['sortable'] ) && $this->args['sortable'] && $this->args['repeatable'] ) {
-			wp_enqueue_script( 'jquery-ui-sortable' );
-		}
-
-	}
-
-	/**
-	 * Enqueue all styles required by the field.
-	 *
-	 * @uses wp_enqueue_style()
-	 */
-	public function enqueue_styles() {}
-
-	/**
-	 * Output the field input ID attribute.
-	 *
-	 * If multiple inputs are required for a single field,
-	 * use the append parameter to add unique identifier.
-	 *
-	 * @param  string $append Optional. ID to place.
-	 */
-	public function id_attr( $append = null ) {
-
-		/**
-		 * Modify the id attribute of a field.
-		 *
-		 * @param string $id ID Attribute
-		 * @param string $append ID to place.
-		 * @param array $args Arguments for this particular field.
-		 */
-		$id = apply_filters( 'cmb_field_id_attribute', $this->get_the_id_attr( $append ), $append, $this->args );
-
-		printf( 'id="%s"', esc_attr( $id ) );
-
-	}
-
-	/**
-	 * Output the for attribute for the field.
-	 *
-	 * If multiple inputs are required for a single field,
-	 * use the append parameter to add unique identifier.
-	 *
-	 * @param  string $append Optional. ID to place.
-	 * @return string Modified id attribute contents
-	 */
-	public function get_the_id_attr( $append = null ) {
-
-		$id = $this->id;
-
-		if ( isset( $this->parent ) ) {
-			$parent_id = preg_replace( '/cmb\-field\-(\d+|x)/', 'cmb-group-$1', $this->parent->get_the_id_attr() );
-			$id = $parent_id . '[' . $id . ']';
-		}
-
-		$id .= '-cmb-field-' . $this->field_index;
-
-		if ( ! is_null( $append ) ) {
-			$id .= '-' . $append;
-		}
-
-		$id = str_replace( array( '[', ']', '--' ), '-', $id );
-
-		return $id;
-
-	}
-
-	/**
-	 * Output the field input ID attribute value.
-	 *
-	 * If multiple inputs are required for a single field,
-	 * use the append parameter to add unique identifier.
-	 *
-	 * @see get_the_id_attr
-	 *
-	 * @param string $append Optional. for value to place.
-	 */
-	public function for_attr( $append = null ) {
-
-		/**
-		 * Modify the for attribute of a field.
-		 *
-		 * @param string $for For attribute
-		 * @param array $args Arguments for this particular field.
-		 */
-		$for = apply_filters( 'cmb_field_for_attribute', $this->get_the_id_attr( $append ), $this->args );
-
-		printf( 'for="%s"', esc_attr( $for ) );
-
-	}
-
-	/**
-	 * Output HTML name attribute for a field.
-	 *
-	 * @see get_the_name_attr
-	 *
-	 * @param string $append Optional. Name to place.
-	 */
-	public function name_attr( $append = null ) {
-
-		/**
-		 * Modify the name attribute of a field.
-		 *
-		 * @param string $name Name attribute
-		 * @param array $args Arguments for this particular field.
-		 */
-		$name = apply_filters( 'cmb_field_name_attribute', $this->get_the_name_attr( $append ), $this->args );
-
-		printf( 'name="%s"', esc_attr( $name ) );
-
-	}
-
-	/**
-	 * Get the name attribute contents for a field.
-	 *
-	 * @param null $append Optional. Name to place.
-	 * @return string Name attribute contents.
-	 */
-	public function get_the_name_attr( $append = null ) {
-
-		$name = str_replace( '[]', '', $this->name );
-
-		if ( isset( $this->parent ) ) {
-			$parent_name = preg_replace( '/cmb\-field\-(\d+|x)/', 'cmb-group-$1', $this->parent->get_the_name_attr() );
-			$name = $parent_name . '[' . $name . ']';
-		}
-
-		$name .= "[cmb-field-$this->field_index]";
-
-		if ( ! is_null( $append ) ) {
-			$name .= $append;
-		}
-
-		return $name;
-
-	}
-
-	/**
-	 * Output class attribute for a field.
-	 *
-	 * @param string $classes Optional. Classes to assign to the field.
-	 */
-	public function class_attr( $classes = '' ) {
-
-		// Combine any passed-in classes and the ones defined in the arguments and sanitize them.
-		$all_classes = array_unique( explode( ' ', $classes . ' ' . $this->args['class'] ) );
-		$classes     = array_map( 'sanitize_html_class', array_filter( $all_classes ) );
-
-		/**
-		 * Modify the classes assigned to a field.
-		 *
-		 * @param array $classes Classes currently assigned to the field
-		 * @param array $args Arguments for this particular field.
-		 */
-		$classes = apply_filters( 'cmb_field_classes', $classes, $this->args );
-
-		if ( $classes = implode( ' ', $classes ) ) { ?>
-
-			class="<?php echo esc_attr( $classes ); ?>"
-
-		<?php }
-
-	}
-
-	/**
-	 * Get JS Safe ID.
-	 *
-	 * For use as a unique field identifier in javascript.
-	 *
-	 * @return string JS-escaped ID string.
-	 */
-	public function get_js_id() {
-
-		return str_replace( array( '-', '[', ']', '--' ),'_', $this->get_the_id_attr() );
-
-	}
-
-	/**
-	 * Print one or more HTML5 attributes for a field.
-	 *
-	 * @param array $attrs Optional. Attributes to define in the field.
-	 */
-	public function boolean_attr( $attrs = array() ) {
-
-		if ( $this->args['readonly'] ) {
-			$attrs[] = 'readonly';
-		}
-
-		if ( $this->args['disabled'] ) {
-			$attrs[] = 'disabled';
-		}
-
-		$attrs = array_filter( array_unique( $attrs ) );
-
-		/**
-		 * Modify any boolean attributes assigned to a field.
-		 *
-		 * @param array $attrs Boolean attributes.
-		 * @param array $args Arguments for this particular field.
-		 */
-		$attrs = apply_filters( 'cmb_field_boolean_attributes', $attrs, $this->args );
-
-		foreach ( $attrs as $attr ) {
-			echo esc_html( $attr ) . '="' . esc_attr( $attr ) . '"';
-		}
-
-	}
-
-	/**
-	 * Check if this field has a data delegate set
-	 *
-	 * @return boolean Set or turned off.
-	 */
-	public function has_data_delegate() {
-		return (bool) $this->args['data_delegate'];
-	}
-
-	/**
-	 * Get the array of data from the data delegate.
-	 *
-	 * @return array mixed
-	 */
-	protected function get_delegate_data() {
-
-		if ( $this->args['data_delegate'] ) {
-			return call_user_func_array( $this->args['data_delegate'], array( $this ) );
-		}
-
-		return array();
-
-	}
-
-	/**
-	 * Get the existing or default value for a field.
-	 *
-	 * @return mixed
-	 */
-	public function get_value() {
-		return ( $this->value || '0' === $this->value  ) ? $this->value : $this->args['default'];
-	}
-
-	/**
-	 * Get multiple values for a field.
-	 *
-	 * @return array
-	 */
-	public function &get_values() {
-		return $this->values;
-	}
-
-	/**
-	 * Define multiple values for a field and completely remove the singular value variable.
-	 *
-	 * @param array $values Field values.
-	 */
-	public function set_values( array $values ) {
-
-		$this->values = $values;
-
-		unset( $this->value );
-
-	}
-
-	/**
-	 * Parse and validate an array of values.
-	 *
-	 * Meant to be extended.
-	 */
-	public function parse_save_values() {}
-
-	/**
-	 * Parse and validate a single value.
-	 *
-	 * Meant to be extended.
-	 */
-	public function parse_save_value() {}
-
-	/**
-	 * Save values for the field.
-	 *
-	 * @todo this surely only works for posts
-	 * @todo why do values need to be passed in, they can already be passed in on construct
-	 *
-	 * @param int   $post_id Post ID.
-	 * @param array $values Values to save.
-	 */
-	public function save( $post_id, $values ) {
-
-		// Don't save readonly values.
-		if ( $this->args['readonly'] ) {
-			return;
-		}
-
-		$this->values = $values;
-		$this->parse_save_values();
-
-		// Allow override from args.
-		if ( ! empty( $this->args['save_callback'] ) ) {
-
-			call_user_func( $this->args['save_callback'], $this->values, $post_id );
-
-			return;
-
-		}
-
-		// If we are not on a post edit screen.
-		if ( ! $post_id ) {
-			return;
-		}
-
-		delete_post_meta( $post_id, $this->id );
-
-		foreach ( $this->values as $v ) {
-
-			$this->value = $v;
-			$this->parse_save_value();
-
-			if ( $this->value || '0' === $this->value ) {
-				add_post_meta( $post_id, $this->id, $this->value );
-			}
-		}
-	}
-
-	/**
-	 * Check whether the current field should or should not be displayed.
-	 */
-	public function is_displayed() {
-		return current_user_can( $this->args['capability'] );
-	}
-
-	/**
-	 * Print title for field.
-	 */
-	public function title() {
-
-		if ( $this->title ) : ?>
-
-			<div class="field-title">
-				<label <?php $this->for_attr(); ?>>
-					<?php echo esc_html( $this->title ); ?>
-				</label>
-			</div>
-
-		<?php endif;
-
-	}
-
-	/**
-	 * Print description for field.
-	 */
-	public function description() {
-
-		if ( ! empty( $this->args['desc'] ) ) : ?>
-
-			<div class="cmb_metabox_description">
-				<?php echo wp_kses_post( $this->args['desc'] ); ?>
-			</div>
-
-		<?php endif;
-
-	}
-
-	/**
-	 * Print out a field.
-	 */
-	public function display() {
-
-		// If there are no values, we need to start with an empty string since we're foreaching through.
-		if ( ! $this->get_values() && ! $this->args['repeatable'] ) {
-			$values = array( '' );
-		} else {
-			$values = $this->get_values(); // Make PHP5.4 >= happy.
-			$values = empty( $values ) ? array( '' ) : $values;
-		}
-
-		// Print title if necessary.
-		$this->title();
-
-		// Print description if necessary.
-		$this->description();
-
-		$i = 0;
-		if ( isset( $this->args['type'] ) && 'gmap' == $this->args['type'] ) {
-			$values = array( $values );
-		}
-
-		foreach ( $values as $key => $value ) {
-
-			$this->field_index = $i;
-			$this->value       = $value;
-			?>
-
-			<div class="field-item" data-class="<?php echo esc_attr( get_class( $this ) ); ?>" style="position: relative; <?php echo esc_attr( $this->args['style'] ); ?>">
-
-			<?php if ( $this->args['repeatable'] ) {
-				$this->delete_button_markup();
-			} ?>
-
-			<?php $this->html(); ?>
-
-			</div>
-
-			<?php
-
-			$i++;
-
-		}
-
-		// Insert a hidden one if it's repeatable.
-		if ( $this->args['repeatable'] ) {
-			$this->repeatable_button_markup();
-		}
-	}
-
-	/**
-	 * Markup to print an "add" button and for a repeatable field.
-	 */
-	protected function repeatable_button_markup() {
-		// X used to distinguish hidden fields.
-		$this->field_index = 'x';
-		$this->value       = '';
-		?>
-
-		<div class="field-item hidden" data-class="<?php echo esc_attr( get_class( $this ) ); ?>" style="position: relative; <?php echo esc_attr( $this->args['style'] ); ?>">
-
-			<?php $this->delete_button_markup(); ?>
-
-			<?php $this->html(); ?>
-
-		</div>
-
-		<button class="button repeat-field"><?php echo esc_html( $this->args['string-repeat-field'] ); ?></button>
-
-		<?php
-	}
-
-	/**
-	 * Markup to print a "remove" button for a repeatable field.
-	 */
-	protected function delete_button_markup() {
-		?>
-		<button class="cmb-delete-field" title="<?php echo esc_attr( $this->args['string-delete-field'] ); ?>">
-			<span class="cmb-delete-field-icon">&times;</span>
-			<?php echo esc_html( $this->args['string-delete-field'] ); ?>
-		</button>
-		<?php
-	}
-
-	/**
-	 * Determine whether we're creating a new object or on an existing object.
-	 *
-	 * This is used so that the plugin has some awareness of whether we're dealing with an
-	 * existing or new object. This is important for things like knowing whether or not to
-	 * load default values when populating a field view.
-	 *
-	 * @return bool|null True if is new, false if existing, and null if not in the admin.
-	 */
-	protected function is_new_object() {
-		$screen = get_current_screen();
-		if ( null === $screen || ! $screen->in_admin ) {
-			return null;
-		}
-
-		$id = $GLOBALS['hook_suffix'];
-		$id = ( '.php' == substr( $id, -4 ) ) ? substr( $id, 0, -4 ) : $id;
-		if ( 'post-new' === $id || 'link-add' === $id || 'media-new' === $id || 'user-new' === $id ) {
-			return true;
-		}
-
-		return false;
-	}
-}
-
-/**
- * Standard text field.
- *
- * @since 1.0.0
- *
- * @extends CMB_Field
- */
-class CMB_Text_Field extends CMB_Field {
-
-	/**
-	 * Print out field HTML.
-	 */
-	public function html() {
-		?>
-
-		<input type="text" <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr(); ?> <?php $this->name_attr(); ?> value="<?php echo esc_attr( $this->get_value() ); ?>" />
-
-		<?php
-	}
-}
-
-/**
- * Small text field.
- *
- * @since 1.0.0
- *
- * @extends CMB_Text_Field
- */
-class CMB_Text_Small_Field extends CMB_Text_Field {
-
-	/**
-	 * Print out field HTML.
-	 */
-	public function html() {
-
-		$this->args['class'] .= ' cmb_text_small';
-
-		parent::html();
-
-	}
-}
-
-/**
- * Field for image upload / file upload.
- *
- * @todo ability to set image size (preview image) from caller
- *
- * @since 1.0.0
- *
- * @extends CMB_Field
- */
-class CMB_File_Field extends CMB_Field {
-
-	/**
-	 * Get default arguments for field including custom parameters.
-	 *
-	 * @return array Default arguments for field.
-	 */
-	public function default_args() {
-		return array_merge(
-			parent::default_args(),
-			array(
-				'library-type' => array(
-					'video',
-					'audio',
-					'text',
-					'application',
-				),
-			)
-		);
-	}
-
-	/**
-	 * Enqueue all scripts required by the field.
-	 *
-	 * @uses wp_enqueue_script()
-	 */
-	function enqueue_scripts() {
-
-		global $post_ID;
-		$post_ID = isset( $post_ID ) ? (int) $post_ID : 0;
-
-		parent::enqueue_scripts();
-
-		wp_enqueue_media( array( 'post' => $post_ID ) );
-		wp_enqueue_script( 'cmb-file-upload', trailingslashit( CMB_URL ) . 'js/file-upload.js', array( 'jquery', 'cmb-scripts' ), CMB_VERSION );
-
-	}
-
-	/**
-	 * Print out field HTML.
-	 */
-	public function html() {
-
-		if ( $this->get_value() ) {
-			$src = wp_mime_type_icon( $this->get_value() );
-			if ( strpos( $src, site_url() !== false ) ) {
-				$size = getimagesize( str_replace( site_url(), ABSPATH, $src ) );
-			} else {
-				$size = null;
-			}
-			$icon_img = '<img src="' . $src . '" ' . ( $size ? $size[3] : '' ) . ' />';
-		}
-
-		$data_type = ( ! empty( $this->args['library-type'] ) ? implode( ',', $this->args['library-type'] ) : null );
-
-		?>
-
-		<div class="cmb-file-wrap" <?php echo 'data-type="' . esc_attr( $data_type ) . '"'; ?>>
-
-			<div class="cmb-file-wrap-placeholder"></div>
-
-			<button class="button cmb-file-upload <?php echo esc_attr( $this->get_value() ) ? 'hidden' : '' ?>">
-				<?php esc_html_e( 'Add File', 'cmb' ); ?>
-			</button>
-
-			<div class="cmb-file-holder type-file <?php echo $this->get_value() ? '' : 'hidden'; ?>">
-
-				<?php if ( $this->get_value() ) : ?>
-
-					<?php
-					if ( isset( $icon_img ) ) {
-						echo $icon_img;
-					}
-					?>
-
-					<div class="cmb-file-name">
-						<strong><?php echo esc_html( basename( get_attached_file( $this->get_value() ) ) ); ?></strong>
-					</div>
-
-				<?php endif; ?>
-
-			</div>
-
-			<button class="cmb-remove-file button <?php echo $this->get_value() ? '' : 'hidden'; ?>">
-				<?php esc_html_e( 'Remove', 'cmb' ); ?>
-			</button>
-
-			<input type="hidden"
-				<?php $this->class_attr( 'cmb-file-upload-input' ); ?>
-				<?php $this->name_attr(); ?>
-				value="<?php echo esc_attr( $this->value ); ?>"
-			/>
-
-		</div>
-
-		<?php
-	}
-}
-
-/**
- * Field for image upload.
- *
- * @since 1.0.0
- *
- * @extends CMB_File_Field
- */
-class CMB_Image_Field extends CMB_File_Field {
-
-	/**
-	 * Get default arguments for field including custom parameters.
-	 *
-	 * @return array Default arguments for field.
-	 */
-	public function default_args() {
-		return array_merge(
-			parent::default_args(),
-			array(
-				'size' => 'thumbnail',
-				'library-type' => array(
-					'image',
-				),
-				'show_size' => false,
-			)
-		);
-	}
-
-	/**
-	 * Print out field HTML.
-	 */
-	public function html() {
-
-		if ( $this->get_value() ) {
-			$image = wp_get_attachment_image_src( $this->get_value(), $this->args['size'], true );
-		}
-
-		// Convert size arg to array of width, height, crop.
-		$size = $this->parse_image_size( $this->args['size'] );
-
-		// Inline styles.
-		$styles              = sprintf( 'width: %1$dpx; height: %2$dpx; line-height: %2$dpx', intval( $size['width'] ), intval( $size['height'] ) );
-		$placeholder_styles  = sprintf( 'width: %dpx; height: %dpx;', intval( $size['width'] ) - 8, intval( $size['height'] ) - 8 );
-
-		$data_type           = ( ! empty( $this->args['library-type'] ) ? implode( ',', $this->args['library-type'] ) : null );
-
-		?>
-
-		<div class="cmb-file-wrap" style="<?php echo esc_attr( $styles ); ?>" data-type="<?php echo esc_attr( $data_type ); ?>" data-max-width="<?php echo absint( $size['width'] ); ?>">
-
-			<div class="cmb-file-wrap-placeholder" style="<?php echo esc_attr( $placeholder_styles ); ?>">
-
-				<?php if ( $this->args['show_size'] ) : ?>
-					<span class="dimensions">
-						<?php printf( '%dpx &times; %dpx', intval( $size['width'] ), intval( $size['height'] ) ); ?>
-					</span>
-				<?php endif; ?>
-
-			</div>
-
-			<button class="button cmb-file-upload <?php echo esc_attr( $this->get_value() ) ? 'hidden' : '' ?>" data-nonce="<?php echo wp_create_nonce( 'cmb-file-upload-nonce' ); ?>">
-				<?php esc_html_e( 'Add Image', 'cmb' ); ?>
-			</button>
-
-			<div class="cmb-file-holder type-img <?php echo $this->get_value() ? '' : 'hidden'; ?>" data-crop="<?php echo (bool) $size['crop']; ?>">
-
-				<?php if ( ! empty( $image ) ) : ?>
-					<img src="<?php echo esc_url( $image[0] ); ?>" width="<?php echo intval( $image[1] ); ?>" height="<?php echo intval( $image[2] ); ?>" />
-				<?php endif; ?>
-
-			</div>
-
-			<button class="cmb-remove-file button <?php echo $this->get_value() ? '' : 'hidden'; ?>">
-				<?php esc_html_e( 'Remove', 'cmb' ); ?>
-			</button>
-
-			<input type="hidden"
-				<?php $this->class_attr( 'cmb-file-upload-input' ); ?>
-				<?php $this->name_attr(); ?>
-				value="<?php echo esc_attr( $this->value ); ?>"
-			/>
-
-		</div>
-
-	<?php }
-
-	/**
-	 * Parse the size argument to get pixel width, pixel height and crop information.
-	 *
-	 * @param string $size Size of image requested.
-	 * @return array width, height, crop
-	 */
-	private function parse_image_size( $size ) {
-
-		// Handle string for built-in image sizes.
-		if ( is_string( $size ) && in_array( $size, array( 'thumbnail', 'medium', 'large' ) ) ) {
-			return array(
-				'width'  => get_option( $size . '_size_w' ),
-				'height' => get_option( $size . '_size_h' ),
-				'crop'   => get_option( $size . '_crop' ),
-			);
-		}
-
-		// Handle string for additional image sizes.
-		global $_wp_additional_image_sizes;
-		if ( is_string( $size ) && isset( $_wp_additional_image_sizes[ $size ] ) ) {
-			return array(
-				'width'  => $_wp_additional_image_sizes[ $size ]['width'],
-				'height' => $_wp_additional_image_sizes[ $size ]['height'],
-				'crop'   => $_wp_additional_image_sizes[ $size ]['crop'],
-			);
-		}
-
-		// Handle default WP size format.
-		if ( is_array( $size ) && isset( $size[0] ) && isset( $size[1] ) ) {
-			$size = array( 'width' => $size[0], 'height' => $size[1] );
-		}
-
-		return wp_parse_args( $size, array(
-			'width'  => get_option( 'thumbnail_size_w' ),
-			'height' => get_option( 'thumbnail_size_h' ),
-			'crop'   => get_option( 'thumbnail_crop' ),
-		) );
-
-	}
-
-	/**
-	 * Ajax callback for outputing an image src based on post data.
-	 *
-	 * @return null
-	 */
-	static function request_image_ajax_callback() {
-
-		if ( ! ( isset( $_POST['nonce'] ) && wp_verify_nonce( $_POST['nonce'], 'cmb-file-upload-nonce' ) ) ) {
-			return;
-		}
-
-		$id = absint( $_POST['id'] );
-
-		$size = array(
-			intval( $_POST['width'] ),
-			intval( $_POST['height'] ),
-			'crop' => (bool) $_POST['crop'],
-		);
-
-		$image = wp_get_attachment_image_src( $id, $size );
-		echo esc_url( reset( $image ) );
-
-		// This is required to return a proper result.
-		die();
-	}
-}
-add_action( 'wp_ajax_cmb_request_image', array( 'CMB_Image_Field', 'request_image_ajax_callback' ) );
-
-/**
- * Number meta box.
- *
- * @since 1.0.0
- *
- * @extends CMB_Field
- */
-class CMB_Number_Field extends CMB_Field {
-
-	/**
-	 * Get default arguments for field including custom parameters.
-	 *
-	 * @return array Default arguments for field.
-	 */
-	public function default_args() {
-		return array_merge(
-			parent::default_args(),
-			array(
-				'step' => '',
-			)
-		);
-	}
-
-	/**
-	 * Print out field HTML.
-	 */
-	public function html() {
-		?>
-
-		<input step="<?php echo esc_attr( $this->args['step'] ); ?>" type="number" <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr( 'cmb_text_number code' ); ?> <?php $this->name_attr(); ?> value="<?php echo esc_attr( $this->get_value() ); ?>" />
-
-		<?php
-	}
-}
-
-/**
- * Standard text meta box for a URL.
- *
- * @since 1.0.0
- *
- * @extends CMB_Field
- */
-class CMB_URL_Field extends CMB_Field {
-
-	/**
-	 * Print out field HTML.
-	 */
-	public function html() {
-		?>
-
-		<input type="text" <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr( 'cmb_text_url code' ); ?> <?php $this->name_attr(); ?> value="<?php echo esc_attr( esc_url( $this->value ) ); ?>" />
-
-		<?php
-	}
-}
-
-/**
- * Date picker meta box field.
- *
- * @since 1.0.0
- *
- * @extends CMB_Field
- */
-class CMB_Date_Field extends CMB_Field {
-
-	/**
-	 * Enqueue all scripts required by the field.
-	 *
-	 * @uses wp_enqueue_script()
-	 */
-	public function enqueue_scripts() {
-		parent::enqueue_scripts();
-		wp_enqueue_style( 'cmb-jquery-ui', trailingslashit( CMB_URL ) . 'css/vendor/jquery-ui/jquery-ui.css', '1.10.3' );
-		wp_enqueue_script( 'cmb-datetime', trailingslashit( CMB_URL ) . 'js/field.datetime.js', array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'cmb-scripts' ), CMB_VERSION );
-	}
-
-	/**
-	 * Print out field HTML.
-	 */
-	public function html() {
-		// If the user has set a cols arg of less than 6 columns, allow the intput
-		// to go full-width.
-		$classes = ( is_int( $this->args['cols'] ) && $this->args['cols'] <= 6 ) ? 'cmb_datepicker' : 'cmb_text_small cmb_datepicker' ;
-		?>
-
-		<input <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr( $classes ); ?> type="text" <?php $this->name_attr(); ?> value="<?php echo esc_attr( $this->value ); ?>" />
-
-		<?php
-	}
-}
-
-/**
- * Time picker meta box field.
- *
- * @since 1.0.0
- *
- * @extends CMB_Field
- */
-class CMB_Time_Field extends CMB_Field {
-
-	/**
-	 * Enqueue all scripts required by the field.
-	 *
-	 * @uses wp_enqueue_script()
-	 */
-	public function enqueue_scripts() {
-
-		parent::enqueue_scripts();
-
-		wp_enqueue_style( 'cmb-jquery-ui', trailingslashit( CMB_URL ) . 'css/vendor/jquery-ui/jquery-ui.css', '1.10.3' );
-
-		wp_enqueue_script( 'cmb-timepicker', trailingslashit( CMB_URL ) . 'js/jquery.timePicker.min.js', array( 'jquery', 'cmb-scripts' ) );
-		wp_enqueue_script( 'cmb-datetime', trailingslashit( CMB_URL ) . 'js/field.datetime.js', array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'cmb-scripts' ), CMB_VERSION );
-	}
-
-	/**
-	 * Print out field HTML.
-	 */
-	public function html() {
-		?>
-
-		<input <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr( 'cmb_text_small cmb_timepicker' ); ?> type="text" <?php $this->name_attr(); ?> value="<?php echo esc_attr( $this->value ); ?>"/>
-
-		<?php
-	}
-}
-
-/**
- * Date picker for date only (not time) box.
- *
- * @since 1.0.0
- *
- * @extends CMB_Field
- */
-class CMB_Date_Timestamp_Field extends CMB_Field {
-
-	/**
-	 * Enqueue all scripts required by the field.
-	 *
-	 * @uses wp_enqueue_script()
-	 */
-	public function enqueue_scripts() {
-
-		parent::enqueue_scripts();
-
-		wp_enqueue_style( 'cmb-jquery-ui', trailingslashit( CMB_URL ) . 'css/vendor/jquery-ui/jquery-ui.css', '1.10.3' );
-
-		wp_enqueue_script( 'cmb-timepicker', trailingslashit( CMB_URL ) . 'js/jquery.timePicker.min.js', array( 'jquery', 'cmb-scripts' ) );
-		wp_enqueue_script( 'cmb-datetime', trailingslashit( CMB_URL ) . 'js/field.datetime.js', array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'cmb-scripts' ), CMB_VERSION );
-
-	}
-
-	/**
-	 * Print out field HTML.
-	 */
-	public function html() {
-		?>
-
-		<input <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr( 'cmb_text_small cmb_datepicker' ); ?> type="text" <?php $this->name_attr(); ?>  value="<?php echo $this->value ? esc_attr( date( 'm\/d\/Y', $this->value ) ) : '' ?>" />
-
-		<?php
-	}
-
-	/**
-	 * Convert values into UNIX time values and sort.
-	 */
-	public function parse_save_values() {
-
-		foreach ( $this->values as &$value ) {
-			$value = strtotime( $value );
-		}
-
-		sort( $this->values );
-
-	}
-}
-
-/**
- * Date picker for date and time (seperate fields) box.
- *
- * @since 1.0.0
- *
- * @extends CMB_Field
- */
-class CMB_Datetime_Timestamp_Field extends CMB_Field {
-
-	/**
-	 * Enqueue all scripts required by the field.
-	 *
-	 * @uses wp_enqueue_script()
-	 */
-	public function enqueue_scripts() {
-
-		parent::enqueue_scripts();
-
-		wp_enqueue_style( 'cmb-jquery-ui', trailingslashit( CMB_URL ) . 'css/vendor/jquery-ui/jquery-ui.css', '1.10.3' );
-
-		wp_enqueue_script( 'cmb-timepicker', trailingslashit( CMB_URL ) . 'js/jquery.timePicker.min.js', array( 'jquery', 'cmb-scripts' ) );
-		wp_enqueue_script( 'cmb-datetime', trailingslashit( CMB_URL ) . 'js/field.datetime.js', array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'cmb-scripts' ), CMB_VERSION );
-	}
-
-	/**
-	 * Print out field HTML.
-	 */
-	public function html() {
-		?>
-
-		<input <?php $this->id_attr( 'date' ); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr( 'cmb_text_small cmb_datepicker' ); ?> type="text" <?php $this->name_attr( '[date]' ); ?>  value="<?php echo $this->value ? esc_attr( date( 'm\/d\/Y', $this->value ) ) : '' ?>" />
-		<input <?php $this->id_attr( 'time' ); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr( 'cmb_text_small cmb_timepicker' ); ?> type="text" <?php $this->name_attr( '[time]' ); ?> value="<?php echo $this->value ? esc_attr( date( 'h:i A', $this->value ) ) : '' ?>" />
-
-		<?php
-	}
-
-	/**
-	 * Convert values into UNIX time values and sort.
-	 */
-	public function parse_save_values() {
-
-		// Convert all [date] and [time] values to a unix timestamp.
-		// If date is empty, assume delete. If time is empty, assume 00:00.
-		foreach ( $this->values as $key => &$value ) {
-			if ( empty( $value['date'] ) ) {
-				unset( $this->values[ $key ] );
-			} else {
-				$value = strtotime( $value['date'] . ' ' . $value['time'] );
-			}
-		}
-
-		$this->values = array_filter( $this->values );
-		sort( $this->values );
-
-		parent::parse_save_values();
-
-	}
-}
-
-/**
- * Standard text field.
- *
- * Args:
- *  - int "rows" - number of rows in the <textarea>
- *
- * @since 1.0.0
- *
- * @extends CMB_Field
- */
-class CMB_Textarea_Field extends CMB_Field {
-
-	/**
-	 * Print out field HTML.
-	 */
-	public function html() {
-		?>
-
-		<textarea <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr(); ?> rows="<?php echo ! empty( $this->args['rows'] ) ? esc_attr( $this->args['rows'] ) : 4; ?>" <?php $this->name_attr(); ?>><?php echo esc_textarea( $this->value ); ?></textarea>
-
-		<?php
-	}
-}
-
-/**
- * Code style text field.
- *
- * Args:
- *  - int "rows" - number of rows in the <textarea>
- *
- * @since 1.0.0
- *
- * @extends CMB_Textarea_Field
- */
-class CMB_Textarea_Field_Code extends CMB_Textarea_Field {
-
-	/**
-	 * Print out field HTML.
-	 */
-	public function html() {
-
-		$this->args['class'] .= ' code';
-
-		parent::html();
-
-	}
-}
-
-/**
- *  Colour picker
- *
- * @since 1.0.0
- *
- * @extends CMB_Field
- */
-class CMB_Color_Picker extends CMB_Field {
-
-	/**
-	 * Enqueue all scripts required by the field.
-	 *
-	 * @uses wp_enqueue_script()
-	 */
-	public function enqueue_scripts() {
-
-		parent::enqueue_scripts();
-
-		wp_enqueue_script( 'cmb-colorpicker', trailingslashit( CMB_URL ) . 'js/field.colorpicker.js', array( 'jquery', 'wp-color-picker', 'cmb-scripts' ), CMB_VERSION );
-		wp_enqueue_style( 'wp-color-picker' );
-	}
-
-	/**
-	 * Print out field HTML.
-	 */
-	public function html() {
-		?>
-
-		<input <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr( 'cmb_colorpicker cmb_text_small' ); ?> type="text" <?php $this->name_attr(); ?> value="<?php echo esc_attr( $this->get_value() ); ?>" />
-
-		<?php
-	}
-}
-
-/**
- * Standard radio field.
- *
- * Args:
- *  - bool "inline" - display the radio buttons inline
- *
- * @since 1.0.0
- *
- * @extends CMB_Field
- */
-class CMB_Radio_Field extends CMB_Field {
-
-	/**
-	 * Get default arguments for field including custom parameters.
-	 *
-	 * @return array Default arguments for field.
-	 */
-	public function default_args() {
-		return array_merge(
-			parent::default_args(),
-			array(
-				'options' => array(),
-			)
-		);
-	}
-
-	/**
-	 * Print out field HTML.
-	 */
-	public function html() {
-
-		if ( $this->has_data_delegate() ) {
-			$this->args['options'] = $this->get_delegate_data();
-		} ?>
-
-			<?php foreach ( $this->args['options'] as $key => $value ) : ?>
-
-			<input <?php $this->id_attr( 'item-' . $key ); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr(); ?> type="radio" <?php $this->name_attr(); ?>  value="<?php echo esc_attr( $key ); ?>" <?php checked( $key, $this->get_value() ); ?> />
-			<label <?php $this->for_attr( 'item-' . $key ); ?> style="margin-right: 20px;">
-				<?php echo esc_html( $value ); ?>
-			</label>
-
-			<?php endforeach; ?>
-
-		<?php
-	}
-}
-
-/**
- * Standard checkbox field.
- *
- * @since 1.0.0
- *
- * @extends CMB_Field
- */
-class CMB_Checkbox extends CMB_Field {
-
-	/**
-	 * Print out field HTML - in this case intentionally empty.
-	 */
-	public function title() {}
-
-	/**
-	 * Print out field HTML.
-	 */
-	public function html() {
-		?>
-
-		<input <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr(); ?> type="checkbox" <?php $this->name_attr(); ?>  value="1" <?php checked( $this->get_value() ); ?> />
-		<label <?php $this->for_attr(); ?>><?php echo esc_html( $this->title ); ?></label>
-
-		<?php
-	}
-}
-
-/**
- * Standard title used as a splitter.
- *
- * @since 1.0.0
- *
- * @extends CMB_Field
- */
-class CMB_Title extends CMB_Field {
-
-	/**
-	 * Print out field HTML - in this case we only want a title.
-	 */
-	public function title() {
-		?>
-
-		<div class="field-title">
-			<h2 <?php $this->class_attr(); ?>>
-				<?php echo esc_html( $this->title ); ?>
-			</h2>
-		</div>
-
-		<?php
-
-	}
-
-	/**
-	 * Placeholder for abstracted method.
-	 */
-	public function html() {}
-}
-
-/**
- * WYSIWYG field.
- *
- * @since 1.0.0
- *
- * @extends CMB_Field
- */
-class CMB_wysiwyg extends CMB_Field {
-
-	/**
-	 * Get default arguments for field including custom parameters.
-	 *
-	 * @return array Default arguments for field.
-	 */
-	public function default_args() {
-		return array_merge(
-			parent::default_args(),
-			array(
-				'options' => array(),
-			)
-		);
-	}
-
-	/**
-	 * Enqueue all scripts required by the field.
-	 *
-	 * @uses wp_enqueue_script()
-	 */
-	function enqueue_scripts() {
-
-		parent::enqueue_scripts();
-
-		wp_enqueue_script( 'cmb-wysiwyg', trailingslashit( CMB_URL ) . 'js/field-wysiwyg.js', array( 'jquery', 'cmb-scripts' ), CMB_VERSION );
-	}
-
-	/**
-	 * Print out field HTML.
-	 */
-	public function html() {
-
-		$id   = $this->get_the_id_attr();
-		$name = $this->get_the_name_attr();
-
-		$field_id = $this->get_js_id();
-
-		printf(
-			'<div class="cmb-wysiwyg" data-id="%s" data-name="%s" data-field-id="%s">',
-			esc_attr( $id ),
-			esc_attr( $name ),
-			esc_attr( $field_id )
-		);
-
-		if ( $this->is_placeholder() ) {
-
-			// For placeholder, output the markup for the editor in a JS var.
-			ob_start();
-			$this->args['options']['textarea_name'] = 'cmb-placeholder-name-' . $field_id;
-			wp_editor( '', 'cmb-placeholder-id-' . $field_id, $this->args['options'] );
-			$editor = ob_get_clean();
-			$editor = str_replace( array( "\n", "\r" ), '', $editor );
-			$editor = str_replace( array( "'" ), '"', $editor );
-
-			?>
-
-			<script>
-				if ( 'undefined' === typeof( cmb_wysiwyg_editors ) )
-					var cmb_wysiwyg_editors = {};
-				cmb_wysiwyg_editors.<?php echo esc_js( $field_id ); ?> = <?php echo wp_json_encode( $editor ); ?>;
-			</script>
-
-			<?php
-
-		} else {
-
-			$this->args['options']['textarea_name'] = $name;
-			echo wp_editor( $this->get_value(), $id, $this->args['options'] );
-
-		}
-
-		echo '</div>';
-
-	}
-
-	/**
-	 * Check if this is a placeholder field.
-	 * Either the field itself, or because it is part of a repeatable group.
-	 *
-	 * @return bool
-	 */
-	public function is_placeholder() {
-
-		if ( isset( $this->parent ) && ! is_int( $this->parent->field_index ) ) {
-			return true;
-		} else {
-			return ! is_int( $this->field_index );
-		}
-
-	}
-}
-
-/**
- * Standard select field.
- *
- * @supports "data_delegate"
- * @args
- *     'options'     => array Array of options to show in the select, optionally use data_delegate instead
- *     'allow_none'   => bool|string Allow no option to be selected (will place a "None" at the top of the select)
- *     'multiple'     => bool whether multiple can be selected
- *
- * @since 1.0.0
- *
- * @extends CMB_Field
- */
-class CMB_Select extends CMB_Field {
-
-	/**
-	 * CMB_Select constructor.
-	 */
-	public function __construct() {
-
-		$args = func_get_args();
-
-		call_user_func_array( array( 'parent', '__construct' ), $args );
-
-	}
-
-	/**
-	 * Get default arguments for field including custom parameters.
-	 *
-	 * @return array Default arguments for field.
-	 */
-	public function default_args() {
-		return array_merge(
-			parent::default_args(),
-			array(
-				'options'         => array(),
-				'multiple'        => false,
-				'select2_options' => array(),
-				'allow_none'      => false,
-			)
-		);
-	}
-
-	/**
-	 * Ensure values are saved as an array if multiple is set.
-	 */
-	public function parse_save_values() {
-
-		if ( isset( $this->parent ) && isset( $this->args['multiple'] ) && $this->args['multiple'] ) {
-			$this->values = array( $this->values );
-		}
-
-	}
-
-	/**
-	 * Get options for field.
-	 *
-	 * @return mixed
-	 */
-	public function get_options() {
-
-		if ( $this->has_data_delegate() ) {
-			$this->args['options'] = $this->get_delegate_data();
-		}
-
-		return $this->args['options'];
-	}
-
-	/**
-	 * Enqueue all scripts required by the field.
-	 *
-	 * @uses wp_enqueue_script()
-	 */
-	public function enqueue_scripts() {
-
-		parent::enqueue_scripts();
-
-		wp_enqueue_script( 'select2', trailingslashit( CMB_URL ) . 'js/vendor/select2/select2.js', array( 'jquery' ) );
-		wp_enqueue_script( 'field-select', trailingslashit( CMB_URL ) . 'js/field.select.js', array( 'jquery', 'select2', 'cmb-scripts' ), CMB_VERSION );
-	}
-
-	/**
-	 * Enqueue all styles required by the field.
-	 *
-	 * @uses wp_enqueue_style()
-	 */
-	public function enqueue_styles() {
-
-		parent::enqueue_styles();
-
-		wp_enqueue_style( 'select2', trailingslashit( CMB_URL ) . 'js/vendor/select2/select2.css' );
-	}
-
-	/**
-	 * Print out field HTML.
-	 */
-	public function html() {
-
-		if ( $this->has_data_delegate() ) {
-			$this->args['options'] = $this->get_delegate_data();
-		}
-
-		$this->output_field();
-
-		$this->output_script();
-
-	}
-
-	/**
-	 * Compile field HTML.
-	 */
-	public function output_field() {
-
-		$val = (array) $this->get_value();
-
-		$name = $this->get_the_name_attr();
-		$name .= ! empty( $this->args['multiple'] ) ? '[]' : null;
-
-		$none = is_string( $this->args['allow_none'] ) ? $this->args['allow_none'] : __( 'None', 'cmb' );
-
-		?>
-
-		<select
-			<?php $this->id_attr(); ?>
-			<?php $this->boolean_attr(); ?>
-			<?php printf( 'name="%s"', esc_attr( $name ) ); ?>
-			<?php printf( 'data-field-id="%s" ', esc_attr( $this->get_js_id() ) ); ?>
-			<?php echo ! empty( $this->args['multiple'] ) ? 'multiple' : '' ?>
-			<?php $this->class_attr( 'cmb_select' ); ?>
-			style="width: 100%"
-		>
-
-			<?php if ( $this->args['allow_none'] ) : ?>
-				<option value=""><?php echo esc_html( $none ); ?></option>
-			<?php endif; ?>
-
-			<?php foreach ( $this->args['options'] as $value => $name ) : ?>
-			   <option <?php selected( in_array( $value, $val ) ) ?> value="<?php echo esc_attr( $value ); ?>"><?php echo esc_html( $name ); ?></option>
-			<?php endforeach; ?>
-
-		</select>
-
-		<?php
-	}
-
-	/**
-	 * Output inline scripts to support field.
-	 */
-	public function output_script() {
-
-		$options = wp_parse_args( $this->args['select2_options'], array(
-			'placeholder' => __( 'Type to search', 'cmb' ),
-			'allowClear'  => true,
-		) );
-
-		?>
-
-		<script type="text/javascript">
-
-			(function($) {
-
-				var options = <?php echo  json_encode( $options ); ?>
-
-				if ( 'undefined' === typeof( window.cmb_select_fields ) )
-					window.cmb_select_fields = {};
-
-				var id = <?php echo json_encode( $this->get_js_id() ); ?>;
-				window.cmb_select_fields[id] = options;
-
-			})( jQuery );
-
-		</script>
-
-		<?php
-	}
-}
-
-/**
- * Taxonomy-specific select field.
- *
- * @since 1.0.0
- *
- * @extends CMB_Select
- */
-class CMB_Taxonomy extends CMB_Select {
-
-	/**
-	 * Get default arguments for field including custom parameters.
-	 *
-	 * @return array Default arguments for field.
-	 */
-	public function default_args() {
-		return array_merge(
-			parent::default_args(),
-			array(
-				'taxonomy'   => '',
-				'hide_empty' => false,
-			)
-		);
-	}
-
-	/**
-	 * CMB_Taxonomy constructor.
-	 */
-	public function __construct() {
-
-		$args = func_get_args();
-
-		call_user_func_array( array( 'parent', '__construct' ), $args );
-
-		$this->args['data_delegate'] = array( $this, 'get_delegate_data' );
-
-	}
-
-	/**
-	 * Retrieve custom field data.
-	 *
-	 * @return array Terms for field data.
-	 */
-	public function get_delegate_data() {
-
-		$terms = $this->get_terms();
-
-		if ( is_wp_error( $terms ) ) {
-			return array();
-		}
-
-		$term_options = array();
-
-		foreach ( $terms as $term ) {
-			$term_options[ $term->term_id ] = $term->name;
-		}
-
-		return $term_options;
-
-	}
-
-	/**
-	 * Get terms for select field.
-	 *
-	 * @todo::cache this or find a cached method
-	 *
-	 * @return array|int|WP_Error
-	 */
-	private function get_terms() {
-
-		return get_terms( $this->args['taxonomy'], array( 'hide_empty' => $this->args['hide_empty'] ) );
-
-	}
-}
-
-/**
- * Post Select field.
- *
- * @supports "data_delegate"
- * @args
- *     'options'     => array Array of options to show in the select, optionally use data_delegate instead
- *     'allow_none'   => bool Allow no option to be selected (will place a "None" at the top of the select)
- *     'multiple'     => bool whether multiple can be selected
- *
- * @since 1.0.0
- *
- * @extends CMB_Select
- */
-class CMB_Post_Select extends CMB_Select {
-
-	/**
-	 * CMB_Post_Select constructor.
-	 */
-	public function __construct() {
-
-		$args = func_get_args();
-
-		call_user_func_array( array( 'parent', '__construct' ), $args );
-
-		if ( ! $this->args['use_ajax'] ) {
-
-			$this->args['data_delegate'] = array( $this, 'get_delegate_data' );
-
-		}
-
-	}
-
-	/**
-	 * Get default arguments for field including custom parameters.
-	 *
-	 * @return array Default arguments for field.
-	 */
-	public function default_args() {
-		return array_merge(
-			parent::default_args(),
-			array(
-				'query'    => array(),
-				'use_ajax' => false,
-				'multiple' => false,
-			)
-		);
-	}
-
-	/**
-	 * Get posts and verify for use in select field.
-	 *
-	 * @todo:: validate this data before returning.
-	 *
-	 * @return array Array of posts for field.
-	 */
-	public function get_delegate_data() {
-
-		$data = array();
-
-		foreach ( $this->get_posts() as $post_id ) {
-			$data[ $post_id ] = get_the_title( $post_id );
-		}
-
-		return $data;
-
-	}
-
-	/**
-	 * Get posts for use in select field.
-	 *
-	 * @return array
-	 */
-	private function get_posts() {
-
-		$this->args['query']['fields'] = 'ids';
-		$query = new WP_Query( $this->args['query'] );
-
-		return isset( $query->posts ) ? $query->posts : array();
-
-	}
-
-	/**
-	 * Format the field values for Select2 to read.
-	 */
-	public function parse_save_value() {
-
-		// AJAX multi select2 data is submitted as a string of comma separated post IDs.
-		// If empty, set to false instead of empty array to ensure the meta entry is deleted.
-		if ( $this->args['use_ajax'] && $this->args['multiple'] ) {
-			$this->value = ( ! empty( $this->value ) ) ? explode( ',', $this->value ) : false;
-		}
-
-	}
-
-	/**
-	 * Assemble and output of field HTML.
-	 */
-	public function output_field() {
-
-		// If AJAX, must use input type not standard select.
-		if ( $this->args['use_ajax'] ) :
-
-			?>
-
-			<input
-				<?php $this->id_attr(); ?>
-				<?php printf( 'value="%s" ', esc_attr( implode( ',' , (array) $this->value ) ) ); ?>
-				<?php printf( 'name="%s"', esc_attr( $this->get_the_name_attr() ) ); ?>
-				<?php printf( 'data-field-id="%s" ', esc_attr( $this->get_js_id() ) ); ?>
-				<?php $this->boolean_attr(); ?>
-				class="cmb_select"
-				style="width: 100%"
-			/>
-
-			<?php
-
-		else :
-
-			parent::output_field();
-
-		endif;
-
-	}
-
-	/**
-	 * Output inline scripts to support field.
-	 */
-	public function output_script() {
-
-		parent::output_script();
-
-		?>
-
-		<script type="text/javascript">
-
-			(function($) {
-
-				if ( 'undefined' === typeof( window.cmb_select_fields ) ) {
-					return false;
-				}
-
-				// Get options for this field so we can modify it.
-				var id = <?php echo json_encode( $this->get_js_id() ); ?>;
-				var options = window.cmb_select_fields[id];
-
-				<?php if ( $this->args['use_ajax'] && $this->args['multiple'] ) : ?>
-					// The multiple setting is required when using ajax (because an input field is used instead of select)
-					options.multiple = true;
-				<?php endif; ?>
-
-				<?php if ( $this->args['use_ajax'] && ! empty( $this->value ) ) : ?>
-
-					options.initSelection = function( element, callback ) {
-
-						var data = [];
-
-						<?php if ( $this->args['multiple'] ) : ?>
-
-							<?php foreach ( (array) $this->value as $post_id ) : ?>
-								data.push( <?php echo json_encode( array( 'id' => $post_id, 'text' => html_entity_decode( get_the_title( $post_id ) ) ) ); ?> );
-							<?php endforeach; ?>
-
-						<?php else : ?>
-
-							data = <?php echo json_encode( array( 'id' => $this->value, 'text' => html_entity_decode( get_the_title( $this->get_value() ) ) ) ); ?>;
-
-						<?php endif; ?>
-
-						callback( data );
-
-					};
-
-				<?php endif; ?>
-
-				<?php if ( $this->args['use_ajax'] ) : ?>
-
-					<?php $this->args['query']['fields'] = 'ids'; ?>
-
-					var ajaxData = {
-						action  : 'cmb_post_select',
-						post_id : '<?php echo intval( get_the_id() ); ?>', // Used for user capabilty check.
-						nonce   : <?php echo json_encode( wp_create_nonce( 'cmb_select_field' ) ); ?>,
-						query   : <?php echo json_encode( $this->args['query'] ); ?>
-					};
-
-					options.ajax = {
-						url: <?php echo json_encode( esc_url( admin_url( 'admin-ajax.php' ) ) ); ?>,
-						type: 'POST',
-						dataType: 'json',
-						data: function( term, page ) {
-							ajaxData.query.s = term;
-							ajaxData.query.paged = page;
-							return ajaxData;
-						},
-						results : function( results, page ) {
-							var postsPerPage = ajaxData.query.posts_per_page = ( 'posts_per_page' in ajaxData.query ) ? ajaxData.query.posts_per_page : ( 'showposts' in ajaxData.query ) ? ajaxData.query.showposts : 10;
-							var isMore = ( page * postsPerPage ) < results.total;
-							return { results: results.posts, more: isMore };
-						}
-					}
-
-				<?php endif; ?>
-
-			})( jQuery );
-
-		</script>
-
-		<?php
-	}
-}
-
-/**
- * AJAX callback for select fields.
- *
- * @todo:: this should be in inside the class.
- */
-function cmb_ajax_post_select() {
-
-	$post_id = ! empty( $_POST['post_id'] ) ? absint( $_POST['post_id'] ) : false;
-	$nonce   = ! empty( $_POST['nonce'] ) ? $_POST['nonce'] : false;
-	$args    = ! empty( $_POST['query'] ) ? $_POST['query'] : array();
-
-	if ( ! $nonce || ! wp_verify_nonce( $nonce, 'cmb_select_field' ) || ! current_user_can( 'edit_post', $post_id ) ) {
-		echo json_encode( array( 'total' => 0, 'posts' => array() ) );
-		exit;
-	}
-
-	$args['fields'] = 'ids'; // Only need to retrieve post IDs.
-
-	$query = new WP_Query( $args );
-
-	$json = array( 'total' => $query->found_posts, 'posts' => array() );
-
-	foreach ( $query->posts as $post_id ) {
-		array_push( $json['posts'], array( 'id' => $post_id, 'text' => html_entity_decode( get_the_title( $post_id ) ) ) );
-	}
-
-	echo json_encode( $json );
-
-	exit;
-
-}
-add_action( 'wp_ajax_cmb_post_select', 'cmb_ajax_post_select' );
-
-/**
- * Field to group child fields
- * pass $args[fields] array for child fields
- * pass $args['repeatable'] for cloing all child fields (set)
- *
- * @todo remove global $post reference, somehow
- *
- * @since 1.0.0
- *
- * @extends CMB_Field
- */
-class CMB_Group_Field extends CMB_Field {
-
-	static $added_js;
-
-	/**
-	 * Fields arguments and information.
-	 *
-	 * @var array
-	 */
-	private $fields = array();
-
-	/**
-	 * CMB_Group_Field constructor.
-	 */
-	function __construct() {
-
-		// You can't just put func_get_args() into a function as a parameter.
-		$args = func_get_args();
-		call_user_func_array( array( 'parent', '__construct' ), $args );
-
-		if ( ! empty( $this->args['fields'] ) ) {
-			foreach ( $this->args['fields'] as $f ) {
-
-				$class = _cmb_field_class_for_type( $f['type'] );
-
-				if ( ! empty( $class ) && class_exists( $class ) ) {
-					$this->add_field( new $class( $f['id'], $f['name'], array(), $f ) );
-				}
-			}
-		}
-
-	}
-
-	/**
-	 * Get default arguments for field including custom parameters.
-	 *
-	 * @return array Default arguments for field.
-	 */
-	public function default_args() {
-		return array_merge(
-			parent::default_args(),
-			array(
-				'fields'              => array(),
-				'string-repeat-field' => __( 'Add New Group', 'cmb' ),
-				'string-delete-field' => __( 'Remove Group', 'cmb' ),
-			)
-		);
-	}
-
-	/**
-	 * Enqueue all scripts required by the field.
-	 *
-	 * @uses wp_enqueue_script()
-	 */
-	public function enqueue_scripts() {
-
-		parent::enqueue_scripts();
-
-		foreach ( $this->args['fields'] as $f ) {
-			$class = _cmb_field_class_for_type( $f['type'] );
-			if ( ! empty( $class ) && class_exists( $class ) ) {
-				$field = new $class( '', '', array(), $f );
-				$field->enqueue_scripts();
-			}
-		}
-
-	}
-
-	/**
-	 * Enqueue all styles required by the field.
-	 *
-	 * @uses wp_enqueue_style()
-	 */
-	public function enqueue_styles() {
-
-		parent::enqueue_styles();
-
-		foreach ( $this->args['fields'] as $f ) {
-			$class = _cmb_field_class_for_type( $f['type'] );
-			if ( ! empty( $class ) && class_exists( $class ) ) {
-				$field = new $class( '', '', array(), $f );
-				$field->enqueue_styles();
-			}
-		}
-
-	}
-
-	/**
-	 * Display output for group.
-	 */
-	public function display() {
-
-		global $post;
-
-		$field = $this->args;
-		$values = $this->get_values();
-
-		$this->title();
-		$this->description();
-
-		if ( ! $this->args['repeatable'] && empty( $values ) ) {
-			$values = array( null );
-		} else {
-			$values = $this->get_values(); // Make PHP5.4 >= happy.
-			$values = ( empty( $values ) ) ? array( '' ) : $values;
-		}
-
-		$i = 0;
-		foreach ( $values as $value ) {
-
-			$this->field_index = $i;
-			$this->value = $value;
-
-			?>
-
-			<div class="field-item" data-class="<?php echo esc_attr( get_class( $this ) ) ?>" style="<?php echo esc_attr( $this->args['style'] ); ?>">
-				<?php $this->html(); ?>
-			</div>
-
-			<?php
-
-			$i++;
-
-		}
-
-		if ( $this->args['repeatable'] ) {
-
-			$this->field_index = 'x'; // X used to distinguish hidden fields.
-			$this->value = '';
-
-			?>
-
-				<div class="field-item hidden" data-class="<?php echo esc_attr( get_class( $this ) ); ?>" style="<?php echo esc_attr( $this->args['style'] ); ?>">
-					<?php $this->html(); ?>
-				</div>
-
-				<button class="button repeat-field">
-					<?php echo esc_html( $this->args['string-repeat-field'] ); ?>
-				</button>
-
-		<?php }
-
-	}
-
-	/**
-	 * Print out group field HTML.
-	 */
-	public function html() {
-
-		$fields = &$this->get_fields();
-		$value  = $this->get_value();
-
-		// Reset all field values.
-		foreach ( $fields as $field ) {
-			$field->set_values( array() );
-		}
-
-		// Set values for this field.
-		if ( ! empty( $value ) ) {
-			foreach ( $value as $field_id => $field_value ) {
-				$field_value = ( ! empty( $field_value ) ) ? $field_value : array();
-				if ( ! empty( $fields[ $field_id ] ) ) {
-					$fields[ $field_id ]->set_values( (array) $field_value );
-				}
-			}
-		}
-
-		?>
-
-		<?php if ( $this->args['repeatable'] ) : ?>
-			<button class="cmb-delete-field">
-				<span class="cmb-delete-field-icon">&times;</span>
-				<?php echo esc_html( $this->args['string-delete-field'] ); ?>
-			</button>
-		<?php endif; ?>
-
-		<?php CMB_Meta_Box::layout_fields( $fields ); ?>
-
-	<?php }
-
-	/**
-	 * Parse values individually based on what kind of field they are.
-	 */
-	public function parse_save_values() {
-
-		$fields = &$this->get_fields();
-		$values = &$this->get_values();
-
-		foreach ( $values as &$group_value ) {
-			foreach ( $group_value as $field_id => &$field_value ) {
-
-				if ( ! isset( $fields[ $field_id ] ) ) {
-					$field_value = array();
-					continue;
-				}
-
-				$field = $fields[ $field_id ];
-				$field->set_values( $field_value );
-				$field->parse_save_values();
-
-				$field_value = $field->get_values();
-
-				// if the field is a repeatable field, store the whole array of them, if it's not repeatble,
-				// just store the first (and only) one directly.
-				if ( ! $field->args['repeatable'] ) {
-					$field_value = reset( $field_value );
-				}
-			}
-		}
-
-	}
-
-	/**
-	 * Add assigned fields to group data.
-	 *
-	 * @param CMB_Field $field Field object.
-	 */
-	public function add_field( CMB_Field $field ) {
-		$field->parent = $this;
-		$this->fields[ $field->id ] = $field;
-	}
-
-	/**
-	 * Assemble all defined fields for group.
-	 *
-	 * @return array
-	 */
-	public function &get_fields() {
-		return $this->fields;
-	}
-
-	/**
-	 * Set values for each field in the group.
-	 *
-	 * @param array $values Existing or default values for all fields.
-	 */
-	public function set_values( array $values ) {
-
-		$fields       = &$this->get_fields();
-		$this->values = $values;
-
-		// Reset all field values.
-		foreach ( $fields as $field ) {
-			$field->set_values( array() );
-		}
-
-		foreach ( $values as $value ) {
-			foreach ( $value as $field_id => $field_value ) {
-				$fields[ $field_id ]->set_values( (array) $field_value );
-			}
-		}
-
-	}
-}
diff --git a/custom-meta-boxes.php b/custom-meta-boxes.php
index 43a4639a..789ea56e 100755
--- a/custom-meta-boxes.php
+++ b/custom-meta-boxes.php
@@ -41,17 +41,46 @@
 /**
  * Include base, required files.
  */
-include_once( CMB_PATH . 'classes.fields.php' );
 include_once( CMB_PATH . 'class.cmb-meta-box.php' );
+
+/**
+ * Field types that are extended.
+ */
+include_once( CMB_PATH . 'fields/class-cmb-field.php' );
+include_once( CMB_PATH . 'fields/class-cmb-file-field.php' );
+include_once( CMB_PATH . 'fields/class-cmb-select.php' );
+include_once( CMB_PATH . 'fields/class-cmb-text-field.php' );
+include_once( CMB_PATH . 'fields/class-cmb-textarea-field.php' );
+
+/**
+ * Final field types.
+ */
+include_once( CMB_PATH . 'fields/class-cmb-checkbox.php' );
 include_once( CMB_PATH . 'fields/class-cmb-checkbox-multi.php' );
+include_once( CMB_PATH . 'fields/class-cmb-color-picker.php' );
+include_once( CMB_PATH . 'fields/class-cmb-date-field.php' );
+include_once( CMB_PATH . 'fields/class-cmb-date-timestamp-field.php' );
+include_once( CMB_PATH . 'fields/class-cmb-datetime-timestamp-field.php' );
 include_once( CMB_PATH . 'fields/class-cmb-email-field.php' );
+include_once( CMB_PATH . 'fields/class-cmb-gmap-field.php' );
+include_once( CMB_PATH . 'fields/class-cmb-group-field.php' );
 include_once( CMB_PATH . 'fields/class-cmb-hidden-field.php' );
+include_once( CMB_PATH . 'fields/class-cmb-image-field.php' );
+include_once( CMB_PATH . 'fields/class-cmb-number-field.php' );
+include_once( CMB_PATH . 'fields/class-cmb-post-select.php' );
+include_once( CMB_PATH . 'fields/class-cmb-radio-field.php' );
+include_once( CMB_PATH . 'fields/class-cmb-taxonomy.php' );
+include_once( CMB_PATH . 'fields/class-cmb-text-small-field.php' );
+include_once( CMB_PATH . 'fields/class-cmb-textarea-field-code.php' );
+include_once( CMB_PATH . 'fields/class-cmb-time-field.php' );
+include_once( CMB_PATH . 'fields/class-cmb-title.php' );
+include_once( CMB_PATH . 'fields/class-cmb-url-field.php' );
+include_once( CMB_PATH . 'fields/class-cmb-wysiwyg.php' );
 
 /**
  * Make it possible to add fields in locations other than post edit screen. Optional.
  */
 include_once( CMB_PATH . '/fields-anywhere.php' );
-include_once( CMB_PATH . 'fields/class-cmb-gmap-field.php' );
 
 /**
  * Get all the meta boxes on init.
diff --git a/fields/class-cmb-checkbox-multi.php b/fields/class-cmb-checkbox-multi.php
index 36660cd6..1769bfa8 100644
--- a/fields/class-cmb-checkbox-multi.php
+++ b/fields/class-cmb-checkbox-multi.php
@@ -1,18 +1,15 @@
 <?php
-/**
- * Checkbox-Multi field type.
- *
- * @package WordPress
- * @subpackage Custom Meta Boxes
- */
-
 /**
  * Class CMB_Checkbox_Multi
  *
  * @since 1.1.0
  *
  * @extends CMB_Fields
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
  */
+
 class CMB_Checkbox_Multi extends CMB_Field {
 
 	/**
diff --git a/fields/class-cmb-checkbox.php b/fields/class-cmb-checkbox.php
new file mode 100644
index 00000000..bbdacdbe
--- /dev/null
+++ b/fields/class-cmb-checkbox.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Standard checkbox field.
+ *
+ * @since 1.0.0
+ *
+ * @extends CMB_Field
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
+
+class CMB_Checkbox extends CMB_Field {
+
+	/**
+	 * Print out field HTML - in this case intentionally empty.
+	 */
+	public function title() {}
+
+	/**
+	 * Print out field HTML.
+	 */
+	public function html() {
+		?>
+
+		<input <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr(); ?> type="checkbox" <?php $this->name_attr(); ?>  value="1" <?php checked( $this->get_value() ); ?> />
+		<label <?php $this->for_attr(); ?>><?php echo esc_html( $this->title ); ?></label>
+
+		<?php
+	}
+}
diff --git a/fields/class-cmb-color-picker.php b/fields/class-cmb-color-picker.php
new file mode 100644
index 00000000..a1cc0f1d
--- /dev/null
+++ b/fields/class-cmb-color-picker.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ *  Colour picker
+ *
+ * @since 1.0.0
+ *
+ * @extends CMB_Field
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
+
+class CMB_Color_Picker extends CMB_Field {
+
+	/**
+	 * Enqueue all scripts required by the field.
+	 *
+	 * @uses wp_enqueue_script()
+	 */
+	public function enqueue_scripts() {
+
+		parent::enqueue_scripts();
+
+		wp_enqueue_script( 'cmb-colorpicker', trailingslashit( CMB_URL ) . 'js/field.colorpicker.js', array( 'jquery', 'wp-color-picker', 'cmb-scripts' ), CMB_VERSION );
+		wp_enqueue_style( 'wp-color-picker' );
+	}
+
+	/**
+	 * Print out field HTML.
+	 */
+	public function html() {
+		?>
+
+		<input <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr( 'cmb_colorpicker cmb_text_small' ); ?> type="text" <?php $this->name_attr(); ?> value="<?php echo esc_attr( $this->get_value() ); ?>" />
+
+		<?php
+	}
+}
\ No newline at end of file
diff --git a/fields/class-cmb-date-field.php b/fields/class-cmb-date-field.php
new file mode 100644
index 00000000..59f87c4e
--- /dev/null
+++ b/fields/class-cmb-date-field.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Date picker meta box field.
+ *
+ * @since 1.0.0
+ *
+ * @extends CMB_Field
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
+
+class CMB_Date_Field extends CMB_Field {
+
+	/**
+	 * Enqueue all scripts required by the field.
+	 *
+	 * @uses wp_enqueue_script()
+	 */
+	public function enqueue_scripts() {
+		parent::enqueue_scripts();
+		wp_enqueue_style( 'cmb-jquery-ui', trailingslashit( CMB_URL ) . 'css/vendor/jquery-ui/jquery-ui.css', '1.10.3' );
+		wp_enqueue_script( 'cmb-datetime', trailingslashit( CMB_URL ) . 'js/field.datetime.js', array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'cmb-scripts' ), CMB_VERSION );
+	}
+
+	/**
+	 * Print out field HTML.
+	 */
+	public function html() {
+		// If the user has set a cols arg of less than 6 columns, allow the intput
+		// to go full-width.
+		$classes = ( is_int( $this->args['cols'] ) && $this->args['cols'] <= 6 ) ? 'cmb_datepicker' : 'cmb_text_small cmb_datepicker' ;
+		?>
+
+		<input <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr( $classes ); ?> type="text" <?php $this->name_attr(); ?> value="<?php echo esc_attr( $this->value ); ?>" />
+
+		<?php
+	}
+}
diff --git a/fields/class-cmb-date-timestamp-field.php b/fields/class-cmb-date-timestamp-field.php
new file mode 100644
index 00000000..23fad65f
--- /dev/null
+++ b/fields/class-cmb-date-timestamp-field.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Date picker for date only (not time) box.
+ *
+ * @since 1.0.0
+ *
+ * @extends CMB_Field
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
+
+class CMB_Date_Timestamp_Field extends CMB_Field {
+
+	/**
+	 * Enqueue all scripts required by the field.
+	 *
+	 * @uses wp_enqueue_script()
+	 */
+	public function enqueue_scripts() {
+
+		parent::enqueue_scripts();
+
+		wp_enqueue_style( 'cmb-jquery-ui', trailingslashit( CMB_URL ) . 'css/vendor/jquery-ui/jquery-ui.css', '1.10.3' );
+
+		wp_enqueue_script( 'cmb-timepicker', trailingslashit( CMB_URL ) . 'js/jquery.timePicker.min.js', array( 'jquery', 'cmb-scripts' ) );
+		wp_enqueue_script( 'cmb-datetime', trailingslashit( CMB_URL ) . 'js/field.datetime.js', array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'cmb-scripts' ), CMB_VERSION );
+
+	}
+
+	/**
+	 * Print out field HTML.
+	 */
+	public function html() {
+		?>
+
+		<input <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr( 'cmb_text_small cmb_datepicker' ); ?> type="text" <?php $this->name_attr(); ?>  value="<?php echo $this->value ? esc_attr( date( 'm\/d\/Y', $this->value ) ) : '' ?>" />
+
+		<?php
+	}
+
+	/**
+	 * Convert val/**
+	ues into UNIX time values and sort.
+	 */
+	public function parse_save_values() {
+
+		foreach ( $this->values as &$value ) {
+			$value = strtotime( $value );
+		}
+
+		sort( $this->values );
+
+	}
+}
diff --git a/fields/class-cmb-datetime-timestamp-field.php b/fields/class-cmb-datetime-timestamp-field.php
new file mode 100644
index 00000000..c50165a9
--- /dev/null
+++ b/fields/class-cmb-datetime-timestamp-field.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Date picker for date and time (seperate fields) box.
+ *
+ * @since 1.0.0
+ *
+ * @extends CMB_Field
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
+
+class CMB_Datetime_Timestamp_Field extends CMB_Field {
+
+	/**
+	 * Enqueue all scripts required by the field.
+	 *
+	 * @uses wp_enqueue_script()
+	 */
+	public function enqueue_scripts() {
+
+		parent::enqueue_scripts();
+
+		wp_enqueue_style( 'cmb-jquery-ui', trailingslashit( CMB_URL ) . 'css/vendor/jquery-ui/jquery-ui.css', '1.10.3' );
+
+		wp_enqueue_script( 'cmb-timepicker', trailingslashit( CMB_URL ) . 'js/jquery.timePicker.min.js', array( 'jquery', 'cmb-scripts' ) );
+		wp_enqueue_script( 'cmb-datetime', trailingslashit( CMB_URL ) . 'js/field.datetime.js', array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'cmb-scripts' ), CMB_VERSION );
+	}
+
+	/**
+	 * Print out field HTML.
+	 */
+	public function html() {
+		?>
+
+		<input <?php $this->id_attr( 'date' ); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr( 'cmb_text_small cmb_datepicker' ); ?> type="text" <?php $this->name_attr( '[date]' ); ?>  value="<?php echo $this->value ? esc_attr( date( 'm\/d\/Y', $this->value ) ) : '' ?>" />
+		<input <?php $this->id_attr( 'time' ); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr( 'cmb_text_small cmb_timepicker' ); ?> type="text" <?php $this->name_attr( '[time]' ); ?> value="<?php echo $this->value ? esc_attr( date( 'h:i A', $this->value ) ) : '' ?>" />
+
+		<?php
+	}
+
+	/**
+	 * Convert values into UNIX time values and sort.
+	 */
+	public function parse_save_values() {
+
+		// Convert all [date] and [time] values to a unix timestamp.
+		// If date is empty, assume delete. If time is empty, assume 00:00.
+		foreach ( $this->values as $key => &$value ) {
+			if ( empty( $value['date'] ) ) {
+				unset( $this->values[ $key ] );
+			} else {
+				$value = strtotime( $value['date'] . ' ' . $value['time'] );
+			}
+		}
+
+		$this->values = array_filter( $this->values );
+		sort( $this->values );
+
+		parent::parse_save_values();
+
+	}
+}
diff --git a/fields/class-cmb-email-field.php b/fields/class-cmb-email-field.php
index f56e9a97..89288642 100644
--- a/fields/class-cmb-email-field.php
+++ b/fields/class-cmb-email-field.php
@@ -1,18 +1,15 @@
 <?php
-/**
- * Email field type.
- *
- * @package WordPress
- * @subpackage Custom Meta Boxes
- */
-
 /**
  * Standard text meta box for an email.
  *
  * @since 1.1.0
  *
  * @extends CMB_Field
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
  */
+
 class CMB_Email_Field extends CMB_Field {
 
 	/**
diff --git a/fields/class-cmb-field.php b/fields/class-cmb-field.php
new file mode 100644
index 00000000..35fd01ce
--- /dev/null
+++ b/fields/class-cmb-field.php
@@ -0,0 +1,588 @@
+<?php
+/**
+ * Abstract class for all fields.
+ * Subclasses need only override html()
+ *
+ * @abstract
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
+
+abstract class CMB_Field {
+
+	/**
+	 * Current field value.
+	 *
+	 * @var mixed
+	 */
+	public $value;
+
+	/**
+	 * Current field placement index.
+	 *
+	 * @var int
+	 */
+	public $field_index = 0;
+
+	/**
+	 * CMB_Field constructor.
+	 *
+	 * @param string $name Field name/ID.
+	 * @param string $title Title to display in field.
+	 * @param array  $values Values to populate field(s) with.
+	 * @param array  $args Optional. Field definitions/arguments.
+	 */
+	public function __construct( $name, $title, array $values, $args = array() ) {
+
+		$this->id    = $name;
+		$this->name  = $name . '[]';
+		$this->title = $title;
+		$this->args  = wp_parse_args( $args, $this->get_default_args() );
+
+		// Deprecated argument: 'std'
+		if ( ! empty( $this->args['std'] ) && empty( $this->args['default'] ) ) {
+			$this->args['default'] = $this->args['std'];
+			_deprecated_argument( 'CMB_Field', '0.9', "field argument 'std' is deprecated, use 'default' instead" );
+		}
+
+		if ( ! empty( $this->args['options'] ) && is_array( reset( $this->args['options'] ) ) ) {
+			$re_format = array();
+			foreach ( $this->args['options'] as $option ) {
+				$re_format[ $option['value'] ] = $option['name'];
+			}
+			$this->args['options'] = $re_format;
+		}
+
+		// If the field has a custom value populator callback.
+		if ( ! empty( $args['values_callback'] ) ) {
+			$this->values = call_user_func( $args['values_callback'], get_the_id() );
+		} else {
+			$this->values = $values;
+		}
+
+		$this->value = reset( $this->values );
+	}
+
+	/**
+	 * Establish baseline default arguments for a field.
+	 *
+	 * @return array Default arguments.
+	 */
+	public function default_args() {
+		return array(
+			'desc'                => '',
+			'repeatable'          => false,
+			'sortable'            => false,
+			'repeatable_max'      => null,
+			'show_label'          => false,
+			'readonly'            => false,
+			'disabled'            => false,
+			'default'             => '',
+			'cols'                => '12',
+			'style'               => '',
+			'class'               => '',
+			'data_delegate'       => null,
+			'save_callback'       => null,
+			'capability'          => 'edit_posts',
+			'string-repeat-field' => __( 'Add New', 'cmb' ),
+			'string-delete-field' => __( 'Remove', 'cmb' ),
+			'confirm_delete'      => true,
+		);
+	}
+
+	/**
+	 * Get the default args for the abstract field.
+	 * These args are available to all fields.
+	 *
+	 * @return array $args
+	 */
+	public function get_default_args() {
+
+		/**
+		 * Filter the default arguments passed by a field class.
+		 *
+		 * @param array $args default field arguments.
+		 * @param string $class Field class being called
+		 */
+		return apply_filters( 'cmb_field_default_args', $this->default_args(), get_class( $this ) );
+	}
+
+	/**
+	 * Enqueue all scripts required by the field.
+	 *
+	 * @uses wp_enqueue_script()
+	 */
+	public function enqueue_scripts() {
+
+		if ( isset( $this->args['sortable'] ) && $this->args['sortable'] && $this->args['repeatable'] ) {
+			wp_enqueue_script( 'jquery-ui-sortable' );
+		}
+
+	}
+
+	/**
+	 * Enqueue all styles required by the field.
+	 *
+	 * @uses wp_enqueue_style()
+	 */
+	public function enqueue_styles() {}
+
+	/**
+	 * Output the field input ID attribute.
+	 *
+	 * If multiple inputs are required for a single field,
+	 * use the append parameter to add unique identifier.
+	 *
+	 * @param  string $append Optional. ID to place.
+	 */
+	public function id_attr( $append = null ) {
+
+		/**
+		 * Modify the id attribute of a field.
+		 *
+		 * @param string $id ID Attribute
+		 * @param string $append ID to place.
+		 * @param array $args Arguments for this particular field.
+		 */
+		$id = apply_filters( 'cmb_field_id_attribute', $this->get_the_id_attr( $append ), $append, $this->args );
+
+		printf( 'id="%s"', esc_attr( $id ) );
+
+	}
+
+	/**
+	 * Output the for attribute for the field.
+	 *
+	 * If multiple inputs are required for a single field,
+	 * use the append parameter to add unique identifier.
+	 *
+	 * @param  string $append Optional. ID to place.
+	 * @return string Modified id attribute contents
+	 */
+	public function get_the_id_attr( $append = null ) {
+
+		$id = $this->id;
+
+		if ( isset( $this->parent ) ) {
+			$parent_id = preg_replace( '/cmb\-field\-(\d+|x)/', 'cmb-group-$1', $this->parent->get_the_id_attr() );
+			$id = $parent_id . '[' . $id . ']';
+		}
+
+		$id .= '-cmb-field-' . $this->field_index;
+
+		if ( ! is_null( $append ) ) {
+			$id .= '-' . $append;
+		}
+
+		$id = str_replace( array( '[', ']', '--' ), '-', $id );
+
+		return $id;
+
+	}
+
+	/**
+	 * Output the field input ID attribute value.
+	 *
+	 * If multiple inputs are required for a single field,
+	 * use the append parameter to add unique identifier.
+	 *
+	 * @see get_the_id_attr
+	 *
+	 * @param string $append Optional. for value to place.
+	 */
+	public function for_attr( $append = null ) {
+
+		/**
+		 * Modify the for attribute of a field.
+		 *
+		 * @param string $for For attribute
+		 * @param array $args Arguments for this particular field.
+		 */
+		$for = apply_filters( 'cmb_field_for_attribute', $this->get_the_id_attr( $append ), $this->args );
+
+		printf( 'for="%s"', esc_attr( $for ) );
+
+	}
+
+	/**
+	 * Output HTML name attribute for a field.
+	 *
+	 * @see get_the_name_attr
+	 *
+	 * @param string $append Optional. Name to place.
+	 */
+	public function name_attr( $append = null ) {
+
+		/**
+		 * Modify the name attribute of a field.
+		 *
+		 * @param string $name Name attribute
+		 * @param array $args Arguments for this particular field.
+		 */
+		$name = apply_filters( 'cmb_field_name_attribute', $this->get_the_name_attr( $append ), $this->args );
+
+		printf( 'name="%s"', esc_attr( $name ) );
+
+	}
+
+	/**
+	 * Get the name attribute contents for a field.
+	 *
+	 * @param null $append Optional. Name to place.
+	 * @return string Name attribute contents.
+	 */
+	public function get_the_name_attr( $append = null ) {
+
+		$name = str_replace( '[]', '', $this->name );
+
+		if ( isset( $this->parent ) ) {
+			$parent_name = preg_replace( '/cmb\-field\-(\d+|x)/', 'cmb-group-$1', $this->parent->get_the_name_attr() );
+			$name = $parent_name . '[' . $name . ']';
+		}
+
+		$name .= "[cmb-field-$this->field_index]";
+
+		if ( ! is_null( $append ) ) {
+			$name .= $append;
+		}
+
+		return $name;
+
+	}
+
+	/**
+	 * Output class attribute for a field.
+	 *
+	 * @param string $classes Optional. Classes to assign to the field.
+	 */
+	public function class_attr( $classes = '' ) {
+
+		// Combine any passed-in classes and the ones defined in the arguments and sanitize them.
+		$all_classes = array_unique( explode( ' ', $classes . ' ' . $this->args['class'] ) );
+		$classes     = array_map( 'sanitize_html_class', array_filter( $all_classes ) );
+
+		/**
+		 * Modify the classes assigned to a field.
+		 *
+		 * @param array $classes Classes currently assigned to the field
+		 * @param array $args Arguments for this particular field.
+		 */
+		$classes = apply_filters( 'cmb_field_classes', $classes, $this->args );
+
+		if ( $classes = implode( ' ', $classes ) ) { ?>
+
+			class="<?php echo esc_attr( $classes ); ?>"
+
+		<?php }
+
+	}
+
+	/**
+	 * Get JS Safe ID.
+	 *
+	 * For use as a unique field identifier in javascript.
+	 *
+	 * @return string JS-escaped ID string.
+	 */
+	public function get_js_id() {
+
+		return str_replace( array( '-', '[', ']', '--' ),'_', $this->get_the_id_attr() );
+
+	}
+
+	/**
+	 * Print one or more HTML5 attributes for a field.
+	 *
+	 * @param array $attrs Optional. Attributes to define in the field.
+	 */
+	public function boolean_attr( $attrs = array() ) {
+
+		if ( $this->args['readonly'] ) {
+			$attrs[] = 'readonly';
+		}
+
+		if ( $this->args['disabled'] ) {
+			$attrs[] = 'disabled';
+		}
+
+		$attrs = array_filter( array_unique( $attrs ) );
+
+		/**
+		 * Modify any boolean attributes assigned to a field.
+		 *
+		 * @param array $attrs Boolean attributes.
+		 * @param array $args Arguments for this particular field.
+		 */
+		$attrs = apply_filters( 'cmb_field_boolean_attributes', $attrs, $this->args );
+
+		foreach ( $attrs as $attr ) {
+			echo esc_html( $attr ) . '="' . esc_attr( $attr ) . '"';
+		}
+
+	}
+
+	/**
+	 * Check if this field has a data delegate set
+	 *
+	 * @return boolean Set or turned off.
+	 */
+	public function has_data_delegate() {
+		return (bool) $this->args['data_delegate'];
+	}
+
+	/**
+	 * Get the array of data from the data delegate.
+	 *
+	 * @return array mixed
+	 */
+	protected function get_delegate_data() {
+
+		if ( $this->args['data_delegate'] ) {
+			return call_user_func_array( $this->args['data_delegate'], array( $this ) );
+		}
+
+		return array();
+
+	}
+
+	/**
+	 * Get the existing or default value for a field.
+	 *
+	 * @return mixed
+	 */
+	public function get_value() {
+		return ( $this->value || '0' === $this->value  ) ? $this->value : $this->args['default'];
+	}
+
+	/**
+	 * Get multiple values for a field.
+	 *
+	 * @return array
+	 */
+	public function &get_values() {
+		return $this->values;
+	}
+
+	/**
+	 * Define multiple values for a field and completely remove the singular value variable.
+	 *
+	 * @param array $values Field values.
+	 */
+	public function set_values( array $values ) {
+
+		$this->values = $values;
+
+		unset( $this->value );
+
+	}
+
+	/**
+	 * Parse and validate an array of values.
+	 *
+	 * Meant to be extended.
+	 */
+	public function parse_save_values() {}
+
+	/**
+	 * Parse and validate a single value.
+	 *
+	 * Meant to be extended.
+	 */
+	public function parse_save_value() {}
+
+	/**
+	 * Save values for the field.
+	 *
+	 * @todo this surely only works for posts
+	 * @todo why do values need to be passed in, they can already be passed in on construct
+	 *
+	 * @param int   $post_id Post ID.
+	 * @param array $values Values to save.
+	 */
+	public function save( $post_id, $values ) {
+
+		// Don't save readonly values.
+		if ( $this->args['readonly'] ) {
+			return;
+		}
+
+		$this->values = $values;
+		$this->parse_save_values();
+
+		// Allow override from args.
+		if ( ! empty( $this->args['save_callback'] ) ) {
+
+			call_user_func( $this->args['save_callback'], $this->values, $post_id );
+
+			return;
+
+		}
+
+		// If we are not on a post edit screen.
+		if ( ! $post_id ) {
+			return;
+		}
+
+		delete_post_meta( $post_id, $this->id );
+
+		foreach ( $this->values as $v ) {
+
+			$this->value = $v;
+			$this->parse_save_value();
+
+			if ( $this->value || '0' === $this->value ) {
+				add_post_meta( $post_id, $this->id, $this->value );
+			}
+		}
+	}
+
+	/**
+	 * Check whether the current field should or should not be displayed.
+	 */
+	public function is_displayed() {
+		return current_user_can( $this->args['capability'] );
+	}
+
+	/**
+	 * Print title for field.
+	 */
+	public function title() {
+
+		if ( $this->title ) : ?>
+
+			<div class="field-title">
+				<label <?php $this->for_attr(); ?>>
+					<?php echo esc_html( $this->title ); ?>
+				</label>
+			</div>
+
+		<?php endif;
+
+	}
+
+	/**
+	 * Print description for field.
+	 */
+	public function description() {
+
+		if ( ! empty( $this->args['desc'] ) ) : ?>
+
+			<div class="cmb_metabox_description">
+				<?php echo wp_kses_post( $this->args['desc'] ); ?>
+			</div>
+
+		<?php endif;
+
+	}
+
+	/**
+	 * Print out a field.
+	 */
+	public function display() {
+
+		// If there are no values, we need to start with an empty string since we're foreaching through.
+		if ( ! $this->get_values() && ! $this->args['repeatable'] ) {
+			$values = array( '' );
+		} else {
+			$values = $this->get_values(); // Make PHP5.4 >= happy.
+			$values = empty( $values ) ? array( '' ) : $values;
+		}
+
+		// Print title if necessary.
+		$this->title();
+
+		// Print description if necessary.
+		$this->description();
+
+		$i = 0;
+		if ( isset( $this->args['type'] ) && 'gmap' == $this->args['type'] ) {
+			$values = array( $values );
+		}
+
+		foreach ( $values as $key => $value ) {
+
+			$this->field_index = $i;
+			$this->value       = $value;
+			?>
+
+			<div class="field-item" data-class="<?php echo esc_attr( get_class( $this ) ); ?>" style="position: relative; <?php echo esc_attr( $this->args['style'] ); ?>">
+
+				<?php if ( $this->args['repeatable'] ) {
+					$this->delete_button_markup();
+				} ?>
+
+				<?php $this->html(); ?>
+
+			</div>
+
+			<?php
+
+			$i++;
+
+		}
+
+		// Insert a hidden one if it's repeatable.
+		if ( $this->args['repeatable'] ) {
+			$this->repeatable_button_markup();
+		}
+	}
+
+	/**
+	 * Markup to print an "add" button and for a repeatable field.
+	 */
+	protected function repeatable_button_markup() {
+		// X used to distinguish hidden fields.
+		$this->field_index = 'x';
+		$this->value       = '';
+		?>
+
+		<div class="field-item hidden" data-class="<?php echo esc_attr( get_class( $this ) ); ?>" style="position: relative; <?php echo esc_attr( $this->args['style'] ); ?>">
+
+			<?php $this->delete_button_markup(); ?>
+
+			<?php $this->html(); ?>
+
+		</div>
+
+		<button class="button repeat-field"><?php echo esc_html( $this->args['string-repeat-field'] ); ?></button>
+
+		<?php
+	}
+
+	/**
+	 * Markup to print a "remove" button for a repeatable field.
+	 */
+	protected function delete_button_markup() {
+		?>
+		<button class="cmb-delete-field" title="<?php echo esc_attr( $this->args['string-delete-field'] ); ?>">
+			<span class="cmb-delete-field-icon">&times;</span>
+			<?php echo esc_html( $this->args['string-delete-field'] ); ?>
+		</button>
+		<?php
+	}
+
+	/**
+	 * Determine whether we're creating a new object or on an existing object.
+	 *
+	 * This is used so that the plugin has some awareness of whether we're dealing with an
+	 * existing or new object. This is important for things like knowing whether or not to
+	 * load default values when populating a field view.
+	 *
+	 * @return bool|null True if is new, false if existing, and null if not in the admin.
+	 */
+	protected function is_new_object() {
+		$screen = get_current_screen();
+		if ( null === $screen || ! $screen->in_admin ) {
+			return null;
+		}
+
+		$id = $GLOBALS['hook_suffix'];
+		$id = ( '.php' == substr( $id, -4 ) ) ? substr( $id, 0, -4 ) : $id;
+		if ( 'post-new' === $id || 'link-add' === $id || 'media-new' === $id || 'user-new' === $id ) {
+			return true;
+		}
+
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/fields/class-cmb-file-field.php b/fields/class-cmb-file-field.php
new file mode 100644
index 00000000..929f2e3b
--- /dev/null
+++ b/fields/class-cmb-file-field.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Field for image upload / file upload.
+ *
+ * @todo ability to set image size (preview image) from caller
+ *
+ * @since 1.0.0
+ *
+ * @extends CMB_Field
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
+
+class CMB_File_Field extends CMB_Field {
+
+	/**
+	 * Get default arguments for field including custom parameters.
+	 *
+	 * @return array Default arguments for field.
+	 */
+	public function default_args() {
+		return array_merge(
+			parent::default_args(),
+			array(
+				'library-type' => array(
+					'video',
+					'audio',
+					'text',
+					'application',
+				),
+			)
+		);
+	}
+
+	/**
+	 * Enqueue all scripts required by the field.
+	 *
+	 * @uses wp_enqueue_script()
+	 */
+	function enqueue_scripts() {
+
+		global $post_ID;
+		$post_ID = isset( $post_ID ) ? (int) $post_ID : 0;
+
+		parent::enqueue_scripts();
+
+		wp_enqueue_media( array( 'post' => $post_ID ) );
+		wp_enqueue_script( 'cmb-file-upload', trailingslashit( CMB_URL ) . 'js/file-upload.js', array( 'jquery', 'cmb-scripts' ), CMB_VERSION );
+
+	}
+
+	/**
+	 * Print out field HTML.
+	 */
+	public function html() {
+
+		if ( $this->get_value() ) {
+			$src = wp_mime_type_icon( $this->get_value() );
+			if ( strpos( $src, site_url() !== false ) ) {
+				$size = getimagesize( str_replace( site_url(), ABSPATH, $src ) );
+			} else {
+				$size = null;
+			}
+			$icon_img = '<img src="' . $src . '" ' . ( $size ? $size[3] : '' ) . ' />';
+		}
+
+		$data_type = ( ! empty( $this->args['library-type'] ) ? implode( ',', $this->args['library-type'] ) : null );
+
+		?>
+
+		<div class="cmb-file-wrap" <?php echo 'data-type="' . esc_attr( $data_type ) . '"'; ?>>
+
+			<div class="cmb-file-wrap-placeholder"></div>
+
+			<button class="button cmb-file-upload <?php echo esc_attr( $this->get_value() ) ? 'hidden' : '' ?>">
+				<?php esc_html_e( 'Add File', 'cmb' ); ?>
+			</button>
+
+			<div class="cmb-file-holder type-file <?php echo $this->get_value() ? '' : 'hidden'; ?>">
+
+				<?php if ( $this->get_value() ) : ?>
+
+					<?php
+					if ( isset( $icon_img ) ) {
+						echo $icon_img;
+					}
+					?>
+
+					<div class="cmb-file-name">
+						<strong><?php echo esc_html( basename( get_attached_file( $this->get_value() ) ) ); ?></strong>
+					</div>
+
+				<?php endif; ?>
+
+			</div>
+
+			<button class="cmb-remove-file button <?php echo $this->get_value() ? '' : 'hidden'; ?>">
+				<?php esc_html_e( 'Remove', 'cmb' ); ?>
+			</button>
+
+			<input type="hidden"
+				<?php $this->class_attr( 'cmb-file-upload-input' ); ?>
+				<?php $this->name_attr(); ?>
+				   value="<?php echo esc_attr( $this->value ); ?>"
+			/>
+
+		</div>
+
+		<?php
+	}
+}
diff --git a/fields/class-cmb-gmap-field.php b/fields/class-cmb-gmap-field.php
index cbb864b0..ecab0fcf 100644
--- a/fields/class-cmb-gmap-field.php
+++ b/fields/class-cmb-gmap-field.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * Google Map field type.
- *
- * @package WordPress
- * @subpackage Custom Meta Boxes
- */
-
 /**
  * Google map field class for CMB
  *
@@ -17,7 +10,11 @@
  * @since 1.0.2
  *
  * @extends CMB_Field
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
  */
+
 class CMB_Gmap_Field extends CMB_Field {
 
 	/**
diff --git a/fields/class-cmb-group-field.php b/fields/class-cmb-group-field.php
new file mode 100644
index 00000000..620eddd4
--- /dev/null
+++ b/fields/class-cmb-group-field.php
@@ -0,0 +1,270 @@
+<?php
+/**
+ * Field to group child fields
+ * pass $args[fields] array for child fields
+ * pass $args['repeatable'] for cloing all child fields (set)
+ *
+ * @todo remove global $post reference, somehow
+ *
+ * @since 1.0.0
+ *
+ * @extends CMB_Field
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
+
+class CMB_Group_Field extends CMB_Field {
+
+	static $added_js;
+
+	/**
+	 * Fields arguments and information.
+	 *
+	 * @var array
+	 */
+	private $fields = array();
+
+	/**
+	 * CMB_Group_Field constructor.
+	 */
+	function __construct() {
+
+		// You can't just put func_get_args() into a function as a parameter.
+		$args = func_get_args();
+		call_user_func_array( array( 'parent', '__construct' ), $args );
+
+		if ( ! empty( $this->args['fields'] ) ) {
+			foreach ( $this->args['fields'] as $f ) {
+
+				$class = _cmb_field_class_for_type( $f['type'] );
+
+				if ( ! empty( $class ) && class_exists( $class ) ) {
+					$this->add_field( new $class( $f['id'], $f['name'], array(), $f ) );
+				}
+			}
+		}
+
+	}
+
+	/**
+	 * Get default arguments for field including custom parameters.
+	 *
+	 * @return array Default arguments for field.
+	 */
+	public function default_args() {
+		return array_merge(
+			parent::default_args(),
+			array(
+				'fields'              => array(),
+				'string-repeat-field' => __( 'Add New Group', 'cmb' ),
+				'string-delete-field' => __( 'Remove Group', 'cmb' ),
+			)
+		);
+	}
+
+	/**
+	 * Enqueue all scripts required by the field.
+	 *
+	 * @uses wp_enqueue_script()
+	 */
+	public function enqueue_scripts() {
+
+		parent::enqueue_scripts();
+
+		foreach ( $this->args['fields'] as $f ) {
+			$class = _cmb_field_class_for_type( $f['type'] );
+			if ( ! empty( $class ) && class_exists( $class ) ) {
+				$field = new $class( '', '', array(), $f );
+				$field->enqueue_scripts();
+			}
+		}
+
+	}
+
+	/**
+	 * Enqueue all styles required by the field.
+	 *
+	 * @uses wp_enqueue_style()
+	 */
+	public function enqueue_styles() {
+
+		parent::enqueue_styles();
+
+		foreach ( $this->args['fields'] as $f ) {
+			$class = _cmb_field_class_for_type( $f['type'] );
+			if ( ! empty( $class ) && class_exists( $class ) ) {
+				$field = new $class( '', '', array(), $f );
+				$field->enqueue_styles();
+			}
+		}
+
+	}
+
+	/**
+	 * Display output for group.
+	 */
+	public function display() {
+
+		global $post;
+
+		$field = $this->args;
+		$values = $this->get_values();
+
+		$this->title();
+		$this->description();
+
+		if ( ! $this->args['repeatable'] && empty( $values ) ) {
+			$values = array( null );
+		} else {
+			$values = $this->get_values(); // Make PHP5.4 >= happy.
+			$values = ( empty( $values ) ) ? array( '' ) : $values;
+		}
+
+		$i = 0;
+		foreach ( $values as $value ) {
+
+			$this->field_index = $i;
+			$this->value = $value;
+
+			?>
+
+			<div class="field-item" data-class="<?php echo esc_attr( get_class( $this ) ) ?>" style="<?php echo esc_attr( $this->args['style'] ); ?>">
+				<?php $this->html(); ?>
+			</div>
+
+			<?php
+
+			$i++;
+
+		}
+
+		if ( $this->args['repeatable'] ) {
+
+			$this->field_index = 'x'; // X used to distinguish hidden fields.
+			$this->value = '';
+
+			?>
+
+			<div class="field-item hidden" data-class="<?php echo esc_attr( get_class( $this ) ); ?>" style="<?php echo esc_attr( $this->args['style'] ); ?>">
+				<?php $this->html(); ?>
+			</div>
+
+			<button class="button repeat-field">
+				<?php echo esc_html( $this->args['string-repeat-field'] ); ?>
+			</button>
+
+		<?php }
+
+	}
+
+	/**
+	 * Print out group field HTML.
+	 */
+	public function html() {
+
+		$fields = &$this->get_fields();
+		$value  = $this->get_value();
+
+		// Reset all field values.
+		foreach ( $fields as $field ) {
+			$field->set_values( array() );
+		}
+
+		// Set values for this field.
+		if ( ! empty( $value ) ) {
+			foreach ( $value as $field_id => $field_value ) {
+				$field_value = ( ! empty( $field_value ) ) ? $field_value : array();
+				if ( ! empty( $fields[ $field_id ] ) ) {
+					$fields[ $field_id ]->set_values( (array) $field_value );
+				}
+			}
+		}
+
+		?>
+
+		<?php if ( $this->args['repeatable'] ) : ?>
+			<button class="cmb-delete-field">
+				<span class="cmb-delete-field-icon">&times;</span>
+				<?php echo esc_html( $this->args['string-delete-field'] ); ?>
+			</button>
+		<?php endif; ?>
+
+		<?php CMB_Meta_Box::layout_fields( $fields ); ?>
+
+	<?php }
+
+	/**
+	 * Parse values individually based on what kind of field they are.
+	 */
+	public function parse_save_values() {
+
+		$fields = &$this->get_fields();
+		$values = &$this->get_values();
+
+		foreach ( $values as &$group_value ) {
+			foreach ( $group_value as $field_id => &$field_value ) {
+
+				if ( ! isset( $fields[ $field_id ] ) ) {
+					$field_value = array();
+					continue;
+				}
+
+				$field = $fields[ $field_id ];
+				$field->set_values( $field_value );
+				$field->parse_save_values();
+
+				$field_value = $field->get_values();
+
+				// if the field is a repeatable field, store the whole array of them, if it's not repeatble,
+				// just store the first (and only) one directly.
+				if ( ! $field->args['repeatable'] ) {
+					$field_value = reset( $field_value );
+				}
+			}
+		}
+
+	}
+
+	/**
+	 * Add assigned fields to group data.
+	 *
+	 * @param CMB_Field $field Field object.
+	 */
+	public function add_field( CMB_Field $field ) {
+		$field->parent = $this;
+		$this->fields[ $field->id ] = $field;
+	}
+
+	/**
+	 * Assemble all defined fields for group.
+	 *
+	 * @return array
+	 */
+	public function &get_fields() {
+		return $this->fields;
+	}
+
+	/**
+	 * Set values for each field in the group.
+	 *
+	 * @param array $values Existing or default values for all fields.
+	 */
+	public function set_values( array $values ) {
+
+		$fields       = &$this->get_fields();
+		$this->values = $values;
+
+		// Reset all field values.
+		foreach ( $fields as $field ) {
+			$field->set_values( array() );
+		}
+
+		foreach ( $values as $value ) {
+			foreach ( $value as $field_id => $field_value ) {
+				$fields[ $field_id ]->set_values( (array) $field_value );
+			}
+		}
+
+	}
+}
diff --git a/fields/class-cmb-hidden-field.php b/fields/class-cmb-hidden-field.php
index adf76917..b0cc10fb 100644
--- a/fields/class-cmb-hidden-field.php
+++ b/fields/class-cmb-hidden-field.php
@@ -1,18 +1,15 @@
 <?php
-/**
- * Hidden field type.
- *
- * @package WordPress
- * @subpackage Custom Meta Boxes
- */
-
 /**
  * Hidden field type.
  *
  * @since 1.1.0
  *
  * @extends CMB_Field
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
  */
+
 class CMB_Hidden_Field extends CMB_Field {
 
 	/**
diff --git a/fields/class-cmb-image-field.php b/fields/class-cmb-image-field.php
new file mode 100644
index 00000000..2c71db14
--- /dev/null
+++ b/fields/class-cmb-image-field.php
@@ -0,0 +1,159 @@
+<?php
+/**
+ * Field for image upload.
+ *
+ * @since 1.0.0
+ *
+ * @extends CMB_File_Field
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
+
+class CMB_Image_Field extends CMB_File_Field {
+
+	/**
+	 * Get default arguments for field including custom parameters.
+	 *
+	 * @return array Default arguments for field.
+	 */
+	public function default_args() {
+		return array_merge(
+			parent::default_args(),
+			array(
+				'size' => 'thumbnail',
+				'library-type' => array(
+					'image',
+				),
+				'show_size' => false,
+			)
+		);
+	}
+
+	/**
+	 * Print out field HTML.
+	 */
+	public function html() {
+
+		if ( $this->get_value() ) {
+			$image = wp_get_attachment_image_src( $this->get_value(), $this->args['size'], true );
+		}
+
+		// Convert size arg to array of width, height, crop.
+		$size = $this->parse_image_size( $this->args['size'] );
+
+		// Inline styles.
+		$styles              = sprintf( 'width: %1$dpx; height: %2$dpx; line-height: %2$dpx', intval( $size['width'] ), intval( $size['height'] ) );
+		$placeholder_styles  = sprintf( 'width: %dpx; height: %dpx;', intval( $size['width'] ) - 8, intval( $size['height'] ) - 8 );
+
+		$data_type           = ( ! empty( $this->args['library-type'] ) ? implode( ',', $this->args['library-type'] ) : null );
+
+		?>
+
+		<div class="cmb-file-wrap" style="<?php echo esc_attr( $styles ); ?>" data-type="<?php echo esc_attr( $data_type ); ?>" data-max-width="<?php echo absint( $size['width'] ); ?>">
+
+			<div class="cmb-file-wrap-placeholder" style="<?php echo esc_attr( $placeholder_styles ); ?>">
+
+				<?php if ( $this->args['show_size'] ) : ?>
+					<span class="dimensions">
+						<?php printf( '%dpx &times; %dpx', intval( $size['width'] ), intval( $size['height'] ) ); ?>
+					</span>
+				<?php endif; ?>
+
+			</div>
+
+			<button class="button cmb-file-upload <?php echo esc_attr( $this->get_value() ) ? 'hidden' : '' ?>" data-nonce="<?php echo wp_create_nonce( 'cmb-file-upload-nonce' ); ?>">
+				<?php esc_html_e( 'Add Image', 'cmb' ); ?>
+			</button>
+
+			<div class="cmb-file-holder type-img <?php echo $this->get_value() ? '' : 'hidden'; ?>" data-crop="<?php echo (bool) $size['crop']; ?>">
+
+				<?php if ( ! empty( $image ) ) : ?>
+					<img src="<?php echo esc_url( $image[0] ); ?>" width="<?php echo intval( $image[1] ); ?>" height="<?php echo intval( $image[2] ); ?>" />
+				<?php endif; ?>
+
+			</div>
+
+			<button class="cmb-remove-file button <?php echo $this->get_value() ? '' : 'hidden'; ?>">
+				<?php esc_html_e( 'Remove', 'cmb' ); ?>
+			</button>
+
+			<input type="hidden"
+				<?php $this->class_attr( 'cmb-file-upload-input' ); ?>
+				<?php $this->name_attr(); ?>
+				   value="<?php echo esc_attr( $this->value ); ?>"
+			/>
+
+		</div>
+
+	<?php }
+
+	/**
+	 * Parse the size argument to get pixel width, pixel height and crop information.
+	 *
+	 * @param string $size Size of image requested.
+	 * @return array width, height, crop
+	 */
+	private function parse_image_size( $size ) {
+
+		// Handle string for built-in image sizes.
+		if ( is_string( $size ) && in_array( $size, array( 'thumbnail', 'medium', 'large' ) ) ) {
+			return array(
+				'width'  => get_option( $size . '_size_w' ),
+				'height' => get_option( $size . '_size_h' ),
+				'crop'   => get_option( $size . '_crop' ),
+			);
+		}
+
+		// Handle string for additional image sizes.
+		global $_wp_additional_image_sizes;
+		if ( is_string( $size ) && isset( $_wp_additional_image_sizes[ $size ] ) ) {
+			return array(
+				'width'  => $_wp_additional_image_sizes[ $size ]['width'],
+				'height' => $_wp_additional_image_sizes[ $size ]['height'],
+				'crop'   => $_wp_additional_image_sizes[ $size ]['crop'],
+			);
+		}
+
+		// Handle default WP size format.
+		if ( is_array( $size ) && isset( $size[0] ) && isset( $size[1] ) ) {
+			$size = array( 'width' => $size[0], 'height' => $size[1] );
+		}
+
+		return wp_parse_args( $size, array(
+			'width'  => get_option( 'thumbnail_size_w' ),
+			'height' => get_option( 'thumbnail_size_h' ),
+			'crop'   => get_option( 'thumbnail_crop' ),
+		) );
+
+	}
+
+	/**
+	 * Ajax callback for outputing an image src based on post data.
+	 *
+	 * @return null
+	 */
+	static function request_image_ajax_callback() {
+
+		if ( ! ( isset( $_POST['nonce'] ) && wp_verify_nonce( $_POST['nonce'], 'cmb-file-upload-nonce' ) ) ) {
+			return;
+		}
+
+		$id = absint( $_POST['id'] );
+
+		$size = array(
+			intval( $_POST['width'] ),
+			intval( $_POST['height'] ),
+			'crop' => (bool) $_POST['crop'],
+		);
+
+		$image = wp_get_attachment_image_src( $id, $size );
+		echo esc_url( reset( $image ) );
+
+		// This is required to return a proper result.
+		die();
+	}
+}
+
+// @todo:: this has got to go somewhere else.
+add_action( 'wp_ajax_cmb_request_image', array( 'CMB_Image_Field', 'request_image_ajax_callback' ) );
\ No newline at end of file
diff --git a/fields/class-cmb-number-field.php b/fields/class-cmb-number-field.php
new file mode 100644
index 00000000..1080a2af
--- /dev/null
+++ b/fields/class-cmb-number-field.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Number meta box.
+ *
+ * @since 1.0.0
+ *
+ * @extends CMB_Field
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
+
+class CMB_Number_Field extends CMB_Field {
+
+	/**
+	 * Get default arguments for field including custom parameters.
+	 *
+	 * @return array Default arguments for field.
+	 */
+	public function default_args() {
+		return array_merge(
+			parent::default_args(),
+			array(
+				'step' => '',
+			)
+		);
+	}
+
+	/**
+	 * Print out field HTML.
+	 */
+	public function html() {
+		?>
+
+		<input step="<?php echo esc_attr( $this->args['step'] ); ?>" type="number" <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr( 'cmb_text_number code' ); ?> <?php $this->name_attr(); ?> value="<?php echo esc_attr( $this->get_value() ); ?>" />
+
+		<?php
+	}
+}
\ No newline at end of file
diff --git a/fields/class-cmb-post-select.php b/fields/class-cmb-post-select.php
new file mode 100644
index 00000000..e992c63e
--- /dev/null
+++ b/fields/class-cmb-post-select.php
@@ -0,0 +1,215 @@
+<?php
+/**
+ * Post Select field.
+ *
+ * @supports "data_delegate"
+ * @args
+ *     'options'     => array Array of options to show in the select, optionally use data_delegate instead
+ *     'allow_none'   => bool Allow no option to be selected (will place a "None" at the top of the select)
+ *     'multiple'     => bool whether multiple can be selected
+ *
+ * @since 1.0.0
+ *
+ * @extends CMB_Select
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
+
+class CMB_Post_Select extends CMB_Select {
+
+	/**
+	 * CMB_Post_Select constructor.
+	 */
+	public function __construct() {
+
+		$args = func_get_args();
+
+		call_user_func_array( array( 'parent', '__construct' ), $args );
+
+		if ( ! $this->args['use_ajax'] ) {
+
+			$this->args['data_delegate'] = array( $this, 'get_delegate_data' );
+
+		}
+
+	}
+
+	/**
+	 * Get default arguments for field including custom parameters.
+	 *
+	 * @return array Default arguments for field.
+	 */
+	public function default_args() {
+		return array_merge(
+			parent::default_args(),
+			array(
+				'query'    => array(),
+				'use_ajax' => false,
+				'multiple' => false,
+			)
+		);
+	}
+
+	/**
+	 * Get posts and verify for use in select field.
+	 *
+	 * @todo:: validate this data before returning.
+	 *
+	 * @return array Array of posts for field.
+	 */
+	public function get_delegate_data() {
+
+		$data = array();
+
+		foreach ( $this->get_posts() as $post_id ) {
+			$data[ $post_id ] = get_the_title( $post_id );
+		}
+
+		return $data;
+
+	}
+
+	/**
+	 * Get posts for use in select field.
+	 *
+	 * @return array
+	 */
+	private function get_posts() {
+
+		$this->args['query']['fields'] = 'ids';
+		$query = new WP_Query( $this->args['query'] );
+
+		return isset( $query->posts ) ? $query->posts : array();
+
+	}
+
+	/**
+	 * Format the field values for Select2 to read.
+	 */
+	public function parse_save_value() {
+
+		// AJAX multi select2 data is submitted as a string of comma separated post IDs.
+		// If empty, set to false instead of empty array to ensure the meta entry is deleted.
+		if ( $this->args['use_ajax'] && $this->args['multiple'] ) {
+			$this->value = ( ! empty( $this->value ) ) ? explode( ',', $this->value ) : false;
+		}
+
+	}
+
+	/**
+	 * Assemble and output of field HTML.
+	 */
+	public function output_field() {
+
+		// If AJAX, must use input type not standard select.
+		if ( $this->args['use_ajax'] ) :
+
+			?>
+
+			<input
+				<?php $this->id_attr(); ?>
+				<?php printf( 'value="%s" ', esc_attr( implode( ',' , (array) $this->value ) ) ); ?>
+				<?php printf( 'name="%s"', esc_attr( $this->get_the_name_attr() ) ); ?>
+				<?php printf( 'data-field-id="%s" ', esc_attr( $this->get_js_id() ) ); ?>
+				<?php $this->boolean_attr(); ?>
+				class="cmb_select"
+				style="width: 100%"
+			/>
+
+			<?php
+
+		else :
+
+			parent::output_field();
+
+		endif;
+
+	}
+
+	/**
+	 * Output inline scripts to support field.
+	 */
+	public function output_script() {
+
+		parent::output_script();
+
+		?>
+
+		<script type="text/javascript">
+
+			(function($) {
+
+				if ( 'undefined' === typeof( window.cmb_select_fields ) ) {
+					return false;
+				}
+
+				// Get options for this field so we can modify it.
+				var id = <?php echo json_encode( $this->get_js_id() ); ?>;
+				var options = window.cmb_select_fields[id];
+
+				<?php if ( $this->args['use_ajax'] && $this->args['multiple'] ) : ?>
+				// The multiple setting is required when using ajax (because an input field is used instead of select)
+				options.multiple = true;
+				<?php endif; ?>
+
+				<?php if ( $this->args['use_ajax'] && ! empty( $this->value ) ) : ?>
+
+				options.initSelection = function( element, callback ) {
+
+					var data = [];
+
+					<?php if ( $this->args['multiple'] ) : ?>
+
+					<?php foreach ( (array) $this->value as $post_id ) : ?>
+					data.push( <?php echo json_encode( array( 'id' => $post_id, 'text' => html_entity_decode( get_the_title( $post_id ) ) ) ); ?> );
+					<?php endforeach; ?>
+
+					<?php else : ?>
+
+					data = <?php echo json_encode( array( 'id' => $this->value, 'text' => html_entity_decode( get_the_title( $this->get_value() ) ) ) ); ?>;
+
+					<?php endif; ?>
+
+					callback( data );
+
+				};
+
+				<?php endif; ?>
+
+				<?php if ( $this->args['use_ajax'] ) : ?>
+
+				<?php $this->args['query']['fields'] = 'ids'; ?>
+
+				var ajaxData = {
+					action  : 'cmb_post_select',
+					post_id : '<?php echo intval( get_the_id() ); ?>', // Used for user capabilty check.
+					nonce   : <?php echo json_encode( wp_create_nonce( 'cmb_select_field' ) ); ?>,
+					query   : <?php echo json_encode( $this->args['query'] ); ?>
+				};
+
+				options.ajax = {
+					url: <?php echo json_encode( esc_url( admin_url( 'admin-ajax.php' ) ) ); ?>,
+					type: 'POST',
+					dataType: 'json',
+					data: function( term, page ) {
+						ajaxData.query.s = term;
+						ajaxData.query.paged = page;
+						return ajaxData;
+					},
+					results : function( results, page ) {
+						var postsPerPage = ajaxData.query.posts_per_page = ( 'posts_per_page' in ajaxData.query ) ? ajaxData.query.posts_per_page : ( 'showposts' in ajaxData.query ) ? ajaxData.query.showposts : 10;
+						var isMore = ( page * postsPerPage ) < results.total;
+						return { results: results.posts, more: isMore };
+					}
+				}
+
+				<?php endif; ?>
+
+			})( jQuery );
+
+		</script>
+
+		<?php
+	}
+}
diff --git a/fields/class-cmb-radio-field.php b/fields/class-cmb-radio-field.php
new file mode 100644
index 00000000..67477284
--- /dev/null
+++ b/fields/class-cmb-radio-field.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Standard radio field.
+ *
+ * Args:
+ *  - bool "inline" - display the radio buttons inline
+ *
+ * @since 1.0.0
+ *
+ * @extends CMB_Field
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
+
+class CMB_Radio_Field extends CMB_Field {
+
+	/**
+	 * Get default arguments for field including custom parameters.
+	 *
+	 * @return array Default arguments for field.
+	 */
+	public function default_args() {
+		return array_merge(
+			parent::default_args(),
+			array(
+				'options' => array(),
+			)
+		);
+	}
+
+	/**
+	 * Print out field HTML.
+	 */
+	public function html() {
+
+		if ( $this->has_data_delegate() ) {
+			$this->args['options'] = $this->get_delegate_data();
+		} ?>
+
+		<?php foreach ( $this->args['options'] as $key => $value ) : ?>
+
+			<input <?php $this->id_attr( 'item-' . $key ); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr(); ?> type="radio" <?php $this->name_attr(); ?>  value="<?php echo esc_attr( $key ); ?>" <?php checked( $key, $this->get_value() ); ?> />
+			<label <?php $this->for_attr( 'item-' . $key ); ?> style="margin-right: 20px;">
+				<?php echo esc_html( $value ); ?>
+			</label>
+
+		<?php endforeach; ?>
+
+		<?php
+	}
+}
diff --git a/fields/class-cmb-select.php b/fields/class-cmb-select.php
new file mode 100644
index 00000000..f6d39126
--- /dev/null
+++ b/fields/class-cmb-select.php
@@ -0,0 +1,181 @@
+<?php
+/**
+ * Standard select field.
+ *
+ * @supports "data_delegate"
+ * @args
+ *     'options'     => array Array of options to show in the select, optionally use data_delegate instead
+ *     'allow_none'   => bool|string Allow no option to be selected (will place a "None" at the top of the select)
+ *     'multiple'     => bool whether multiple can be selected
+ *
+ * @since 1.0.0
+ *
+ * @extends CMB_Field
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
+
+class CMB_Select extends CMB_Field {
+
+	/**
+	 * CMB_Select constructor.
+	 */
+	public function __construct() {
+
+		$args = func_get_args();
+
+		call_user_func_array( array( 'parent', '__construct' ), $args );
+
+	}
+
+	/**
+	 * Get default arguments for field including custom parameters.
+	 *
+	 * @return array Default arguments for field.
+	 */
+	public function default_args() {
+		return array_merge(
+			parent::default_args(),
+			array(
+				'options'         => array(),
+				'multiple'        => false,
+				'select2_options' => array(),
+				'allow_none'      => false,
+			)
+		);
+	}
+
+	/**
+	 * Ensure values are saved as an array if multiple is set.
+	 */
+	public function parse_save_values() {
+
+		if ( isset( $this->parent ) && isset( $this->args['multiple'] ) && $this->args['multiple'] ) {
+			$this->values = array( $this->values );
+		}
+
+	}
+
+	/**
+	 * Get options for field.
+	 *
+	 * @return mixed
+	 */
+	public function get_options() {
+
+		if ( $this->has_data_delegate() ) {
+			$this->args['options'] = $this->get_delegate_data();
+		}
+
+		return $this->args['options'];
+	}
+
+	/**
+	 * Enqueue all scripts required by the field.
+	 *
+	 * @uses wp_enqueue_script()
+	 */
+	public function enqueue_scripts() {
+
+		parent::enqueue_scripts();
+
+		wp_enqueue_script( 'select2', trailingslashit( CMB_URL ) . 'js/vendor/select2/select2.js', array( 'jquery' ) );
+		wp_enqueue_script( 'field-select', trailingslashit( CMB_URL ) . 'js/field.select.js', array( 'jquery', 'select2', 'cmb-scripts' ), CMB_VERSION );
+	}
+
+	/**
+	 * Enqueue all styles required by the field.
+	 *
+	 * @uses wp_enqueue_style()
+	 */
+	public function enqueue_styles() {
+
+		parent::enqueue_styles();
+
+		wp_enqueue_style( 'select2', trailingslashit( CMB_URL ) . 'js/vendor/select2/select2.css' );
+	}
+
+	/**
+	 * Print out field HTML.
+	 */
+	public function html() {
+
+		if ( $this->has_data_delegate() ) {
+			$this->args['options'] = $this->get_delegate_data();
+		}
+
+		$this->output_field();
+
+		$this->output_script();
+
+	}
+
+	/**
+	 * Compile field HTML.
+	 */
+	public function output_field() {
+
+		$val = (array) $this->get_value();
+
+		$name = $this->get_the_name_attr();
+		$name .= ! empty( $this->args['multiple'] ) ? '[]' : null;
+
+		$none = is_string( $this->args['allow_none'] ) ? $this->args['allow_none'] : __( 'None', 'cmb' );
+
+		?>
+
+		<select
+			<?php $this->id_attr(); ?>
+			<?php $this->boolean_attr(); ?>
+			<?php printf( 'name="%s"', esc_attr( $name ) ); ?>
+			<?php printf( 'data-field-id="%s" ', esc_attr( $this->get_js_id() ) ); ?>
+			<?php echo ! empty( $this->args['multiple'] ) ? 'multiple' : '' ?>
+			<?php $this->class_attr( 'cmb_select' ); ?>
+			style="width: 100%"
+		>
+
+			<?php if ( $this->args['allow_none'] ) : ?>
+				<option value=""><?php echo esc_html( $none ); ?></option>
+			<?php endif; ?>
+
+			<?php foreach ( $this->args['options'] as $value => $name ) : ?>
+				<option <?php selected( in_array( $value, $val ) ) ?> value="<?php echo esc_attr( $value ); ?>"><?php echo esc_html( $name ); ?></option>
+			<?php endforeach; ?>
+
+		</select>
+
+		<?php
+	}
+
+	/**
+	 * Output inline scripts to support field.
+	 */
+	public function output_script() {
+
+		$options = wp_parse_args( $this->args['select2_options'], array(
+			'placeholder' => __( 'Type to search', 'cmb' ),
+			'allowClear'  => true,
+		) );
+
+		?>
+
+		<script type="text/javascript">
+
+			(function($) {
+
+				var options = <?php echo  json_encode( $options ); ?>
+
+				if ( 'undefined' === typeof( window.cmb_select_fields ) )
+					window.cmb_select_fields = {};
+
+				var id = <?php echo json_encode( $this->get_js_id() ); ?>;
+				window.cmb_select_fields[id] = options;
+
+			})( jQuery );
+
+		</script>
+
+		<?php
+	}
+}
\ No newline at end of file
diff --git a/fields/class-cmb-taxonomy.php b/fields/class-cmb-taxonomy.php
new file mode 100644
index 00000000..6e18fb7c
--- /dev/null
+++ b/fields/class-cmb-taxonomy.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Taxonomy-specific select field.
+ *
+ * @since 1.0.0
+ *
+ * @extends CMB_Select
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
+
+class CMB_Taxonomy extends CMB_Select {
+
+	/**
+	 * Get default arguments for field including custom parameters.
+	 *
+	 * @return array Default arguments for field.
+	 */
+	public function default_args() {
+		return array_merge(
+			parent::default_args(),
+			array(
+				'taxonomy'   => '',
+				'hide_empty' => false,
+			)
+		);
+	}
+
+	/**
+	 * CMB_Taxonomy constructor.
+	 */
+	public function __construct() {
+
+		$args = func_get_args();
+
+		call_user_func_array( array( 'parent', '__construct' ), $args );
+
+		$this->args['data_delegate'] = array( $this, 'get_delegate_data' );
+
+	}
+
+	/**
+	 * Retrieve custom field data.
+	 *
+	 * @return array Terms for field data.
+	 */
+	public function get_delegate_data() {
+
+		$terms = $this->get_terms();
+
+		if ( is_wp_error( $terms ) ) {
+			return array();
+		}
+
+		$term_options = array();
+
+		foreach ( $terms as $term ) {
+			$term_options[ $term->term_id ] = $term->name;
+		}
+
+		return $term_options;
+
+	}
+
+	/**
+	 * Get terms for select field.
+	 *
+	 * @todo::cache this or find a cached method
+	 *
+	 * @return array|int|WP_Error
+	 */
+	private function get_terms() {
+
+		return get_terms( $this->args['taxonomy'], array( 'hide_empty' => $this->args['hide_empty'] ) );
+
+	}
+}
diff --git a/fields/class-cmb-text-field.php b/fields/class-cmb-text-field.php
new file mode 100644
index 00000000..211e416d
--- /dev/null
+++ b/fields/class-cmb-text-field.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Standard text field.
+ *
+ * @since 1.0.0
+ *
+ * @extends CMB_Field
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
+
+class CMB_Text_Field extends CMB_Field {
+
+	/**
+	 * Print out field HTML.
+	 */
+	public function html() {
+		?>
+
+		<input type="text" <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr(); ?> <?php $this->name_attr(); ?> value="<?php echo esc_attr( $this->get_value() ); ?>" />
+
+		<?php
+	}
+}
diff --git a/fields/class-cmb-text-small-field.php b/fields/class-cmb-text-small-field.php
new file mode 100644
index 00000000..ebe6acc3
--- /dev/null
+++ b/fields/class-cmb-text-small-field.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Small text field.
+ *
+ * @since 1.0.0
+ *
+ * @extends CMB_Text_Field
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
+
+class CMB_Text_Small_Field extends CMB_Text_Field {
+
+	/**
+	 * Print out field HTML.
+	 */
+	public function html() {
+
+		$this->args['class'] .= ' cmb_text_small';
+
+		parent::html();
+
+	}
+}
diff --git a/fields/class-cmb-textarea-field-code.php b/fields/class-cmb-textarea-field-code.php
new file mode 100644
index 00000000..132808d0
--- /dev/null
+++ b/fields/class-cmb-textarea-field-code.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Code style text field.
+ *
+ * Args:
+ *  - int "rows" - number of rows in the <textarea>
+ *
+ * @since 1.0.0
+ *
+ * @extends CMB_Textarea_Field
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
+
+class CMB_Textarea_Field_Code extends CMB_Textarea_Field {
+
+	/**
+	 * Print out field HTML.
+	 */
+	public function html() {
+
+		$this->args['class'] .= ' code';
+
+		parent::html();
+
+	}
+}
diff --git a/fields/class-cmb-textarea-field.php b/fields/class-cmb-textarea-field.php
new file mode 100644
index 00000000..c351f4f1
--- /dev/null
+++ b/fields/class-cmb-textarea-field.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Standard text field.
+ *
+ * Args:
+ *  - int "rows" - number of rows in the <textarea>
+ *
+ * @since 1.0.0
+ *
+ * @extends CMB_Field
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
+
+class CMB_Textarea_Field extends CMB_Field {
+
+	/**
+	 * Print out field HTML.
+	 */
+	public function html() {
+		?>
+
+		<textarea <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr(); ?> rows="<?php echo ! empty( $this->args['rows'] ) ? esc_attr( $this->args['rows'] ) : 4; ?>" <?php $this->name_attr(); ?>><?php echo esc_textarea( $this->value ); ?></textarea>
+
+		<?php
+	}
+}
diff --git a/fields/class-cmb-time-field.php b/fields/class-cmb-time-field.php
new file mode 100644
index 00000000..ac8362f3
--- /dev/null
+++ b/fields/class-cmb-time-field.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Time picker meta box field.
+ *
+ * @since 1.0.0
+ *
+ * @extends CMB_Field
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
+
+class CMB_Time_Field extends CMB_Field {
+
+	/**
+	 * Enqueue all scripts required by the field.
+	 *
+	 * @uses wp_enqueue_script()
+	 */
+	public function enqueue_scripts() {
+
+		parent::enqueue_scripts();
+
+		wp_enqueue_style( 'cmb-jquery-ui', trailingslashit( CMB_URL ) . 'css/vendor/jquery-ui/jquery-ui.css', '1.10.3' );
+
+		wp_enqueue_script( 'cmb-timepicker', trailingslashit( CMB_URL ) . 'js/jquery.timePicker.min.js', array( 'jquery', 'cmb-scripts' ) );
+		wp_enqueue_script( 'cmb-datetime', trailingslashit( CMB_URL ) . 'js/field.datetime.js', array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'cmb-scripts' ), CMB_VERSION );
+	}
+
+	/**
+	 * Print out field HTML.
+	 */
+	public function html() {
+		?>
+
+		<input <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr( 'cmb_text_small cmb_timepicker' ); ?> type="text" <?php $this->name_attr(); ?> value="<?php echo esc_attr( $this->value ); ?>"/>
+
+		<?php
+	}
+}
diff --git a/fields/class-cmb-title.php b/fields/class-cmb-title.php
new file mode 100644
index 00000000..96d3d435
--- /dev/null
+++ b/fields/class-cmb-title.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Standard title used as a splitter.
+ *
+ * @since 1.0.0
+ *
+ * @extends CMB_Field
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
+
+class CMB_Title extends CMB_Field {
+
+	/**
+	 * Print out field HTML - in this case we only want a title.
+	 */
+	public function title() {
+		?>
+
+		<div class="field-title">
+			<h2 <?php $this->class_attr(); ?>>
+				<?php echo esc_html( $this->title ); ?>
+			</h2>
+		</div>
+
+		<?php
+
+	}
+
+	/**
+	 * Placeholder for abstracted method.
+	 */
+	public function html() {}
+}
diff --git a/fields/class-cmb-url-field.php b/fields/class-cmb-url-field.php
new file mode 100644
index 00000000..445b42b9
--- /dev/null
+++ b/fields/class-cmb-url-field.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Standard text meta box for a URL.
+ *
+ * @since 1.0.0
+ *
+ * @extends CMB_Field
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
+
+class CMB_URL_Field extends CMB_Field {
+
+	/**
+	 * Print out field HTML.
+	 */
+	public function html() {
+		?>
+
+		<input type="text" <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr( 'cmb_text_url code' ); ?> <?php $this->name_attr(); ?> value="<?php echo esc_attr( esc_url( $this->value ) ); ?>" />
+
+		<?php
+	}
+}
diff --git a/fields/class-cmb-wysiwyg.php b/fields/class-cmb-wysiwyg.php
new file mode 100644
index 00000000..fe654e30
--- /dev/null
+++ b/fields/class-cmb-wysiwyg.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * WYSIWYG field.
+ *
+ * @since 1.0.0
+ *
+ * @extends CMB_Field
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
+
+class CMB_wysiwyg extends CMB_Field {
+
+	/**
+	 * Get default arguments for field including custom parameters.
+	 *
+	 * @return array Default arguments for field.
+	 */
+	public function default_args() {
+		return array_merge(
+			parent::default_args(),
+			array(
+				'options' => array(),
+			)
+		);
+	}
+
+	/**
+	 * Enqueue all scripts required by the field.
+	 *
+	 * @uses wp_enqueue_script()
+	 */
+	function enqueue_scripts() {
+
+		parent::enqueue_scripts();
+
+		wp_enqueue_script( 'cmb-wysiwyg', trailingslashit( CMB_URL ) . 'js/field-wysiwyg.js', array( 'jquery', 'cmb-scripts' ), CMB_VERSION );
+	}
+
+	/**
+	 * Print out field HTML.
+	 */
+	public function html() {
+
+		$id   = $this->get_the_id_attr();
+		$name = $this->get_the_name_attr();
+
+		$field_id = $this->get_js_id();
+
+		printf(
+			'<div class="cmb-wysiwyg" data-id="%s" data-name="%s" data-field-id="%s">',
+			esc_attr( $id ),
+			esc_attr( $name ),
+			esc_attr( $field_id )
+		);
+
+		if ( $this->is_placeholder() ) {
+
+			// For placeholder, output the markup for the editor in a JS var.
+			ob_start();
+			$this->args['options']['textarea_name'] = 'cmb-placeholder-name-' . $field_id;
+			wp_editor( '', 'cmb-placeholder-id-' . $field_id, $this->args['options'] );
+			$editor = ob_get_clean();
+			$editor = str_replace( array( "\n", "\r" ), '', $editor );
+			$editor = str_replace( array( "'" ), '"', $editor );
+
+			?>
+
+			<script>
+				if ( 'undefined' === typeof( cmb_wysiwyg_editors ) )
+					var cmb_wysiwyg_editors = {};
+				cmb_wysiwyg_editors.<?php echo esc_js( $field_id ); ?> = <?php echo wp_json_encode( $editor ); ?>;
+			</script>
+
+			<?php
+
+		} else {
+
+			$this->args['options']['textarea_name'] = $name;
+			echo wp_editor( $this->get_value(), $id, $this->args['options'] );
+
+		}
+
+		echo '</div>';
+
+	}
+
+	/**
+	 * Check if this is a placeholder field.
+	 * Either the field itself, or because it is part of a repeatable group.
+	 *
+	 * @return bool
+	 */
+	public function is_placeholder() {
+
+		if ( isset( $this->parent ) && ! is_int( $this->parent->field_index ) ) {
+			return true;
+		} else {
+			return ! is_int( $this->field_index );
+		}
+
+	}
+}

From f9512c78ec7d7e3a3f7b14453388e4bd3c81fb33 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Fri, 24 Feb 2017 11:13:07 +1300
Subject: [PATCH 082/148] Fixed bad file name and added EOF lines

---
 class.cmb-meta-box.php => class-cmb-meta-box.php | 7 ++-----
 custom-meta-boxes.php                            | 2 +-
 fields/class-cmb-color-picker.php                | 2 +-
 fields/class-cmb-field.php                       | 4 ++--
 fields/class-cmb-image-field.php                 | 2 +-
 fields/class-cmb-number-field.php                | 2 +-
 fields/class-cmb-select.php                      | 2 +-
 fields/class-cmb-wysiwyg.php                     | 2 +-
 8 files changed, 10 insertions(+), 13 deletions(-)
 rename class.cmb-meta-box.php => class-cmb-meta-box.php (99%)

diff --git a/class.cmb-meta-box.php b/class-cmb-meta-box.php
similarity index 99%
rename from class.cmb-meta-box.php
rename to class-cmb-meta-box.php
index 409cb882..d9277b69 100644
--- a/class.cmb-meta-box.php
+++ b/class-cmb-meta-box.php
@@ -2,15 +2,12 @@
 /**
  * Base functionality for HM CMB plugin.
  *
+ * @since 1.0.0
+ *
  * @package WordPress
  * @subpackage Custom Meta Boxes
  */
 
-/**
- * Create Meta Boxes.
- *
- * @since 1.0.0
- */
 class CMB_Meta_Box {
 
 	/**
diff --git a/custom-meta-boxes.php b/custom-meta-boxes.php
index 789ea56e..4c729694 100755
--- a/custom-meta-boxes.php
+++ b/custom-meta-boxes.php
@@ -41,7 +41,7 @@
 /**
  * Include base, required files.
  */
-include_once( CMB_PATH . 'class.cmb-meta-box.php' );
+include_once( CMB_PATH . 'class-cmb-meta-box.php' );
 
 /**
  * Field types that are extended.
diff --git a/fields/class-cmb-color-picker.php b/fields/class-cmb-color-picker.php
index a1cc0f1d..ac34c597 100644
--- a/fields/class-cmb-color-picker.php
+++ b/fields/class-cmb-color-picker.php
@@ -35,4 +35,4 @@ public function html() {
 
 		<?php
 	}
-}
\ No newline at end of file
+}
diff --git a/fields/class-cmb-field.php b/fields/class-cmb-field.php
index 35fd01ce..b5d0b473 100644
--- a/fields/class-cmb-field.php
+++ b/fields/class-cmb-field.php
@@ -573,7 +573,7 @@ protected function delete_button_markup() {
 	 */
 	protected function is_new_object() {
 		$screen = get_current_screen();
-		if ( null === $screen || ! $screen->in_admin ) {
+		if ( null === $screen || ! $screen->in_admin() ) {
 			return null;
 		}
 
@@ -585,4 +585,4 @@ protected function is_new_object() {
 
 		return false;
 	}
-}
\ No newline at end of file
+}
diff --git a/fields/class-cmb-image-field.php b/fields/class-cmb-image-field.php
index 2c71db14..66ccfc60 100644
--- a/fields/class-cmb-image-field.php
+++ b/fields/class-cmb-image-field.php
@@ -156,4 +156,4 @@ static function request_image_ajax_callback() {
 }
 
 // @todo:: this has got to go somewhere else.
-add_action( 'wp_ajax_cmb_request_image', array( 'CMB_Image_Field', 'request_image_ajax_callback' ) );
\ No newline at end of file
+add_action( 'wp_ajax_cmb_request_image', array( 'CMB_Image_Field', 'request_image_ajax_callback' ) );
diff --git a/fields/class-cmb-number-field.php b/fields/class-cmb-number-field.php
index 1080a2af..cce9b938 100644
--- a/fields/class-cmb-number-field.php
+++ b/fields/class-cmb-number-field.php
@@ -36,4 +36,4 @@ public function html() {
 
 		<?php
 	}
-}
\ No newline at end of file
+}
diff --git a/fields/class-cmb-select.php b/fields/class-cmb-select.php
index f6d39126..b21ffc5d 100644
--- a/fields/class-cmb-select.php
+++ b/fields/class-cmb-select.php
@@ -178,4 +178,4 @@ public function output_script() {
 
 		<?php
 	}
-}
\ No newline at end of file
+}
diff --git a/fields/class-cmb-wysiwyg.php b/fields/class-cmb-wysiwyg.php
index fe654e30..e848159b 100644
--- a/fields/class-cmb-wysiwyg.php
+++ b/fields/class-cmb-wysiwyg.php
@@ -78,7 +78,7 @@ public function html() {
 		} else {
 
 			$this->args['options']['textarea_name'] = $name;
-			echo wp_editor( $this->get_value(), $id, $this->args['options'] );
+			wp_editor( $this->get_value(), $id, $this->args['options'] );
 
 		}
 

From ac5406493527f32acfcabca5a682c3650ed67dea Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Tue, 28 Feb 2017 15:33:35 +1300
Subject: [PATCH 083/148] Fixed funky comment

---
 fields/class-cmb-date-timestamp-field.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fields/class-cmb-date-timestamp-field.php b/fields/class-cmb-date-timestamp-field.php
index 23fad65f..4e104128 100644
--- a/fields/class-cmb-date-timestamp-field.php
+++ b/fields/class-cmb-date-timestamp-field.php
@@ -40,8 +40,7 @@ public function html() {
 	}
 
 	/**
-	 * Convert val/**
-	ues into UNIX time values and sort.
+	 * Convert values into UNIX time values and sort.
 	 */
 	public function parse_save_values() {
 

From 0f400a3043b0f33a42b165d6fc45b827e1a49aa0 Mon Sep 17 00:00:00 2001
From: Dan Westall <dan.westall@googlemail.com>
Date: Fri, 17 Mar 2017 12:42:28 +0000
Subject: [PATCH 084/148] Fix #422 for gmap grouped field data structure

---
 fields/class-cmb-field.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/fields/class-cmb-field.php b/fields/class-cmb-field.php
index b5d0b473..07cd693a 100644
--- a/fields/class-cmb-field.php
+++ b/fields/class-cmb-field.php
@@ -496,8 +496,15 @@ public function display() {
 		$this->description();
 
 		$i = 0;
+
+		// If the map field is not repeatable then we need to wrap it within an array to remove different in data structure between a repeater field and none
 		if ( isset( $this->args['type'] ) && 'gmap' == $this->args['type'] ) {
-			$values = array( $values );
+			if ( $this->args['repeatable'] === false &&  ! isset( $this->parent ) ) {
+				$values = array( $values );
+			}
+			if( $this->args['repeatable'] === false &&  isset( $this->parent ) ) {
+				$values = $values[0];
+			}
 		}
 
 		foreach ( $values as $key => $value ) {

From 4608b404c18e87150d40242a271017b77a66110f Mon Sep 17 00:00:00 2001
From: Dan Westall <dan.westall@googlemail.com>
Date: Fri, 17 Mar 2017 12:43:22 +0000
Subject: [PATCH 085/148] Fix code style

---
 fields/class-cmb-field.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fields/class-cmb-field.php b/fields/class-cmb-field.php
index 07cd693a..a9e6c33d 100644
--- a/fields/class-cmb-field.php
+++ b/fields/class-cmb-field.php
@@ -499,10 +499,10 @@ public function display() {
 
 		// If the map field is not repeatable then we need to wrap it within an array to remove different in data structure between a repeater field and none
 		if ( isset( $this->args['type'] ) && 'gmap' == $this->args['type'] ) {
-			if ( $this->args['repeatable'] === false &&  ! isset( $this->parent ) ) {
+			if ( $this->args['repeatable'] === false && ! isset( $this->parent ) ) {
 				$values = array( $values );
 			}
-			if( $this->args['repeatable'] === false &&  isset( $this->parent ) ) {
+			if ( $this->args['repeatable'] === false && isset( $this->parent ) ) {
 				$values = $values[0];
 			}
 		}

From c5307d680fc5e9e5cabefe2a4dd439ecca36bee4 Mon Sep 17 00:00:00 2001
From: Dan Westall <dan.westall@googlemail.com>
Date: Fri, 17 Mar 2017 15:28:54 +0000
Subject: [PATCH 086/148] Add check for data formats

---
 fields/class-cmb-field.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/fields/class-cmb-field.php b/fields/class-cmb-field.php
index a9e6c33d..ac87e3e8 100644
--- a/fields/class-cmb-field.php
+++ b/fields/class-cmb-field.php
@@ -502,8 +502,12 @@ public function display() {
 			if ( $this->args['repeatable'] === false && ! isset( $this->parent ) ) {
 				$values = array( $values );
 			}
-			if ( $this->args['repeatable'] === false && isset( $this->parent ) ) {
+
+			// If its within a group then we need to unwrap it from the group,
+			// transitions code for data formats see https://github.com/humanmade/Custom-Meta-Boxes/issues/422
+			if ( $this->args['repeatable'] === false && isset( $this->parent ) && count( $values ) === 1 ) {
 				$values = $values[0];
+
 			}
 		}
 

From dabe52e5c6c0266e0bab683899d259f47d1a89ab Mon Sep 17 00:00:00 2001
From: Dan Westall <dan.westall@googlemail.com>
Date: Fri, 17 Mar 2017 15:39:28 +0000
Subject: [PATCH 087/148] Add fix for historical data structure transition

---
 fields/class-cmb-field.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/fields/class-cmb-field.php b/fields/class-cmb-field.php
index ac87e3e8..503caf58 100644
--- a/fields/class-cmb-field.php
+++ b/fields/class-cmb-field.php
@@ -504,10 +504,13 @@ public function display() {
 			}
 
 			// If its within a group then we need to unwrap it from the group,
-			// transitions code for data formats see https://github.com/humanmade/Custom-Meta-Boxes/issues/422
-			if ( $this->args['repeatable'] === false && isset( $this->parent ) && count( $values ) === 1 ) {
+			if ( $this->args['repeatable'] === false && isset( $this->parent ) ) {
 				$values = $values[0];
 
+				// Transitions code for data formats see https://github.com/humanmade/Custom-Meta-Boxes/issues/422
+				if ( count( $values ) !== 1 ) {
+					$values = array( $values );
+				}
 			}
 		}
 

From f564d3801e8441f9b3097945e51531c76474ffb3 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Sun, 19 Mar 2017 20:34:52 -0700
Subject: [PATCH 088/148] Fixed comments

---
 fields/class-cmb-field.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/fields/class-cmb-field.php b/fields/class-cmb-field.php
index 503caf58..7a62003e 100644
--- a/fields/class-cmb-field.php
+++ b/fields/class-cmb-field.php
@@ -497,8 +497,9 @@ public function display() {
 
 		$i = 0;
 
-		// If the map field is not repeatable then we need to wrap it within an array to remove different in data structure between a repeater field and none
-		if ( isset( $this->args['type'] ) && 'gmap' == $this->args['type'] ) {
+		// If the map field is not repeatable then we need to wrap it within an
+		// array to remove difference in data structure between a repeater field and normal
+		if ( isset( $this->args['type'] ) && 'gmap' === $this->args['type'] ) {
 			if ( $this->args['repeatable'] === false && ! isset( $this->parent ) ) {
 				$values = array( $values );
 			}
@@ -507,7 +508,8 @@ public function display() {
 			if ( $this->args['repeatable'] === false && isset( $this->parent ) ) {
 				$values = $values[0];
 
-				// Transitions code for data formats see https://github.com/humanmade/Custom-Meta-Boxes/issues/422
+				// Transitions code for data formats see:
+				// https://github.com/humanmade/Custom-Meta-Boxes/issues/422
 				if ( count( $values ) !== 1 ) {
 					$values = array( $values );
 				}

From 7847227c4a4495a2320bc6713596cdb61b502368 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Mon, 20 Mar 2017 06:59:43 -0700
Subject: [PATCH 089/148] Travis 5.3 - 7.1 adjustment

---
 .travis.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 314aa7a6..9d7b23d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,11 @@
 language: php
 
 php:
-    - 5.3
     - 5.4
     - 5.5
     - 5.6
     - 7.0
+    - 7.1
     - hhvm
 
 env:
@@ -20,10 +20,6 @@ matrix:
   fast_finish: true
   exclude:
     # We really only need to verify that each PHP/WP combination works generally, not that multisite works between them
-    - php: 5.3
-      env: WP_VERSION=3.8 WP_MULTISITE=1
-    - php: 5.3
-      env: WP_VERSION=latest WP_MULTISITE=1
     - php: 5.4
       env: WP_VERSION=3.8 WP_MULTISITE=1
     - php: 5.4
@@ -37,11 +33,15 @@ matrix:
       env: WP_VERSION=3.8 WP_MULTISITE=0
     - php: hhvm
       env: WP_VERSION=3.8 WP_MULTISITE=1
-    # Only test latest version of WP with PHP 7.0 because 3.8 won't work at all
+    # Only test latest version of WP with PHP 7.0+ because 3.8 won't work at all
     - php: 7.0
       env: WP_VERSION=3.8 WP_MULTISITE=0
     - php: 7.0
       env: WP_VERSION=3.8 WP_MULTISITE=1
+    - php: 7.1
+      env: WP_VERSION=3.8 WP_MULTISITE=0
+    - php: 7.1
+      env: WP_VERSION=3.8 WP_MULTISITE=1
 
 before_script:
     - bash bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION

From 0165407cd539f577d44fff9935ea6f813c354723 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Mon, 20 Mar 2017 07:18:31 -0700
Subject: [PATCH 090/148] Let us try a different loc of PHPUnit

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9d7b23d6..72ff5501 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,4 +46,5 @@ matrix:
 before_script:
     - bash bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION
 
-script: phpunit
+script:
+    - vendor/bin/phpunit

From ac53bb4b68156fb0ddca882377d716418ff03f78 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Mon, 20 Mar 2017 07:25:16 -0700
Subject: [PATCH 091/148] Add a PHPUnit dependencies

---
 composer.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 818af3d6..a70b9e49 100644
--- a/composer.json
+++ b/composer.json
@@ -20,5 +20,8 @@
   },
   "require": {
     "composer/installers": "~1.0"
-   }
+   },
+  "require-dev": {
+    "phpunit/phpunit": "~5.7"
+  }
 }
\ No newline at end of file

From 56e96498377faa7ba9a26d1738bc7c75c5c043d7 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Mon, 20 Mar 2017 07:38:25 -0700
Subject: [PATCH 092/148] Fix requires order

---
 composer.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index a70b9e49..66ecc021 100644
--- a/composer.json
+++ b/composer.json
@@ -18,10 +18,10 @@
       "custom-meta-boxes.php"
     ]
   },
-  "require": {
-    "composer/installers": "~1.0"
-   },
   "require-dev": {
     "phpunit/phpunit": "~5.7"
-  }
+  },
+  "require": {
+    "composer/installers": "~1.0"
+   }
 }
\ No newline at end of file

From 90c44b6f0f9cc9661d0bf896c21feb9715d4b1ff Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Mon, 20 Mar 2017 07:42:25 -0700
Subject: [PATCH 093/148] Lets try one more angle here

---
 composer.json | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 66ecc021..f25afc39 100644
--- a/composer.json
+++ b/composer.json
@@ -18,10 +18,8 @@
       "custom-meta-boxes.php"
     ]
   },
-  "require-dev": {
-    "phpunit/phpunit": "~5.7"
-  },
   "require": {
-    "composer/installers": "~1.0"
+    "composer/installers": "~1.0",
+    "phpunit/phpunit": "~5.7"
    }
 }
\ No newline at end of file

From 64df070b84be6a468e4d23de3389c5cd64c4e60b Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Tue, 21 Mar 2017 09:51:47 -0600
Subject: [PATCH 094/148] Try out cores handling of phpunit version

---
 .travis.yml   | 11 ++++++++++-
 composer.json |  5 ++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 72ff5501..15637f90 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,6 +45,15 @@ matrix:
 
 before_script:
     - bash bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION
+    - export PATH="$HOME/.composer/vendor/bin:$PATH"
+    - |
+      if [[ ${TRAVIS_PHP_VERSION:0:2} == "7." ]]; then
+        composer global require "phpunit/phpunit=5.7.*"
+      elif [[ ${TRAVIS_PHP_VERSION:0:3} != "5.2" ]]; then
+        composer global require "phpunit/phpunit=4.8.*"
+      fi
+    - which phpunit
+    - phpunit --version
 
 script:
-    - vendor/bin/phpunit
+    - phpunit
diff --git a/composer.json b/composer.json
index f25afc39..555a042a 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,6 @@
     ]
   },
   "require": {
-    "composer/installers": "~1.0",
-    "phpunit/phpunit": "~5.7"
-   }
+    "composer/installers": "~1.0"
+  }
 }
\ No newline at end of file

From 6cf163fdf9f753c7625062a2c47f51e444813968 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Tue, 21 Mar 2017 10:02:28 -0600
Subject: [PATCH 095/148] Bumped minimum Wp version to 4.0

---
 .travis.yml | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 15637f90..89eb7711 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,8 +11,8 @@ php:
 env:
     - WP_VERSION=latest WP_MULTISITE=0
     - WP_VERSION=latest WP_MULTISITE=1
-    - WP_VERSION=3.8 WP_MULTISITE=0
-    - WP_VERSION=3.8 WP_MULTISITE=1
+    - WP_VERSION=4.0 WP_MULTISITE=0
+    - WP_VERSION=4.0 WP_MULTISITE=1
 
 matrix:
   allow_failures:
@@ -21,27 +21,17 @@ matrix:
   exclude:
     # We really only need to verify that each PHP/WP combination works generally, not that multisite works between them
     - php: 5.4
-      env: WP_VERSION=3.8 WP_MULTISITE=1
+      env: WP_VERSION=4.0 WP_MULTISITE=1
     - php: 5.4
       env: WP_VERSION=latest WP_MULTISITE=1
     - php: 5.5
-      env: WP_VERSION=3.8 WP_MULTISITE=1
+      env: WP_VERSION=4.0 WP_MULTISITE=1
     - php: 5.5
       env: WP_VERSION=latest WP_MULTISITE=1
     # Only test latest version of WP with HHVM
     - php: hhvm
-      env: WP_VERSION=3.8 WP_MULTISITE=0
+      env: WP_VERSION=4.0 WP_MULTISITE=0
     - php: hhvm
-      env: WP_VERSION=3.8 WP_MULTISITE=1
-    # Only test latest version of WP with PHP 7.0+ because 3.8 won't work at all
-    - php: 7.0
-      env: WP_VERSION=3.8 WP_MULTISITE=0
-    - php: 7.0
-      env: WP_VERSION=3.8 WP_MULTISITE=1
-    - php: 7.1
-      env: WP_VERSION=3.8 WP_MULTISITE=0
-    - php: 7.1
-      env: WP_VERSION=3.8 WP_MULTISITE=1
 
 before_script:
     - bash bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION

From cb6c3e7e214f0fca124c3641ac75375ff94ed59c Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Tue, 21 Mar 2017 10:11:40 -0600
Subject: [PATCH 096/148] Restored skipping old versions of PHP on PHP7+

---
 .travis.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 89eb7711..09395f26 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,10 +28,22 @@ matrix:
       env: WP_VERSION=4.0 WP_MULTISITE=1
     - php: 5.5
       env: WP_VERSION=latest WP_MULTISITE=1
+    - php: 7.0
+      env: WP_VERSION=latest WP_MULTISITE=1
     # Only test latest version of WP with HHVM
     - php: hhvm
       env: WP_VERSION=4.0 WP_MULTISITE=0
     - php: hhvm
+      env: WP_VERSION=4.0 WP_MULTISITE=1
+    # Only test latest version of WP with PHP 7.0+ because 4.0 won't work at all
+    - php: 7.0
+      env: WP_VERSION=4.0 WP_MULTISITE=0
+    - php: 7.0
+      env: WP_VERSION=4.0 WP_MULTISITE=1
+    - php: 7.1
+      env: WP_VERSION=4.0 WP_MULTISITE=0
+    - php: 7.1
+      env: WP_VERSION=4.0 WP_MULTISITE=1
 
 before_script:
     - bash bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION

From 99c37731a0aa5fc392b79e441c3a4e90ae7d9522 Mon Sep 17 00:00:00 2001
From: Barry Ceelen <barry@multipop.org>
Date: Fri, 24 Mar 2017 17:12:01 +0100
Subject: [PATCH 097/148] Enqueue and localize 'cmb-scripts' only once

---
 class-cmb-meta-box.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/class-cmb-meta-box.php b/class-cmb-meta-box.php
index d9277b69..c266542c 100644
--- a/class-cmb-meta-box.php
+++ b/class-cmb-meta-box.php
@@ -154,13 +154,16 @@ public function init_fields_for_post() {
 	 */
 	function enqueue_scripts() {
 
-		wp_enqueue_script( 'cmb-scripts', trailingslashit( CMB_URL ) . 'js/cmb.js', array( 'jquery' ), CMB_VERSION );
+		if ( ! wp_script_is( 'cmb-scripts' ) ) {
 
-		wp_localize_script( 'cmb-scripts', 'CMBData', array(
-			'strings' => array(
-				'confirmDeleteField' => esc_html__( 'Are you sure you want to delete this field?', 'cmb' ),
-			),
-		) );
+			wp_enqueue_script( 'cmb-scripts', trailingslashit( CMB_URL ) . 'js/cmb.js', array( 'jquery' ), CMB_VERSION );
+
+			wp_localize_script( 'cmb-scripts', 'CMBData', array(
+				'strings' => array(
+					'confirmDeleteField' => esc_html__( 'Are you sure you want to delete this field?', 'cmb' ),
+				),
+			) );
+		}
 
 		foreach ( $this->fields as $field ) {
 			$field->enqueue_scripts();

From f24ab5d5fda95987b69b7cccaf1cea4105af1bed Mon Sep 17 00:00:00 2001
From: Dan Westall <dan.westall@googlemail.com>
Date: Mon, 3 Apr 2017 23:56:07 +0100
Subject: [PATCH 098/148] Fix undefined index on meta cap

---
 class-cmb-meta-box.php     | 2 +-
 fields/class-cmb-field.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/class-cmb-meta-box.php b/class-cmb-meta-box.php
index c266542c..6b7c33e7 100644
--- a/class-cmb-meta-box.php
+++ b/class-cmb-meta-box.php
@@ -104,7 +104,7 @@ public function init_fields( $post_id = 0 ) {
 
 			if ( class_exists( $class ) ) {
 				$field = new $class( $field['id'], $field['name'], (array) $values, $args );
-				if ( $field->is_displayed() ) {
+				if ( $field->is_displayed( $post_id ) ) {
 					$this->fields[] = $field;
 				}
 			}
diff --git a/fields/class-cmb-field.php b/fields/class-cmb-field.php
index 7a62003e..fc32d729 100644
--- a/fields/class-cmb-field.php
+++ b/fields/class-cmb-field.php
@@ -440,8 +440,8 @@ public function save( $post_id, $values ) {
 	/**
 	 * Check whether the current field should or should not be displayed.
 	 */
-	public function is_displayed() {
-		return current_user_can( $this->args['capability'] );
+	public function is_displayed( $post_id ) {
+		return current_user_can( $this->args['capability'], $post_id );
 	}
 
 	/**

From 6727f792b8b90e072ab8a8a783421c2e0794c294 Mon Sep 17 00:00:00 2001
From: Simon Dowdles <simon@simondowdles.com>
Date: Mon, 10 Apr 2017 10:42:49 +0200
Subject: [PATCH 099/148] Updated composer.json - Added Composer Installers
 Type

Added `"type": "wordpress-plugin"` so that hosts may define the path where CMB is installed.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 555a042a..a882c76c 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,8 @@
       "custom-meta-boxes.php"
     ]
   },
+  "type": "wordpress-plugin",
   "require": {
     "composer/installers": "~1.0"
   }
-}
\ No newline at end of file
+}

From b1521cf6ea895e2fc577fa62fd93a2c1222e9b4a Mon Sep 17 00:00:00 2001
From: Shady Sharaf <shady@sharaf.me>
Date: Wed, 31 May 2017 13:31:28 +0200
Subject: [PATCH 100/148] Add min/max attributes to number output

Adds support for min/max attributes for number outputs.
---
 fields/class-cmb-number-field.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fields/class-cmb-number-field.php b/fields/class-cmb-number-field.php
index cce9b938..1eab0ab6 100644
--- a/fields/class-cmb-number-field.php
+++ b/fields/class-cmb-number-field.php
@@ -22,6 +22,8 @@ public function default_args() {
 			parent::default_args(),
 			array(
 				'step' => '',
+				'min' => '',
+				'max' => '',
 			)
 		);
 	}
@@ -32,7 +34,7 @@ public function default_args() {
 	public function html() {
 		?>
 
-		<input step="<?php echo esc_attr( $this->args['step'] ); ?>" type="number" <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr( 'cmb_text_number code' ); ?> <?php $this->name_attr(); ?> value="<?php echo esc_attr( $this->get_value() ); ?>" />
+		<input step="<?php echo esc_attr( $this->args['step'] ); ?>" <?php echo '' !== $this->args['min'] ? printf( 'min="%d"', $this->args['min'] ) : ''; ?> <?php echo '' !== $this->args['max'] ? printf( 'max="%d"', $this->args['max'] ) : ''; ?> type="number" <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr( 'cmb_text_number code' ); ?> <?php $this->name_attr(); ?> value="<?php echo esc_attr( $this->get_value() ); ?>" />
 
 		<?php
 	}

From 4001a87e9242b0e707b8b4379d65dec0bce51bec Mon Sep 17 00:00:00 2001
From: Shady Sharaf <shady@sharaf.me>
Date: Wed, 31 May 2017 16:17:58 +0200
Subject: [PATCH 101/148] Add unit tests for number field to check min/max
 attrs

---
 tests/testNumberField.php | 61 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 tests/testNumberField.php

diff --git a/tests/testNumberField.php b/tests/testNumberField.php
new file mode 100644
index 00000000..6e51f566
--- /dev/null
+++ b/tests/testNumberField.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Tests for the number field type.
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
+
+class NumberFieldTestCase extends WP_UnitTestCase {
+
+	function setUp() {
+		parent::setUp();
+
+		$args = array(
+			'post_author'  => 1,
+			'post_status'  => 'publish',
+			'post_content' => rand_str(),
+			'post_title'   => rand_str(),
+			'post_type'    => 'post',
+		);
+
+		$id = wp_insert_post( $args );
+
+		$this->post = get_post( $id );
+	}
+
+	function tearDown() {
+		wp_delete_post( $this->post->ID, true );
+		unset( $this->post );
+		parent::tearDown();
+	}
+
+	function testSaveValue() {
+		$value = array( 0.5 );
+		$field = new CMB_Number_Field( 'foo', 'Foo', $value, array( 'min' => 0, 'max' => 1 ) );
+
+		if ( ! $this->post ) {
+			$this->markTestSkipped( 'Post not found' );
+		}
+
+		$field->save( $this->post->ID, $value );
+
+		// Verify single value is properly saved.
+		$this->assertEquals( get_post_meta( $this->post->ID, 'foo', false ), $value );
+	}
+
+	function testFieldOutput() {
+		$field        = new CMB_Number_Field( 'foo', 'Foo', array( 0.5 ), array( 'min' => 0, 'max' => 1 ) );
+
+		if ( ! $this->post ) {
+			$this->markTestSkipped( 'Post not found' );
+		}
+
+		$this->expectOutputRegex( '/(type=\"number\".*?id=\"foo-cmb-field-0\".*?value=\"0.5\")/s' );
+		$this->expectOutputRegex( '/min="0"/s' );
+		$this->expectOutputRegex( '/max="1"/s' );
+
+		// Trigger output.
+		$field->html();
+	}
+}

From 5a8aefa2889dd7625d145cd2129e4725adcef48f Mon Sep 17 00:00:00 2001
From: Shady Sharaf <shady@sharaf.me>
Date: Wed, 31 May 2017 16:46:55 +0200
Subject: [PATCH 102/148] Use %g for doubles, and improve readability

---
 fields/class-cmb-number-field.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/fields/class-cmb-number-field.php b/fields/class-cmb-number-field.php
index 1eab0ab6..3b56981d 100644
--- a/fields/class-cmb-number-field.php
+++ b/fields/class-cmb-number-field.php
@@ -32,9 +32,13 @@ public function default_args() {
 	 * Print out field HTML.
 	 */
 	public function html() {
+		$attrs = [];
+		$attrs[] = '' !== $this->args['step'] ? sprintf( 'step="%g"', $this->args['step'] ) : '';
+		$attrs[] = '' !== $this->args['min'] ? sprintf( 'min="%g"', $this->args['min'] ) : '';
+		$attrs[] = '' !== $this->args['max'] ? sprintf( 'max="%g"', $this->args['max'] ) : '';
 		?>
 
-		<input step="<?php echo esc_attr( $this->args['step'] ); ?>" <?php echo '' !== $this->args['min'] ? printf( 'min="%d"', $this->args['min'] ) : ''; ?> <?php echo '' !== $this->args['max'] ? printf( 'max="%d"', $this->args['max'] ) : ''; ?> type="number" <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr( 'cmb_text_number code' ); ?> <?php $this->name_attr(); ?> value="<?php echo esc_attr( $this->get_value() ); ?>" />
+		<input <?php echo implode( ' ', $attrs ); ?> type="number" <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr( 'cmb_text_number code' ); ?> <?php $this->name_attr(); ?> value="<?php echo esc_attr( $this->get_value() ); ?>" />
 
 		<?php
 	}

From c2e4fdf31dd3cc9823ba3c604cc2e81354677b12 Mon Sep 17 00:00:00 2001
From: Shady Sharaf <shady@sharaf.me>
Date: Wed, 31 May 2017 16:48:49 +0200
Subject: [PATCH 103/148] Check for proper handling of doubles in tests

---
 tests/testNumberField.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/testNumberField.php b/tests/testNumberField.php
index 6e51f566..c9c8b19a 100644
--- a/tests/testNumberField.php
+++ b/tests/testNumberField.php
@@ -45,14 +45,14 @@ function testSaveValue() {
 	}
 
 	function testFieldOutput() {
-		$field        = new CMB_Number_Field( 'foo', 'Foo', array( 0.5 ), array( 'min' => 0, 'max' => 1 ) );
+		$field        = new CMB_Number_Field( 'foo', 'Foo', array( 0.5 ), array( 'min' => 0.5, 'max' => 1 ) );
 
 		if ( ! $this->post ) {
 			$this->markTestSkipped( 'Post not found' );
 		}
 
 		$this->expectOutputRegex( '/(type=\"number\".*?id=\"foo-cmb-field-0\".*?value=\"0.5\")/s' );
-		$this->expectOutputRegex( '/min="0"/s' );
+		$this->expectOutputRegex( '/min="0.5"/s' );
 		$this->expectOutputRegex( '/max="1"/s' );
 
 		// Trigger output.

From 7da594914d39af18ebb734a7464d05fafe2c0b32 Mon Sep 17 00:00:00 2001
From: Shady Sharaf <shady@sharaf.me>
Date: Wed, 31 May 2017 16:55:01 +0200
Subject: [PATCH 104/148] Proper regex in test

---
 tests/testNumberField.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/testNumberField.php b/tests/testNumberField.php
index c9c8b19a..8dda7ff7 100644
--- a/tests/testNumberField.php
+++ b/tests/testNumberField.php
@@ -45,15 +45,13 @@ function testSaveValue() {
 	}
 
 	function testFieldOutput() {
-		$field        = new CMB_Number_Field( 'foo', 'Foo', array( 0.5 ), array( 'min' => 0.5, 'max' => 1 ) );
+		$field        = new CMB_Number_Field( 'foo', 'Foo', array( 0.5 ), array( 'min' => 0.4, 'max' => 1 ) );
 
 		if ( ! $this->post ) {
 			$this->markTestSkipped( 'Post not found' );
 		}
 
-		$this->expectOutputRegex( '/(type=\"number\".*?id=\"foo-cmb-field-0\".*?value=\"0.5\")/s' );
-		$this->expectOutputRegex( '/min="0.5"/s' );
-		$this->expectOutputRegex( '/max="1"/s' );
+		$this->expectOutputRegex( '/min="0.4".*max="1".*(type=\"number\".*?id=\"foo-cmb-field-0\".*?value=\"0.5\")/s' );
 
 		// Trigger output.
 		$field->html();

From fcc0a8f8dc4ca934e9484e8b854c7b25c7e68168 Mon Sep 17 00:00:00 2001
From: Shady Sharaf <shady@sharaf.me>
Date: Wed, 31 May 2017 17:27:08 +0200
Subject: [PATCH 105/148] Align code

---
 fields/class-cmb-number-field.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fields/class-cmb-number-field.php b/fields/class-cmb-number-field.php
index 3b56981d..b4c3123c 100644
--- a/fields/class-cmb-number-field.php
+++ b/fields/class-cmb-number-field.php
@@ -22,8 +22,8 @@ public function default_args() {
 			parent::default_args(),
 			array(
 				'step' => '',
-				'min' => '',
-				'max' => '',
+				'min'  => '',
+				'max'  => '',
 			)
 		);
 	}

From 148b110dc141ba9bcb3ea9a742c85b6cad7da4a0 Mon Sep 17 00:00:00 2001
From: Barry Ceelen <barryceelen@users.noreply.github.com>
Date: Tue, 15 Aug 2017 23:11:40 +0200
Subject: [PATCH 106/148] Fix textarea field not displaying default value

Use `$this->get_value()` in stead of `$this->value` in CMB_Textarea_Field

Fixes #437
---
 fields/class-cmb-textarea-field.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fields/class-cmb-textarea-field.php b/fields/class-cmb-textarea-field.php
index c351f4f1..f7f891ae 100644
--- a/fields/class-cmb-textarea-field.php
+++ b/fields/class-cmb-textarea-field.php
@@ -21,7 +21,7 @@ class CMB_Textarea_Field extends CMB_Field {
 	public function html() {
 		?>
 
-		<textarea <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr(); ?> rows="<?php echo ! empty( $this->args['rows'] ) ? esc_attr( $this->args['rows'] ) : 4; ?>" <?php $this->name_attr(); ?>><?php echo esc_textarea( $this->value ); ?></textarea>
+		<textarea <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr(); ?> rows="<?php echo ! empty( $this->args['rows'] ) ? esc_attr( $this->args['rows'] ) : 4; ?>" <?php $this->name_attr(); ?>><?php echo esc_textarea( $this->get_value() ); ?></textarea>
 
 		<?php
 	}

From 74d768f7a5b8ad8951ee14363ae70281266016c2 Mon Sep 17 00:00:00 2001
From: Barry Ceelen <barry@multipop.org>
Date: Wed, 20 Sep 2017 13:09:32 +0200
Subject: [PATCH 107/148] Use site language when loading Google Maps API

---
 fields/class-cmb-gmap-field.php | 2 ++
 js/field-gmap.js                | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/fields/class-cmb-gmap-field.php b/fields/class-cmb-gmap-field.php
index ecab0fcf..5e610b4f 100644
--- a/fields/class-cmb-gmap-field.php
+++ b/fields/class-cmb-gmap-field.php
@@ -34,6 +34,7 @@ public function get_default_args() {
 				'string-marker-title'         => esc_html__( 'Drag to set the exact location', 'cmb' ),
 				'string-gmaps-api-not-loaded' => esc_html__( 'Google Maps API not loaded.', 'cmb' ),
 				'google_api_key'              => '',
+				'language'                    => explode( '_', get_locale() )[0],
 			)
 		);
 	}
@@ -68,6 +69,7 @@ public function enqueue_scripts() {
 				'markerTitle'            => $this->args['string-marker-title'],
 				'googleMapsApiNotLoaded' => $this->args['string-gmaps-api-not-loaded'],
 			),
+			'language' => $this->args['language'],
 		) );
 
 	}
diff --git a/js/field-gmap.js b/js/field-gmap.js
index 30e8dade..b8baad3f 100644
--- a/js/field-gmap.js
+++ b/js/field-gmap.js
@@ -100,6 +100,6 @@
 		CMB.addCallbackForClonedField( ['CMB_Gmap_Field'], CMBGmapsInit );
 	};
 
-	$.getScript( '//maps.google.com/maps/api/js?sensor=true&libraries=places&callback=CMB_CMAPS_INIT&key=' + CMBGmaps.key );
+	$.getScript( '//maps.google.com/maps/api/js?sensor=true&libraries=places&language=' + CMBGmaps.language +  '&callback=CMB_CMAPS_INIT&key=' + CMBGmaps.key );
 
 }(jQuery));

From e11d119b54bcaaaa7bb5ccb08bcb2fd78205d153 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Wed, 11 Oct 2017 12:19:35 +0200
Subject: [PATCH 108/148] Declare official support requirements

---
 readme.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/readme.md b/readme.md
index ad66320f..97a781b4 100644
--- a/readme.md
+++ b/readme.md
@@ -46,6 +46,10 @@ This plugin is maintained by [Human Made Limited](http://hmn.md)
 
 It began as a fork of [Custom Meta Boxes](https://github.com/jaredatch/Custom-Metaboxes-and-Fields-for-WordPress), but is no longer compatible.
 
+## Minimum Requirements:
+* PHP >= 5.4
+* WP >= 4.0
+
 ## Known Issues
 * Some fields do not work well as repeatable fields.
 * Some fields do not work well in repeatable groups.

From 0f9b4c66fd0aa3fab0c51e31297e87ee84e65194 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Wed, 11 Oct 2017 12:38:05 +0200
Subject: [PATCH 109/148] Remove passing-by-reference of get_values method

---
 fields/class-cmb-checkbox-multi.php | 2 +-
 fields/class-cmb-field.php          | 2 +-
 fields/class-cmb-gmap-field.php     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fields/class-cmb-checkbox-multi.php b/fields/class-cmb-checkbox-multi.php
index 1769bfa8..e63f09e7 100644
--- a/fields/class-cmb-checkbox-multi.php
+++ b/fields/class-cmb-checkbox-multi.php
@@ -110,7 +110,7 @@ public function html() {
 	 *
 	 * @return array
 	 */
-	public function &get_values() {
+	public function get_values() {
 
 		// We always want to fetch the existing (possibly empty) values if it's an existing object.
 		if ( ! $this->is_new_object() ) {
diff --git a/fields/class-cmb-field.php b/fields/class-cmb-field.php
index fc32d729..7174e239 100644
--- a/fields/class-cmb-field.php
+++ b/fields/class-cmb-field.php
@@ -360,7 +360,7 @@ public function get_value() {
 	 *
 	 * @return array
 	 */
-	public function &get_values() {
+	public function get_values() {
 		return $this->values;
 	}
 
diff --git a/fields/class-cmb-gmap-field.php b/fields/class-cmb-gmap-field.php
index 5e610b4f..9e133f60 100644
--- a/fields/class-cmb-gmap-field.php
+++ b/fields/class-cmb-gmap-field.php
@@ -79,7 +79,7 @@ public function enqueue_scripts() {
 	 *
 	 * @return array
 	 */
-	public function &get_values() {
+	public function get_values() {
 		return ( ! $this->args['repeatable'] ) ? array( $this->values ) : $this->values;
 	}
 

From 9159f85ccdb1024df369dcc77c8cb265e40646bf Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Thu, 30 Nov 2017 08:16:52 -0800
Subject: [PATCH 110/148] Add param docblock item

---
 fields/class-cmb-field.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fields/class-cmb-field.php b/fields/class-cmb-field.php
index fc32d729..b99ed799 100644
--- a/fields/class-cmb-field.php
+++ b/fields/class-cmb-field.php
@@ -439,6 +439,8 @@ public function save( $post_id, $values ) {
 
 	/**
 	 * Check whether the current field should or should not be displayed.
+	 *
+	 * @param int $post_id Post ID to check against.
 	 */
 	public function is_displayed( $post_id ) {
 		return current_user_can( $this->args['capability'], $post_id );

From 013c820ca1f77168d085928afe08e30f39908675 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Thu, 30 Nov 2017 08:17:17 -0800
Subject: [PATCH 111/148] Clean up setUp and pass postID in is_displayed tests

---
 tests/testField.php | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/tests/testField.php b/tests/testField.php
index 4b04dd0b..d4f82249 100644
--- a/tests/testField.php
+++ b/tests/testField.php
@@ -7,25 +7,20 @@ class FieldTestCase extends WP_UnitTestCase {
 	private $users = array();
 
 	function setUp() {
-
 		parent::setUp();
 
-		$args = array(
-			'post_author' => 1,
-			'post_status' => 'publish',
-			'post_content' => rand_str(),
-			'post_title' => rand_str(),
-			'post_type' => 'post',
-		);
-
-		$id = wp_insert_post( $args );
-
-		$this->post = get_post( $id );
-
 		// Setup some users to test our display logic.
 		$this->users['admin'] = $this->factory->user->create( array( 'role' => 'administrator' ) );
 		$this->users['author'] = $this->factory->user->create( array( 'role' => 'author' ) );
 
+		// Setup a post for testing is_displayed.
+		$this->post = $this->factory->post->create_and_get( array(
+			'post_author'  => 1,
+			'post_status'  => 'publish',
+			'post_content' => rand_str(),
+			'post_title'   => rand_str(),
+			'post_type'    => 'post',
+		) );
 	}
 
 	function tearDown() {
@@ -236,17 +231,17 @@ function testIsDisplayed() {
 		wp_set_current_user( $this->users['admin'] );
 
 		// Test default value against default admin.
-		$this->assertTrue( $field->is_displayed() );
+		$this->assertTrue( $field->is_displayed( $this->post->ID ) );
 
 		// Re-setup the field with some capability logic in there.
 		$field = new CMB_Text_Field( 'foo', 'Title', array( 1 ), array( 'capability' => 'edit_others_posts' ) );
 
 		// Should still return true for admin.
-		$this->assertTrue( $field->is_displayed() );
+		$this->assertTrue( $field->is_displayed( $this->post->ID ) );
 
 		// Change to the author and test against our modified permission.
 		wp_set_current_user( $this->users['author'] );
 
-		$this->assertFalse( $field->is_displayed() );
+		$this->assertFalse( $field->is_displayed( $this->post->ID ) );
 	}
 }

From f99c2c22e4c932579cd380ce158f2e3eac3a628d Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Thu, 30 Nov 2017 08:52:58 -0800
Subject: [PATCH 112/148] Moved existing field tests into a fields test
 directory

---
 tests/{ => fields}/testCheckboxMultiField.php | 0
 tests/{ => fields}/testCmbMetaBoxClass.php    | 0
 tests/{ => fields}/testDateField.php          | 0
 tests/{ => fields}/testEmailField.php         | 0
 tests/{ => fields}/testGroupField.php         | 0
 tests/{ => fields}/testHiddenField.php        | 0
 tests/{ => fields}/testNumberField.php        | 0
 7 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/{ => fields}/testCheckboxMultiField.php (100%)
 rename tests/{ => fields}/testCmbMetaBoxClass.php (100%)
 rename tests/{ => fields}/testDateField.php (100%)
 rename tests/{ => fields}/testEmailField.php (100%)
 rename tests/{ => fields}/testGroupField.php (100%)
 rename tests/{ => fields}/testHiddenField.php (100%)
 rename tests/{ => fields}/testNumberField.php (100%)

diff --git a/tests/testCheckboxMultiField.php b/tests/fields/testCheckboxMultiField.php
similarity index 100%
rename from tests/testCheckboxMultiField.php
rename to tests/fields/testCheckboxMultiField.php
diff --git a/tests/testCmbMetaBoxClass.php b/tests/fields/testCmbMetaBoxClass.php
similarity index 100%
rename from tests/testCmbMetaBoxClass.php
rename to tests/fields/testCmbMetaBoxClass.php
diff --git a/tests/testDateField.php b/tests/fields/testDateField.php
similarity index 100%
rename from tests/testDateField.php
rename to tests/fields/testDateField.php
diff --git a/tests/testEmailField.php b/tests/fields/testEmailField.php
similarity index 100%
rename from tests/testEmailField.php
rename to tests/fields/testEmailField.php
diff --git a/tests/testGroupField.php b/tests/fields/testGroupField.php
similarity index 100%
rename from tests/testGroupField.php
rename to tests/fields/testGroupField.php
diff --git a/tests/testHiddenField.php b/tests/fields/testHiddenField.php
similarity index 100%
rename from tests/testHiddenField.php
rename to tests/fields/testHiddenField.php
diff --git a/tests/testNumberField.php b/tests/fields/testNumberField.php
similarity index 100%
rename from tests/testNumberField.php
rename to tests/fields/testNumberField.php

From 2563687a2d4e482555f8e6eb004de891f33defee Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Thu, 30 Nov 2017 12:13:35 -0800
Subject: [PATCH 113/148] Add basic test class to extend and use

---
 tests/bootstrap.php             | 17 ++++++++++
 tests/class-test-field-case.php | 59 +++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 tests/class-test-field-case.php

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 95396d7b..4d56e165 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,5 +1,19 @@
 <?php
 
+// On Chassis, tests can silently fail, so introduce a shutdown function to print the last error.
+// Throwing an exception sends a non-zero exit code.
+register_shutdown_function( function() {
+	// Only load in Chassis.
+	if ( ! defined( 'WP_LOCAL_DEV' ) ) {
+		return;
+	}
+
+	$error = error_get_last();
+	if ( $error && isset( $error['message'] ) && ! defined( 'DOING_AJAX' ) ) {
+		throw new Exception( $error['message'] );
+	}
+} );
+
 $_tests_dir = getenv( 'WP_TESTS_DIR' );
 
 if ( ! $_tests_dir ) {
@@ -15,6 +29,9 @@ function _manually_load_plugin() {
 
 require $_tests_dir . '/includes/bootstrap.php';
 
+// Include our test class.
+require_once __DIR__ . '/class-test-field-case.php';
+
 /**
  * Call protected/private method of a class.
  *
diff --git a/tests/class-test-field-case.php b/tests/class-test-field-case.php
new file mode 100644
index 00000000..8ae262c2
--- /dev/null
+++ b/tests/class-test-field-case.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Class for testing a field case
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
+
+namespace HMCMB\Tests;
+
+use WP_UnitTest_Factory;
+use WP_UnitTestCase;
+
+/**
+ * Class TestFieldCase
+ */
+abstract class TestFieldCase extends WP_UnitTestCase {
+	/**
+	 * Consistent post for use with testing fields.
+	 *
+	 * @var
+	 */
+	protected static $post;
+
+	/**
+	 * Class instance.
+	 */
+	//protected $instance;
+
+	/**
+	 * Setup objects for our tests.
+	 *
+	 * @param $factory
+	 */
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+		self::$post = $factory->post->create_and_get( [
+			'post_author'  => 1,
+			'post_status'  => 'publish',
+			'post_content' => rand_str(),
+			'post_title'   => rand_str(),
+			'post_type'    => 'post',
+		] );
+	}
+
+	public static function wpTearDownAfterClass() {
+		wp_delete_post( self::$post->ID );
+	}
+
+	/**
+	 * Verify that we can register and load a field without error.
+	 */
+	public function register_field( $field_id ) {}
+
+	public function instantiate_class( $class_name ) {}
+
+	abstract public function test_field_class_instantiation();
+	abstract public function test_field_registration();
+	abstract public function test_field_output();
+}
\ No newline at end of file

From 4938eed9b292ca64256e1be7b7c0d7f2b0c6063e Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Thu, 30 Nov 2017 12:55:06 -0800
Subject: [PATCH 114/148] Added an argument setting function for handling
 updates and initial settings upfront

---
 fields/class-cmb-field.php | 41 ++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/fields/class-cmb-field.php b/fields/class-cmb-field.php
index fc32d729..97e032b2 100644
--- a/fields/class-cmb-field.php
+++ b/fields/class-cmb-field.php
@@ -38,21 +38,7 @@ public function __construct( $name, $title, array $values, $args = array() ) {
 		$this->id    = $name;
 		$this->name  = $name . '[]';
 		$this->title = $title;
-		$this->args  = wp_parse_args( $args, $this->get_default_args() );
-
-		// Deprecated argument: 'std'
-		if ( ! empty( $this->args['std'] ) && empty( $this->args['default'] ) ) {
-			$this->args['default'] = $this->args['std'];
-			_deprecated_argument( 'CMB_Field', '0.9', "field argument 'std' is deprecated, use 'default' instead" );
-		}
-
-		if ( ! empty( $this->args['options'] ) && is_array( reset( $this->args['options'] ) ) ) {
-			$re_format = array();
-			foreach ( $this->args['options'] as $option ) {
-				$re_format[ $option['value'] ] = $option['name'];
-			}
-			$this->args['options'] = $re_format;
-		}
+		$this->set_arguments( $args );
 
 		// If the field has a custom value populator callback.
 		if ( ! empty( $args['values_callback'] ) ) {
@@ -601,4 +587,29 @@ protected function is_new_object() {
 
 		return false;
 	}
+
+	/**
+	 * Setup arguments for the class.
+	 *
+	 * @param $arguments
+	 */
+	public function set_arguments( $arguments ) {
+		// Initially set arguments up.
+		$this->args = wp_parse_args( $arguments, $this->get_default_args() );
+
+		// Support the deprecated argument: 'std'
+		if ( ! empty( $this->args['std'] ) && empty( $this->args['default'] ) ) {
+			$this->args['default'] = $this->args['std'];
+			_deprecated_argument( 'CMB_Field', '0.9', "field argument 'std' is deprecated, use 'default' instead" );
+		}
+
+
+		if ( ! empty( $this->args['options'] ) && is_array( reset( $this->args['options'] ) ) ) {
+			$re_format = array();
+			foreach ( $this->args['options'] as $option ) {
+				$re_format[ $option['value'] ] = $option['name'];
+			}
+			$this->args['options'] = $re_format;
+		}
+	}
 }

From ab450d2a927de00c363ec59c4b9772a87b31845f Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Thu, 30 Nov 2017 12:55:28 -0800
Subject: [PATCH 115/148] Added a checkbox test and pre-set several tests to
 run against each field.

---
 tests/class-test-field-case.php    | 74 +++++++++++++++++++++++++++---
 tests/fields/testCheckboxField.php | 18 ++++++++
 2 files changed, 85 insertions(+), 7 deletions(-)
 create mode 100644 tests/fields/testCheckboxField.php

diff --git a/tests/class-test-field-case.php b/tests/class-test-field-case.php
index 8ae262c2..bee877be 100644
--- a/tests/class-test-field-case.php
+++ b/tests/class-test-field-case.php
@@ -25,7 +25,7 @@ abstract class TestFieldCase extends WP_UnitTestCase {
 	/**
 	 * Class instance.
 	 */
-	//protected $instance;
+	protected $instance;
 
 	/**
 	 * Setup objects for our tests.
@@ -47,13 +47,73 @@ public static function wpTearDownAfterClass() {
 	}
 
 	/**
-	 * Verify that we can register and load a field without error.
+	 * Update the argument set on a field class.
+	 *
+	 * @param $new_arguments
 	 */
-	public function register_field( $field_id ) {}
+	public function update_arguments( $new_arguments ) {
+		$this->instance->set_arguments( $new_arguments );
+	}
 
-	public function instantiate_class( $class_name ) {}
+	/**
+	 * Verify that the field outputs with no errors for each argument set.
+	 *
+	 * @dataProvider argumentsProvider
+	 */
+	public function test_field_output( $arguments = [] ) {
+		$this->update_arguments( $arguments );
+
+		error_log( print_r( $arguments, true ) );
 
-	abstract public function test_field_class_instantiation();
-	abstract public function test_field_registration();
-	abstract public function test_field_output();
+		// Check the default HTML output.
+		// The point of these checks is to ensure that the field doesn't error out with each argument set.
+		$this->expectOutputRegex( '/data-class=\"' . get_class( $this->instance ) . '\"/' );
+		$this->instance->display();
+	}
+
+	/**
+	 * Provide a set of arguments to test against.
+	 *
+	 * Here we provide a default set of arguments to test each field against.
+	 *
+	 * @return array Default argument set.
+	 */
+	public function argumentsProvider() {
+		return [
+			[],
+			[
+				'id' => 'my-ID',
+			],
+			[
+				'id'   => 'my-ID',
+				'name' => 'My Name'
+			],
+			[
+				'id'   => 'my-ID',
+				'name' => 'My Name',
+				'desc' => 'A long description',
+			],
+			[
+				'id'         => 'my-ID',
+				'name'       => 'My Name',
+				'desc'       => 'A long description',
+				'repeatable' => true,
+				'sortable'   => true,
+			],
+			[
+				'id'         => 'my-ID',
+				'name'       => 'My Name',
+				'desc'       => 'A long description',
+				'repeatable' => false,
+				'sortable'   => true,
+			],
+			[
+				'id'         => 'my-ID',
+				'name'       => 'My Name',
+				'desc'       => 'A long description',
+				'repeatable' => true,
+				'sortable'   => false,
+			],
+		];
+	}
 }
\ No newline at end of file
diff --git a/tests/fields/testCheckboxField.php b/tests/fields/testCheckboxField.php
new file mode 100644
index 00000000..8a4dd3c8
--- /dev/null
+++ b/tests/fields/testCheckboxField.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace HMCMB\Tests;
+
+use CMB_Checkbox;
+
+/**
+ * Class CheckboxFieldTestCase
+ *
+ * @group fields
+ */
+class CheckboxFieldTestCase extends TestFieldCase {
+	public function setUp() {
+		parent::setUp();
+
+		$this->instance = new CMB_Checkbox( 'field', 'Field', [] );;
+	}
+}

From 8c6d27ad921e6753d76642aebfd2506e7414d9fa Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Thu, 30 Nov 2017 13:01:51 -0800
Subject: [PATCH 116/148] Extending TestFieldCase in checkbox multi tests

---
 tests/fields/testCheckboxMultiField.php | 69 +++++++++++++------------
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/tests/fields/testCheckboxMultiField.php b/tests/fields/testCheckboxMultiField.php
index 0f49c3fb..bccd8260 100644
--- a/tests/fields/testCheckboxMultiField.php
+++ b/tests/fields/testCheckboxMultiField.php
@@ -1,51 +1,39 @@
 <?php
 
-class CheckboxMultiFieldTestCase extends WP_UnitTestCase {
+namespace HMCMB\Tests;
 
-	function setUp() {
-		parent::setUp();
-
-		$args = array(
-			'post_author'  => 1,
-			'post_status'  => 'publish',
-			'post_content' => 'My random and unimportant test string',
-			'post_title'   => 'Random Post',
-			'post_type'    => 'post',
-		);
-
-		$id = wp_insert_post( $args );
+use CMB_Checkbox_Multi;
 
-		$this->post = get_post( $id );
-	}
+/**
+ * Class CheckboxMultiFieldTestCase
+ *
+ * @group fields
+ */
+class CheckboxMultiFieldTestCase extends TestFieldCase {
+	public function setUp() {
+		parent::setUp();
 
-	function tearDown() {
-		wp_delete_post( $this->post->ID, true );
-		unset( $this->post );
-		parent::tearDown();
+		$this->instance = new CMB_Checkbox_Multi( 'field', 'Field', [] );;
 	}
 
-	function testSaveValue() {
+	public function testSaveValue() {
 		$value = array( 'value' );
 		$field = new CMB_Checkbox_Multi( 'foo', 'Foo', $value );
 
-		if ( ! $this->post ) {
+		if ( ! self::$post ) {
 			$this->markTestSkipped( 'Post not found' );
 		}
 
-		$field->save( $this->post->ID, $value );
+		$field->save( self::$post->ID, $value );
 
 		// Verify single value is properly saved.
-		$this->assertEquals( get_post_meta( $this->post->ID, 'foo', false ), $value );
+		$this->assertEquals( get_post_meta( self::$post->ID, 'foo', false ), $value );
 	}
 
-	function testSaveValuesOnRepeatable() {
+	public function testEmptyFieldOutput() {
+		$field = new CMB_Checkbox_Multi( 'foo', 'Foo', array( 'value' => 'value' ), array( 'options' => array( 'value' => 'value' ) ) );
 
-	}
-
-	function testEmptyFieldOutput() {
-		$field        = new CMB_Checkbox_Multi( 'foo', 'Foo', array( 'value' => 'value' ), array( 'options' => array( 'value' => 'value' ) ) );
-
-		if ( ! $this->post ) {
+		if ( ! self::$post ) {
 			$this->markTestSkipped( 'Post not found' );
 		}
 
@@ -55,18 +43,31 @@ function testEmptyFieldOutput() {
 		$field->html();
 	}
 
-	function testSavedFieldOutput() {
-		$field        = new CMB_Checkbox_Multi( 'foo', 'Foo', array( 'value' => 'value' ), array( 'options' => array( 'value' => 'value', 'value2' => 'value2' ) ) );
+	public function testSavedFieldOutput() {
+		$field = new CMB_Checkbox_Multi( 'foo', 'Foo', array( 'value' => 'value' ), array( 'options' => array( 'value' => 'value', 'value2' => 'value2' ) ) );
 
-		if ( ! $this->post ) {
+		if ( ! self::$post ) {
 			$this->markTestSkipped( 'Post not found' );
 		}
 
-		$field->save( $this->post->ID, array( 'value2' => 'on' ) );
+		$field->save( self::$post->ID, array( 'value2' => 'on' ) );
 
 		$this->expectOutputRegex( '/(type=\"checkbox\".*?id=\"foo-cmb-field-0-item-value2\".*?checked=\'checked\')/s' );
 
 		// Trigger output.
 		$field->html();
 	}
+
+	/**
+	 * Update our default argument set with specific args.
+	 *
+	 * @return array
+	 */
+	public function argumentsProvider() {
+		$args = [
+			'options' => [ 'Option 1', 'Option 2', 'Option 3' ],
+		];
+
+		return array_merge( $args, parent::argumentsProvider() );
+	}
 }

From 32b49c505a93cb6d8e66386f5ddb0da2e62a5107 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Thu, 30 Nov 2017 13:05:46 -0800
Subject: [PATCH 117/148] Extending TestFieldCase in date field tests

---
 tests/fields/testDateField.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/tests/fields/testDateField.php b/tests/fields/testDateField.php
index 8c2f070f..6187c12e 100644
--- a/tests/fields/testDateField.php
+++ b/tests/fields/testDateField.php
@@ -1,9 +1,21 @@
 <?php
 
-class DateFieldsAssetsTestCase extends WP_UnitTestCase {
+namespace HMCMB\Tests;
 
+use CMB_Date_Field;
+use WP_Scripts;
+
+/**
+ * Class DateFieldsAssetsTestCase
+ *
+ * @group fields
+ */
+class DateFieldsAssetsTestCase extends TestFieldCase {
 	function setUp() {
 		parent::setUp();
+
+		$this->instance = new CMB_Date_Field( 'field', 'Field', [] );;
+
 		$this->old_wp_scripts = isset( $GLOBALS['wp_scripts'] ) ? $GLOBALS['wp_scripts'] : null;
 		$GLOBALS['wp_scripts'] = new WP_Scripts();
 		$GLOBALS['wp_scripts']->default_version = get_bloginfo( 'version' );
@@ -17,7 +29,7 @@ function tearDown() {
 	/**
 	 * Test that all required scripts & styles are correctly loaded.
 	 */
-	function testDateFieldAssets() {
+	function testAssets() {
 		global $wp_version;
 
 		$field = new CMB_Date_Field( 'foo', 'Title', array() );

From d1e1bd00225346cd94f8412401581a3f7b8d6318 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Thu, 30 Nov 2017 13:30:38 -0800
Subject: [PATCH 118/148] Added test files for all fields that didn't already
 have some

---
 tests/fields/testCheckboxField.php          |  2 +-
 tests/fields/testColorField.php             | 18 ++++++
 tests/fields/testDateField.php              | 61 +--------------------
 tests/fields/testDateTimeTimestampField.php | 32 +++++++++++
 tests/fields/testDateTimestampField.php     | 32 +++++++++++
 tests/fields/testGmapField.php              | 18 ++++++
 tests/fields/testImageField.php             | 18 ++++++
 tests/fields/testPostSelectField.php        | 18 ++++++
 tests/fields/testRadioField.php             | 18 ++++++
 tests/fields/testSelectField.php            | 18 ++++++
 tests/fields/testTaxonomyField.php          | 18 ++++++
 tests/fields/testTextField.php              | 18 ++++++
 tests/fields/testTextSmallField.php         | 18 ++++++
 tests/fields/testTextareaCodeField.php      | 18 ++++++
 tests/fields/testTextareaField.php          | 18 ++++++
 tests/fields/testTimeField.php              | 32 +++++++++++
 tests/fields/testTitleCodeField.php         | 18 ++++++
 tests/fields/testURLCodeField.php           | 18 ++++++
 tests/fields/testWYSIWYGCodeField.php       | 18 ++++++
 19 files changed, 351 insertions(+), 60 deletions(-)
 create mode 100644 tests/fields/testColorField.php
 create mode 100644 tests/fields/testDateTimeTimestampField.php
 create mode 100644 tests/fields/testDateTimestampField.php
 create mode 100644 tests/fields/testGmapField.php
 create mode 100644 tests/fields/testImageField.php
 create mode 100644 tests/fields/testPostSelectField.php
 create mode 100644 tests/fields/testRadioField.php
 create mode 100644 tests/fields/testSelectField.php
 create mode 100644 tests/fields/testTaxonomyField.php
 create mode 100644 tests/fields/testTextField.php
 create mode 100644 tests/fields/testTextSmallField.php
 create mode 100644 tests/fields/testTextareaCodeField.php
 create mode 100644 tests/fields/testTextareaField.php
 create mode 100644 tests/fields/testTimeField.php
 create mode 100644 tests/fields/testTitleCodeField.php
 create mode 100644 tests/fields/testURLCodeField.php
 create mode 100644 tests/fields/testWYSIWYGCodeField.php

diff --git a/tests/fields/testCheckboxField.php b/tests/fields/testCheckboxField.php
index 8a4dd3c8..f38e071f 100644
--- a/tests/fields/testCheckboxField.php
+++ b/tests/fields/testCheckboxField.php
@@ -13,6 +13,6 @@ class CheckboxFieldTestCase extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->instance = new CMB_Checkbox( 'field', 'Field', [] );;
+		$this->instance = new CMB_Checkbox( 'field', 'Field', [] );
 	}
 }
diff --git a/tests/fields/testColorField.php b/tests/fields/testColorField.php
new file mode 100644
index 00000000..76166956
--- /dev/null
+++ b/tests/fields/testColorField.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace HMCMB\Tests;
+
+use CMB_Color_Picker;
+
+/**
+ * Class ColorFieldTestCase
+ *
+ * @group fields
+ */
+class ColorFieldTestCase extends TestFieldCase {
+	public function setUp() {
+		parent::setUp();
+
+		$this->instance = new CMB_Color_Picker( 'field', 'Field', [] );
+	}
+}
diff --git a/tests/fields/testDateField.php b/tests/fields/testDateField.php
index 6187c12e..4ba60be6 100644
--- a/tests/fields/testDateField.php
+++ b/tests/fields/testDateField.php
@@ -32,13 +32,11 @@ function tearDown() {
 	function testAssets() {
 		global $wp_version;
 
-		$field = new CMB_Date_Field( 'foo', 'Title', array() );
-
 		// Register CMB-Scripts as this is a dependency.
 		wp_register_script( 'cmb-scripts', trailingslashit( CMB_URL ) . 'js/cmb.js', array( 'jquery' ) );
 
-		$field->enqueue_scripts();
-		$field->enqueue_styles();
+		$this->instance->enqueue_scripts();
+		$this->instance->enqueue_styles();
 
 		$scripts_output = get_echo( 'wp_print_scripts' );
 		$styles_output = get_echo( 'wp_print_styles' );
@@ -56,60 +54,5 @@ function testAssets() {
 
 		// Styles
 		$this->assertContains( 'css/vendor/jquery-ui/jquery-ui.css', $styles_output );
-
-	}
-
-	function testTimeFieldAssets() {
-
-		$field = new CMB_Time_Field( 'foo', 'Title', array() );
-
-		// Register CMB-Scripts as this is a dependency.
-		wp_enqueue_script( 'cmb-scripts', trailingslashit( CMB_URL ) . 'js/cmb.js', array( 'jquery' ) );
-
-		$field->enqueue_scripts();
-
-		$scripts_output = get_echo( 'wp_print_scripts' );
-
-		// Scripts
-		$this->assertContains( CMB_URL . '/js/cmb.js', $scripts_output );
-		$this->assertContains( CMB_URL . '/js/jquery.timePicker.min.js', $scripts_output );
-		$this->assertContains( CMB_URL . '/js/field.datetime.js', $scripts_output );
-
-	}
-
-	function testDateTimestampFieldAssets() {
-
-		$field = new CMB_Date_Timestamp_Field( 'foo', 'Title', array() );
-
-		// Register CMB-Scripts as this is a dependency.
-		wp_enqueue_script( 'cmb-scripts', trailingslashit( CMB_URL ) . 'js/cmb.js', array( 'jquery' ) );
-
-		$field->enqueue_scripts();
-
-		$scripts_output = get_echo( 'wp_print_scripts' );
-
-		// Scripts
-		$this->assertContains( CMB_URL . '/js/cmb.js', $scripts_output );
-		$this->assertContains( CMB_URL . '/js/jquery.timePicker.min.js', $scripts_output );
-		$this->assertContains( CMB_URL . '/js/field.datetime.js', $scripts_output );
-
-	}
-
-	function testDatetimeTimestampFieldAssets() {
-
-		$field = new CMB_Datetime_Timestamp_Field( 'foo', 'Title', array() );
-
-		// Register CMB-Scripts as this is a dependency.
-		wp_enqueue_script( 'cmb-scripts', trailingslashit( CMB_URL ) . 'js/cmb.js', array( 'jquery' ) );
-
-		$field->enqueue_scripts();
-
-		$scripts_output = get_echo( 'wp_print_scripts' );
-
-		// Scripts
-		$this->assertContains( CMB_URL . '/js/cmb.js', $scripts_output );
-		$this->assertContains( CMB_URL . '/js/jquery.timePicker.min.js', $scripts_output );
-		$this->assertContains( CMB_URL . '/js/field.datetime.js', $scripts_output );
-
 	}
 }
diff --git a/tests/fields/testDateTimeTimestampField.php b/tests/fields/testDateTimeTimestampField.php
new file mode 100644
index 00000000..016469dd
--- /dev/null
+++ b/tests/fields/testDateTimeTimestampField.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace HMCMB\Tests;
+
+use CMB_Datetime_Timestamp_Field;
+
+/**
+ * Class DateTimeTimestampFieldTestCase
+ *
+ * @group fields
+ */
+class DateTimeTimestampFieldTestCase extends TestFieldCase {
+	public function setUp() {
+		parent::setUp();
+
+		$this->instance = new CMB_Datetime_Timestamp_Field( 'field', 'Field', [] );
+	}
+
+	function testAssets() {
+		// Register CMB-Scripts as this is a dependency.
+		wp_enqueue_script( 'cmb-scripts', trailingslashit( CMB_URL ) . 'js/cmb.js', array( 'jquery' ) );
+
+		$this->instance->enqueue_scripts();
+
+		$scripts_output = get_echo( 'wp_print_scripts' );
+
+		// Scripts
+		$this->assertContains( CMB_URL . '/js/cmb.js', $scripts_output );
+		$this->assertContains( CMB_URL . '/js/jquery.timePicker.min.js', $scripts_output );
+		$this->assertContains( CMB_URL . '/js/field.datetime.js', $scripts_output );
+	}
+}
diff --git a/tests/fields/testDateTimestampField.php b/tests/fields/testDateTimestampField.php
new file mode 100644
index 00000000..25ebb462
--- /dev/null
+++ b/tests/fields/testDateTimestampField.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace HMCMB\Tests;
+
+use CMB_Date_Timestamp_Field;
+
+/**
+ * Class DateTimestampFieldTestCase
+ *
+ * @group fields
+ */
+class DateTimestampFieldTestCase extends TestFieldCase {
+	public function setUp() {
+		parent::setUp();
+
+		$this->instance = new CMB_Date_Timestamp_Field( 'field', 'Field', [] );
+	}
+
+	function testAssets() {
+		// Register CMB-Scripts as this is a dependency.
+		wp_enqueue_script( 'cmb-scripts', trailingslashit( CMB_URL ) . 'js/cmb.js', array( 'jquery' ) );
+
+		$this->instance->enqueue_scripts();
+
+		$scripts_output = get_echo( 'wp_print_scripts' );
+
+		// Scripts
+		$this->assertContains( CMB_URL . '/js/cmb.js', $scripts_output );
+		$this->assertContains( CMB_URL . '/js/jquery.timePicker.min.js', $scripts_output );
+		$this->assertContains( CMB_URL . '/js/field.datetime.js', $scripts_output );
+	}
+}
diff --git a/tests/fields/testGmapField.php b/tests/fields/testGmapField.php
new file mode 100644
index 00000000..ab59cc24
--- /dev/null
+++ b/tests/fields/testGmapField.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace HMCMB\Tests;
+
+use CMB_Gmap_Field;
+
+/**
+ * Class GmapFieldTestCase
+ *
+ * @group fields
+ */
+class GmapFieldTestCase extends TestFieldCase {
+	public function setUp() {
+		parent::setUp();
+
+		$this->instance = new CMB_Gmap_Field( 'field', 'Field', [] );
+	}
+}
diff --git a/tests/fields/testImageField.php b/tests/fields/testImageField.php
new file mode 100644
index 00000000..372af0ad
--- /dev/null
+++ b/tests/fields/testImageField.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace HMCMB\Tests;
+
+use CMB_Image_Field;
+
+/**
+ * Class ImageFieldTestCase
+ *
+ * @group fields
+ */
+class ImageFieldTestCase extends TestFieldCase {
+	public function setUp() {
+		parent::setUp();
+
+		$this->instance = new CMB_Image_Field( 'field', 'Field', [] );
+	}
+}
diff --git a/tests/fields/testPostSelectField.php b/tests/fields/testPostSelectField.php
new file mode 100644
index 00000000..f2a41b21
--- /dev/null
+++ b/tests/fields/testPostSelectField.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace HMCMB\Tests;
+
+use CMB_Post_Select;
+
+/**
+ * Class PostSelectFieldTestCase
+ *
+ * @group fields
+ */
+class PostSelectFieldTestCase extends TestFieldCase {
+	public function setUp() {
+		parent::setUp();
+
+		$this->instance = new CMB_Post_Select( 'field', 'Field', [] );
+	}
+}
diff --git a/tests/fields/testRadioField.php b/tests/fields/testRadioField.php
new file mode 100644
index 00000000..98884bf4
--- /dev/null
+++ b/tests/fields/testRadioField.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace HMCMB\Tests;
+
+use CMB_Radio_Field;
+
+/**
+ * Class RadioFieldTestCase
+ *
+ * @group fields
+ */
+class RadioFieldTestCase extends TestFieldCase {
+	public function setUp() {
+		parent::setUp();
+
+		$this->instance = new CMB_Radio_Field( 'field', 'Field', [] );
+	}
+}
diff --git a/tests/fields/testSelectField.php b/tests/fields/testSelectField.php
new file mode 100644
index 00000000..0c7b1734
--- /dev/null
+++ b/tests/fields/testSelectField.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace HMCMB\Tests;
+
+use CMB_Select;
+
+/**
+ * Class SelectFieldTestCase
+ *
+ * @group fields
+ */
+class SelectFieldTestCase extends TestFieldCase {
+	public function setUp() {
+		parent::setUp();
+
+		$this->instance = new CMB_Select( 'field', 'Field', [] );
+	}
+}
diff --git a/tests/fields/testTaxonomyField.php b/tests/fields/testTaxonomyField.php
new file mode 100644
index 00000000..1bd4a0a0
--- /dev/null
+++ b/tests/fields/testTaxonomyField.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace HMCMB\Tests;
+
+use CMB_Taxonomy;
+
+/**
+ * Class TaxonomyFieldTestCase
+ *
+ * @group fields
+ */
+class TaxonomyFieldTestCase extends TestFieldCase {
+	public function setUp() {
+		parent::setUp();
+
+		$this->instance = new CMB_Taxonomy( 'field', 'Field', [] );
+	}
+}
diff --git a/tests/fields/testTextField.php b/tests/fields/testTextField.php
new file mode 100644
index 00000000..fd0343be
--- /dev/null
+++ b/tests/fields/testTextField.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace HMCMB\Tests;
+
+use CMB_Text_Field;
+
+/**
+ * Class TextFieldTestCase
+ *
+ * @group fields
+ */
+class TextFieldTestCase extends TestFieldCase {
+	public function setUp() {
+		parent::setUp();
+
+		$this->instance = new CMB_Text_Field( 'field', 'Field', [] );
+	}
+}
diff --git a/tests/fields/testTextSmallField.php b/tests/fields/testTextSmallField.php
new file mode 100644
index 00000000..cf939140
--- /dev/null
+++ b/tests/fields/testTextSmallField.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace HMCMB\Tests;
+
+use CMB_Text_Small_Field;
+
+/**
+ * Class TextSmallFieldTestCase
+ *
+ * @group fields
+ */
+class TextSmallFieldTestCase extends TestFieldCase {
+	public function setUp() {
+		parent::setUp();
+
+		$this->instance = new CMB_Text_Small_Field( 'field', 'Field', [] );
+	}
+}
diff --git a/tests/fields/testTextareaCodeField.php b/tests/fields/testTextareaCodeField.php
new file mode 100644
index 00000000..886661d5
--- /dev/null
+++ b/tests/fields/testTextareaCodeField.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace HMCMB\Tests;
+
+use CMB_Textarea_Field_Code;
+
+/**
+ * Class TextareaCodeFieldTestCase
+ *
+ * @group fields
+ */
+class TextareaCodeFieldTestCase extends TestFieldCase {
+	public function setUp() {
+		parent::setUp();
+
+		$this->instance = new CMB_Textarea_Field_Code( 'field', 'Field', [] );
+	}
+}
diff --git a/tests/fields/testTextareaField.php b/tests/fields/testTextareaField.php
new file mode 100644
index 00000000..23d0c037
--- /dev/null
+++ b/tests/fields/testTextareaField.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace HMCMB\Tests;
+
+use CMB_Textarea_Field;
+
+/**
+ * Class TextareaFieldTestCase
+ *
+ * @group fields
+ */
+class TextareaFieldTestCase extends TestFieldCase {
+	public function setUp() {
+		parent::setUp();
+
+		$this->instance = new CMB_Textarea_Field( 'field', 'Field', [] );
+	}
+}
diff --git a/tests/fields/testTimeField.php b/tests/fields/testTimeField.php
new file mode 100644
index 00000000..46a55682
--- /dev/null
+++ b/tests/fields/testTimeField.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace HMCMB\Tests;
+
+use CMB_Time_Field;
+
+/**
+ * Class TimeTestCase
+ *
+ * @group fields
+ */
+class TimeTestCase extends TestFieldCase {
+	public function setUp() {
+		parent::setUp();
+
+		$this->instance = new CMB_Time_Field( 'field', 'Field', [] );
+	}
+
+	function testAssets() {
+		// Register CMB-Scripts as this is a dependency.
+		wp_enqueue_script( 'cmb-scripts', trailingslashit( CMB_URL ) . 'js/cmb.js', array( 'jquery' ) );
+
+		$this->instance->enqueue_scripts();
+
+		$scripts_output = get_echo( 'wp_print_scripts' );
+
+		// Scripts
+		$this->assertContains( CMB_URL . '/js/cmb.js', $scripts_output );
+		$this->assertContains( CMB_URL . '/js/jquery.timePicker.min.js', $scripts_output );
+		$this->assertContains( CMB_URL . '/js/field.datetime.js', $scripts_output );
+	}
+}
diff --git a/tests/fields/testTitleCodeField.php b/tests/fields/testTitleCodeField.php
new file mode 100644
index 00000000..61ba898d
--- /dev/null
+++ b/tests/fields/testTitleCodeField.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace HMCMB\Tests;
+
+use CMB_Title;
+
+/**
+ * Class TitleFieldTestCase
+ *
+ * @group fields
+ */
+class TitleFieldTestCase extends TestFieldCase {
+	public function setUp() {
+		parent::setUp();
+
+		$this->instance = new CMB_Title( 'field', 'Field', [] );
+	}
+}
diff --git a/tests/fields/testURLCodeField.php b/tests/fields/testURLCodeField.php
new file mode 100644
index 00000000..611b0c5a
--- /dev/null
+++ b/tests/fields/testURLCodeField.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace HMCMB\Tests;
+
+use CMB_URL_Field;
+
+/**
+ * Class URLFieldTestCase
+ *
+ * @group fields
+ */
+class URLFieldTestCase extends TestFieldCase {
+	public function setUp() {
+		parent::setUp();
+
+		$this->instance = new CMB_URL_Field( 'field', 'Field', [] );
+	}
+}
diff --git a/tests/fields/testWYSIWYGCodeField.php b/tests/fields/testWYSIWYGCodeField.php
new file mode 100644
index 00000000..5f4dfc2e
--- /dev/null
+++ b/tests/fields/testWYSIWYGCodeField.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace HMCMB\Tests;
+
+use CMB_wysiwyg;
+
+/**
+ * Class WYSIWYGFieldTestCase
+ *
+ * @group fields
+ */
+class WYSIWYGFieldTestCase extends TestFieldCase {
+	public function setUp() {
+		parent::setUp();
+
+		$this->instance = new CMB_wysiwyg( 'field', 'Field', [] );
+	}
+}

From cf0f02803eecbf053e8feeb2f872563ea54f5389 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Thu, 30 Nov 2017 13:31:45 -0800
Subject: [PATCH 119/148] Move cmbMetaBox tests back to main folder

---
 tests/{fields => }/testCmbMetaBoxClass.php | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename tests/{fields => }/testCmbMetaBoxClass.php (100%)

diff --git a/tests/fields/testCmbMetaBoxClass.php b/tests/testCmbMetaBoxClass.php
similarity index 100%
rename from tests/fields/testCmbMetaBoxClass.php
rename to tests/testCmbMetaBoxClass.php

From a263aeb54768ce79d4a27cee3ed9837f0a098e4f Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Thu, 30 Nov 2017 13:39:19 -0800
Subject: [PATCH 120/148] Extending TestFieldCase in email field tests

---
 tests/fields/testEmailField.php | 38 +++++++++++++--------------------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/tests/fields/testEmailField.php b/tests/fields/testEmailField.php
index 7f92be47..e4bf2689 100644
--- a/tests/fields/testEmailField.php
+++ b/tests/fields/testEmailField.php
@@ -6,48 +6,40 @@
  * @subpackage Custom Meta Boxes
  */
 
-class EmailFieldTestCase extends WP_UnitTestCase {
+namespace HMCMB\Tests;
 
-	function setUp() {
-		parent::setUp();
-
-		$args = array(
-			'post_author'  => 1,
-			'post_status'  => 'publish',
-			'post_content' => rand_str(),
-			'post_title'   => rand_str(),
-			'post_type'    => 'post',
-		);
+use CMB_Email_Field;
 
-		$id = wp_insert_post( $args );
-
-		$this->post = get_post( $id );
-	}
+/**
+ * Class EmailFieldTestCase
+ *
+ * @group fields
+ */
+class EmailFieldTestCase extends TestFieldCase {
+	public function setUp() {
+		parent::setUp();
 
-	function tearDown() {
-		wp_delete_post( $this->post->ID, true );
-		unset( $this->post );
-		parent::tearDown();
+		$this->instance = new CMB_Email_Field( 'field', 'Field', [] );
 	}
 
 	function testSaveValue() {
 		$value = array( 'hm@hmn.md' );
 		$field = new CMB_Email_Field( 'foo', 'Foo', $value );
 
-		if ( ! $this->post ) {
+		if ( ! self::$post ) {
 			$this->markTestSkipped( 'Post not found' );
 		}
 
-		$field->save( $this->post->ID, $value );
+		$field->save( self::$post->ID, $value );
 
 		// Verify single value is properly saved.
-		$this->assertEquals( get_post_meta( $this->post->ID, 'foo', false ), $value );
+		$this->assertEquals( get_post_meta( self::$post->ID, 'foo', false ), $value );
 	}
 
 	function testFieldOutput() {
 		$field        = new CMB_Email_Field( 'foo', 'Foo', array( 'hm@hmn.md' ) );
 
-		if ( ! $this->post ) {
+		if ( ! self::$post ) {
 			$this->markTestSkipped( 'Post not found' );
 		}
 

From 8784b4ab5c79638aafaa1968ae6c96358db34f52 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Thu, 30 Nov 2017 13:41:27 -0800
Subject: [PATCH 121/148] Extending TestFieldCase in group field tests

---
 tests/fields/testGroupField.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/tests/fields/testGroupField.php b/tests/fields/testGroupField.php
index 58cfecb6..edf04207 100644
--- a/tests/fields/testGroupField.php
+++ b/tests/fields/testGroupField.php
@@ -1,6 +1,21 @@
 <?php
 
-class GroupFieldTestCase extends WP_UnitTestCase {
+namespace HMCMB\Tests;
+
+use CMB_Group_Field;
+use CMB_Text_Field;
+
+/**
+ * Class GroupFieldTestCase
+ *
+ * @group fields
+ */
+class GroupFieldTestCase extends TestFieldCase {
+	public function setUp() {
+		parent::setUp();
+
+		$this->instance = new CMB_Group_Field( 'field', 'Field', [] );
+	}
 
 	function testAddField() {
 

From 64a3b8510f323a53a26270fff0c179d77beb34b6 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Thu, 30 Nov 2017 13:42:58 -0800
Subject: [PATCH 122/148] Extending TestFieldCase in hidden field tests

---
 tests/fields/testHiddenField.php | 40 +++++++++++++-------------------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/tests/fields/testHiddenField.php b/tests/fields/testHiddenField.php
index 0bce3782..e8d8cebf 100644
--- a/tests/fields/testHiddenField.php
+++ b/tests/fields/testHiddenField.php
@@ -1,47 +1,39 @@
 <?php
 
-class HiddenFieldTestCase extends WP_UnitTestCase {
+namespace HMCMB\Tests;
 
-	function setUp() {
-		parent::setUp();
-
-		$args = array(
-			'post_author'  => 1,
-			'post_status'  => 'publish',
-			'post_content' => rand_str(),
-			'post_title'   => rand_str(),
-			'post_type'    => 'post',
-		);
-
-		$id = wp_insert_post( $args );
+use CMB_Hidden_Field;
 
-		$this->post = get_post( $id );
-	}
+/**
+ * Class HiddenFieldTestCase
+ *
+ * @group fields
+ */
+class HiddenFieldTestCase extends TestFieldCase {
+	public function setUp() {
+		parent::setUp();
 
-	function tearDown() {
-		wp_delete_post( $this->post->ID, true );
-		unset( $this->post );
-		parent::tearDown();
+		$this->instance = new CMB_Hidden_Field( 'field', 'Field', [] );
 	}
 
 	function testSaveValue() {
 		$value = array( 'value' );
 		$field = new CMB_Hidden_Field( 'foo', 'Foo', $value );
 
-		if ( ! $this->post ) {
+		if ( ! self::$post ) {
 			$this->markTestSkipped( 'Post not found' );
 		}
 
-		$field->save( $this->post->ID, $value );
+		$field->save( self::$post->ID, $value );
 
 		// Verify single value is properly saved.
-		$this->assertEquals( get_post_meta( $this->post->ID, 'foo', false ), $value );
+		$this->assertEquals( get_post_meta( self::$post->ID, 'foo', false ), $value );
 	}
 
 	function testFieldOutput() {
-		$field        = new CMB_Hidden_Field( 'foo', 'Foo', array( 'value' ) );
+		$field = new CMB_Hidden_Field( 'foo', 'Foo', array( 'value' ) );
 
-		if ( ! $this->post ) {
+		if ( ! self::$post ) {
 			$this->markTestSkipped( 'Post not found' );
 		}
 

From e668228faa4c548ec7d54c9a3506a49a021697be Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Thu, 30 Nov 2017 13:44:32 -0800
Subject: [PATCH 123/148] Extending TestFieldCase in number field tests

---
 tests/fields/testNumberField.php | 40 +++++++++++++-------------------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/tests/fields/testNumberField.php b/tests/fields/testNumberField.php
index 8dda7ff7..c36f7212 100644
--- a/tests/fields/testNumberField.php
+++ b/tests/fields/testNumberField.php
@@ -6,48 +6,40 @@
  * @subpackage Custom Meta Boxes
  */
 
-class NumberFieldTestCase extends WP_UnitTestCase {
+namespace HMCMB\Tests;
 
-	function setUp() {
-		parent::setUp();
-
-		$args = array(
-			'post_author'  => 1,
-			'post_status'  => 'publish',
-			'post_content' => rand_str(),
-			'post_title'   => rand_str(),
-			'post_type'    => 'post',
-		);
+use CMB_Number_Field;
 
-		$id = wp_insert_post( $args );
-
-		$this->post = get_post( $id );
-	}
+/**
+ * Class NumberFieldTestCase
+ *
+ * @group fields
+ */
+class NumberFieldTestCase extends TestFieldCase {
+	public function setUp() {
+		parent::setUp();
 
-	function tearDown() {
-		wp_delete_post( $this->post->ID, true );
-		unset( $this->post );
-		parent::tearDown();
+		$this->instance = new CMB_Number_Field( 'field', 'Field', [] );
 	}
 
 	function testSaveValue() {
 		$value = array( 0.5 );
 		$field = new CMB_Number_Field( 'foo', 'Foo', $value, array( 'min' => 0, 'max' => 1 ) );
 
-		if ( ! $this->post ) {
+		if ( ! self::$post ) {
 			$this->markTestSkipped( 'Post not found' );
 		}
 
-		$field->save( $this->post->ID, $value );
+		$field->save( self::$post->ID, $value );
 
 		// Verify single value is properly saved.
-		$this->assertEquals( get_post_meta( $this->post->ID, 'foo', false ), $value );
+		$this->assertEquals( get_post_meta( self::$post->ID, 'foo', false ), $value );
 	}
 
 	function testFieldOutput() {
-		$field        = new CMB_Number_Field( 'foo', 'Foo', array( 0.5 ), array( 'min' => 0.4, 'max' => 1 ) );
+		$field = new CMB_Number_Field( 'foo', 'Foo', array( 0.5 ), array( 'min' => 0.4, 'max' => 1 ) );
 
-		if ( ! $this->post ) {
+		if ( ! self::$post ) {
 			$this->markTestSkipped( 'Post not found' );
 		}
 

From dba5bf640f2e7bfd643393469a430b651f9963c6 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Thu, 30 Nov 2017 13:50:06 -0800
Subject: [PATCH 124/148] Fixed Date test errors

---
 tests/class-test-field-case.php             | 21 +++++++++++++++++++++
 tests/fields/testDateField.php              | 12 ++----------
 tests/fields/testDateTimeTimestampField.php |  2 ++
 tests/fields/testDateTimestampField.php     |  2 ++
 tests/fields/testTimeField.php              |  2 ++
 5 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/tests/class-test-field-case.php b/tests/class-test-field-case.php
index bee877be..7f61beca 100644
--- a/tests/class-test-field-case.php
+++ b/tests/class-test-field-case.php
@@ -10,6 +10,7 @@
 
 use WP_UnitTest_Factory;
 use WP_UnitTestCase;
+use WP_Scripts;
 
 /**
  * Class TestFieldCase
@@ -27,12 +28,20 @@ abstract class TestFieldCase extends WP_UnitTestCase {
 	 */
 	protected $instance;
 
+	/**
+	 * Store a reference to global scripts to reset after tests are complete.
+	 *
+	 * @var
+	 */
+	private static $old_wp_scripts;
+
 	/**
 	 * Setup objects for our tests.
 	 *
 	 * @param $factory
 	 */
 	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+		// Setup a default post for usage within test.
 		self::$post = $factory->post->create_and_get( [
 			'post_author'  => 1,
 			'post_status'  => 'publish',
@@ -40,10 +49,14 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 			'post_title'   => rand_str(),
 			'post_type'    => 'post',
 		] );
+
+		// Capture WP Scripts object before usage.
+		self::$old_wp_scripts = isset( $GLOBALS['wp_scripts'] ) ? $GLOBALS['wp_scripts'] : null;
 	}
 
 	public static function wpTearDownAfterClass() {
 		wp_delete_post( self::$post->ID );
+		$GLOBALS['wp_scripts'] = self::$old_wp_scripts;
 	}
 
 	/**
@@ -55,6 +68,14 @@ public function update_arguments( $new_arguments ) {
 		$this->instance->set_arguments( $new_arguments );
 	}
 
+	/**
+	 * Reset the wp_script globals
+	 */
+	public function reset_wp_scripts() {
+		$GLOBALS['wp_scripts'] = new WP_Scripts();
+		$GLOBALS['wp_scripts']->default_version = get_bloginfo( 'version' );
+	}
+
 	/**
 	 * Verify that the field outputs with no errors for each argument set.
 	 *
diff --git a/tests/fields/testDateField.php b/tests/fields/testDateField.php
index 4ba60be6..eab73e5f 100644
--- a/tests/fields/testDateField.php
+++ b/tests/fields/testDateField.php
@@ -3,7 +3,6 @@
 namespace HMCMB\Tests;
 
 use CMB_Date_Field;
-use WP_Scripts;
 
 /**
  * Class DateFieldsAssetsTestCase
@@ -15,15 +14,6 @@ function setUp() {
 		parent::setUp();
 
 		$this->instance = new CMB_Date_Field( 'field', 'Field', [] );;
-
-		$this->old_wp_scripts = isset( $GLOBALS['wp_scripts'] ) ? $GLOBALS['wp_scripts'] : null;
-		$GLOBALS['wp_scripts'] = new WP_Scripts();
-		$GLOBALS['wp_scripts']->default_version = get_bloginfo( 'version' );
-	}
-
-	function tearDown() {
-		$GLOBALS['wp_scripts'] = $this->old_wp_scripts;
-		parent::tearDown();
 	}
 
 	/**
@@ -32,6 +22,8 @@ function tearDown() {
 	function testAssets() {
 		global $wp_version;
 
+		$this->reset_wp_scripts();
+
 		// Register CMB-Scripts as this is a dependency.
 		wp_register_script( 'cmb-scripts', trailingslashit( CMB_URL ) . 'js/cmb.js', array( 'jquery' ) );
 
diff --git a/tests/fields/testDateTimeTimestampField.php b/tests/fields/testDateTimeTimestampField.php
index 016469dd..164e1634 100644
--- a/tests/fields/testDateTimeTimestampField.php
+++ b/tests/fields/testDateTimeTimestampField.php
@@ -17,6 +17,8 @@ public function setUp() {
 	}
 
 	function testAssets() {
+		$this->reset_wp_scripts();
+
 		// Register CMB-Scripts as this is a dependency.
 		wp_enqueue_script( 'cmb-scripts', trailingslashit( CMB_URL ) . 'js/cmb.js', array( 'jquery' ) );
 
diff --git a/tests/fields/testDateTimestampField.php b/tests/fields/testDateTimestampField.php
index 25ebb462..85845865 100644
--- a/tests/fields/testDateTimestampField.php
+++ b/tests/fields/testDateTimestampField.php
@@ -17,6 +17,8 @@ public function setUp() {
 	}
 
 	function testAssets() {
+		$this->reset_wp_scripts();
+
 		// Register CMB-Scripts as this is a dependency.
 		wp_enqueue_script( 'cmb-scripts', trailingslashit( CMB_URL ) . 'js/cmb.js', array( 'jquery' ) );
 
diff --git a/tests/fields/testTimeField.php b/tests/fields/testTimeField.php
index 46a55682..f3af2634 100644
--- a/tests/fields/testTimeField.php
+++ b/tests/fields/testTimeField.php
@@ -17,6 +17,8 @@ public function setUp() {
 	}
 
 	function testAssets() {
+		$this->reset_wp_scripts();
+
 		// Register CMB-Scripts as this is a dependency.
 		wp_enqueue_script( 'cmb-scripts', trailingslashit( CMB_URL ) . 'js/cmb.js', array( 'jquery' ) );
 

From da6bbf1076cbd37ba53dfd1350bacb9941358314 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Thu, 30 Nov 2017 14:20:04 -0800
Subject: [PATCH 125/148] Updated all extra field argument sets

---
 tests/fields/testCheckboxMultiField.php |  4 ++-
 tests/fields/testGmapField.php          | 17 +++++++++++++
 tests/fields/testGroupField.php         | 34 ++++++++++++++++++-------
 tests/fields/testImageField.php         | 19 ++++++++++++++
 tests/fields/testPostSelectField.php    | 26 +++++++++++++++++++
 tests/fields/testRadioField.php         | 15 +++++++++++
 tests/fields/testSelectField.php        | 23 +++++++++++++++++
 tests/fields/testTaxonomyField.php      | 27 ++++++++++++++++++++
 tests/fields/testWYSIWYGCodeField.php   | 15 +++++++++++
 9 files changed, 170 insertions(+), 10 deletions(-)

diff --git a/tests/fields/testCheckboxMultiField.php b/tests/fields/testCheckboxMultiField.php
index bccd8260..da6548b4 100644
--- a/tests/fields/testCheckboxMultiField.php
+++ b/tests/fields/testCheckboxMultiField.php
@@ -65,7 +65,9 @@ public function testSavedFieldOutput() {
 	 */
 	public function argumentsProvider() {
 		$args = [
-			'options' => [ 'Option 1', 'Option 2', 'Option 3' ],
+			[
+				'options' => [ 'Option 1', 'Option 2', 'Option 3' ],
+			]
 		];
 
 		return array_merge( $args, parent::argumentsProvider() );
diff --git a/tests/fields/testGmapField.php b/tests/fields/testGmapField.php
index ab59cc24..d00f7b6f 100644
--- a/tests/fields/testGmapField.php
+++ b/tests/fields/testGmapField.php
@@ -15,4 +15,21 @@ public function setUp() {
 
 		$this->instance = new CMB_Gmap_Field( 'field', 'Field', [] );
 	}
+
+	/**
+	 * Update our default argument set with specific args.
+	 *
+	 * @return array
+	 */
+	public function argumentsProvider() {
+		$args = [
+			[
+				'google_api_key' => 'abcdefghijk',
+				'default_lat'    => '1.234',
+				'default_long'   => '1.234',
+			]
+		];
+
+		return array_merge( $args, parent::argumentsProvider() );
+	}
 }
diff --git a/tests/fields/testGroupField.php b/tests/fields/testGroupField.php
index edf04207..5d628dd9 100644
--- a/tests/fields/testGroupField.php
+++ b/tests/fields/testGroupField.php
@@ -18,7 +18,6 @@ public function setUp() {
 	}
 
 	function testAddField() {
-
 		$group  = new CMB_Group_Field( 'group', 'Group Title', array() );
 		$field1 = new CMB_Text_Field( 'foo', 'Title', array( 1 ) );
 		$field2 = new CMB_Text_Field( 'bar', 'Title', array( 2, 3 ), array( 'repeatable' => true ) );
@@ -28,11 +27,9 @@ function testAddField() {
 
 		$this->assertArrayHasKey( 'foo', $group->get_fields() );
 		$this->assertArrayHasKey( 'bar', $group->get_fields() );
-
 	}
 
 	function testGetValues() {
-
 		$group  = new CMB_Group_Field( 'group', 'Group Title', array() );
 		$field1 = new CMB_Text_Field( 'foo', 'Title', array() );
 		$field2 = new CMB_Text_Field( 'bar', 'Title', array() );
@@ -48,11 +45,9 @@ function testGetValues() {
 		);
 
 		$this->assertEquals( $group->get_values(), $values );
-
 	}
 
 	function testParseSaveValues() {
-
 		$group  = new CMB_Group_Field( 'group', 'Group Title', array() );
 		$field1 = new CMB_Text_Field( 'foo', 'Title', array( 1 ) );
 		$field2 = new CMB_Text_Field( 'bar', 'Title', array( 2, 3 ), array( 'repeatable' => true ) );
@@ -77,11 +72,9 @@ function testParseSaveValues() {
 		$group->parse_save_values();
 
 		$this->assertEquals( $group->get_values(), $expected );
-
 	}
 
 	function testFieldNameAttrValue() {
-
 		$group  = new CMB_Group_Field( 'group', 'Group Title', array() );
 		$field1 = new CMB_Text_Field( 'foo', 'Title', array( 1, 2 ) );
 
@@ -113,11 +106,9 @@ function testFieldNameAttrValue() {
 		$id_attr = $field1->get_the_name_attr();
 		$this->assertEquals( $id_attr, 'group[cmb-group-12][foo][cmb-field-0]' );
 		$group->field_index = 0; // Unset
-
 	}
 
 	function testFieldIdAttrValue() {
-
 		$group  = new CMB_Group_Field( 'group', 'Group Title', array() );
 		$field1 = new CMB_Text_Field( 'foo', 'Title', array( 1, 2 ) );
 
@@ -149,6 +140,31 @@ function testFieldIdAttrValue() {
 		$id_attr = $field1->get_the_id_attr();
 		$this->assertEquals( $id_attr, 'group-cmb-group-12-foo-cmb-field-0' );
 		$group->field_index = 0; // Unset
+	}
 
+	/**
+	 * Update our default argument set with specific args.
+	 *
+	 * @return array
+	 */
+	public function argumentsProvider() {
+		$args = [
+			[
+				'fields' => [
+					[
+						'id' => 'gac-4-f-1',
+						'name' => 'Text input field',
+						'type' => 'text',
+					],
+					[
+						'id' => 'gac-4-f-2',
+						'name' => 'Text input field',
+						'type' => 'text',
+					],
+				],
+			]
+		];
+
+		return array_merge( $args, parent::argumentsProvider() );
 	}
 }
diff --git a/tests/fields/testImageField.php b/tests/fields/testImageField.php
index 372af0ad..be74bc59 100644
--- a/tests/fields/testImageField.php
+++ b/tests/fields/testImageField.php
@@ -15,4 +15,23 @@ public function setUp() {
 
 		$this->instance = new CMB_Image_Field( 'field', 'Field', [] );
 	}
+
+	/**
+	 * Update our default argument set with specific args.
+	 *
+	 * @return array
+	 */
+	public function argumentsProvider() {
+		$args = [
+			[
+				'size' => 175,
+			],
+			[
+				'size'      => 175,
+				'show_size' => true,
+			],
+		];
+
+		return array_merge( $args, parent::argumentsProvider() );
+	}
 }
diff --git a/tests/fields/testPostSelectField.php b/tests/fields/testPostSelectField.php
index f2a41b21..7110deca 100644
--- a/tests/fields/testPostSelectField.php
+++ b/tests/fields/testPostSelectField.php
@@ -15,4 +15,30 @@ public function setUp() {
 
 		$this->instance = new CMB_Post_Select( 'field', 'Field', [] );
 	}
+
+	/**
+	 * Update our default argument set with specific args.
+	 *
+	 * @return array
+	 */
+	public function argumentsProvider() {
+		$args = [
+			[
+				'use_ajax' => true,
+			],
+			[
+				'use_ajax' => true,
+				'multiple' => true,
+			],
+			[
+				'use_ajax' => true,
+				'multiple' => true,
+				'query'    => [
+					'posts_per_page' => 20,
+				],
+			]
+		];
+
+		return array_merge( $args, parent::argumentsProvider() );
+	}
 }
diff --git a/tests/fields/testRadioField.php b/tests/fields/testRadioField.php
index 98884bf4..9ceb3c5b 100644
--- a/tests/fields/testRadioField.php
+++ b/tests/fields/testRadioField.php
@@ -15,4 +15,19 @@ public function setUp() {
 
 		$this->instance = new CMB_Radio_Field( 'field', 'Field', [] );
 	}
+
+	/**
+	 * Update our default argument set with specific args.
+	 *
+	 * @return array
+	 */
+	public function argumentsProvider() {
+		$args = [
+			[
+				'options' => [ 'Option 1', 'Option 2', 'Option 3' ],
+			]
+		];
+
+		return array_merge( $args, parent::argumentsProvider() );
+	}
 }
diff --git a/tests/fields/testSelectField.php b/tests/fields/testSelectField.php
index 0c7b1734..a6993322 100644
--- a/tests/fields/testSelectField.php
+++ b/tests/fields/testSelectField.php
@@ -15,4 +15,27 @@ public function setUp() {
 
 		$this->instance = new CMB_Select( 'field', 'Field', [] );
 	}
+
+	/**
+	 * Update our default argument set with specific args.
+	 *
+	 * @return array
+	 */
+	public function argumentsProvider() {
+		$args = [
+			[
+				'options' => [ 'Option 1', 'Option 2', 'Option 3' ],
+				'select2_options' => [ 'an' => 'option' ],
+				'allow_none'      => true,
+				'multiple'        => true,
+			],
+			[
+				'options' => [ 'Option 1', 'Option 2', 'Option 3' ],
+				'allow_none'      => true,
+				'multiple'        => false,
+			]
+		];
+
+		return array_merge( $args, parent::argumentsProvider() );
+	}
 }
diff --git a/tests/fields/testTaxonomyField.php b/tests/fields/testTaxonomyField.php
index 1bd4a0a0..38c1884e 100644
--- a/tests/fields/testTaxonomyField.php
+++ b/tests/fields/testTaxonomyField.php
@@ -15,4 +15,31 @@ public function setUp() {
 
 		$this->instance = new CMB_Taxonomy( 'field', 'Field', [] );
 	}
+
+	/**
+	 * Update our default argument set with specific args.
+	 *
+	 * @return array
+	 */
+	public function argumentsProvider() {
+		$args = [
+			[
+				'taxonomy'   => 'post_tag',
+				'hide_empty' => false,
+				'multiple'   => true,
+			],
+			[
+				'taxonomy'   => 'post_tag',
+				'hide_empty' => true,
+				'multiple'   => true,
+			],
+			[
+				'taxonomy'   => 'post_tag',
+				'hide_empty' => false,
+				'multiple'   => false,
+			],
+		];
+
+		return array_merge( $args, parent::argumentsProvider() );
+	}
 }
diff --git a/tests/fields/testWYSIWYGCodeField.php b/tests/fields/testWYSIWYGCodeField.php
index 5f4dfc2e..930ff32c 100644
--- a/tests/fields/testWYSIWYGCodeField.php
+++ b/tests/fields/testWYSIWYGCodeField.php
@@ -15,4 +15,19 @@ public function setUp() {
 
 		$this->instance = new CMB_wysiwyg( 'field', 'Field', [] );
 	}
+
+	/**
+	 * Update our default argument set with specific args.
+	 *
+	 * @return array
+	 */
+	public function argumentsProvider() {
+		$args = [
+			[
+				'options' => [ 'editor_height' => 500 ],
+			],
+		];
+
+		return array_merge( $args, parent::argumentsProvider() );
+	}
 }

From f1eeea374357d02dbab638c9930f1592038e82cd Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Thu, 30 Nov 2017 14:20:39 -0800
Subject: [PATCH 126/148] Updated deafult arguments set

---
 tests/class-test-field-case.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/tests/class-test-field-case.php b/tests/class-test-field-case.php
index 7f61beca..d70cf8b5 100644
--- a/tests/class-test-field-case.php
+++ b/tests/class-test-field-case.php
@@ -118,23 +118,29 @@ public function argumentsProvider() {
 				'id'         => 'my-ID',
 				'name'       => 'My Name',
 				'desc'       => 'A long description',
-				'repeatable' => true,
+				'repeatable' => false,
 				'sortable'   => true,
 			],
 			[
 				'id'         => 'my-ID',
 				'name'       => 'My Name',
 				'desc'       => 'A long description',
-				'repeatable' => false,
-				'sortable'   => true,
+				'repeatable' => true,
+				'sortable'   => false,
 			],
 			[
 				'id'         => 'my-ID',
 				'name'       => 'My Name',
 				'desc'       => 'A long description',
 				'repeatable' => true,
-				'sortable'   => false,
+				'sortable'   => true,
+				'cols'       => 6,
+				'readonly'   => true,
+				'disabled'   => true,
+				'class'      => 'my-fancy-fancy-class',
 			],
+
+			// @todo:: add default
 		];
 	}
 }
\ No newline at end of file

From 2dd056ac9a62a7ac5b9d0652629f05c28e9d5c11 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Thu, 30 Nov 2017 08:17:17 -0800
Subject: [PATCH 127/148] Clean up setUp and pass postID in is_displayed tests

---
 tests/testField.php | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/tests/testField.php b/tests/testField.php
index 4b04dd0b..d4f82249 100644
--- a/tests/testField.php
+++ b/tests/testField.php
@@ -7,25 +7,20 @@ class FieldTestCase extends WP_UnitTestCase {
 	private $users = array();
 
 	function setUp() {
-
 		parent::setUp();
 
-		$args = array(
-			'post_author' => 1,
-			'post_status' => 'publish',
-			'post_content' => rand_str(),
-			'post_title' => rand_str(),
-			'post_type' => 'post',
-		);
-
-		$id = wp_insert_post( $args );
-
-		$this->post = get_post( $id );
-
 		// Setup some users to test our display logic.
 		$this->users['admin'] = $this->factory->user->create( array( 'role' => 'administrator' ) );
 		$this->users['author'] = $this->factory->user->create( array( 'role' => 'author' ) );
 
+		// Setup a post for testing is_displayed.
+		$this->post = $this->factory->post->create_and_get( array(
+			'post_author'  => 1,
+			'post_status'  => 'publish',
+			'post_content' => rand_str(),
+			'post_title'   => rand_str(),
+			'post_type'    => 'post',
+		) );
 	}
 
 	function tearDown() {
@@ -236,17 +231,17 @@ function testIsDisplayed() {
 		wp_set_current_user( $this->users['admin'] );
 
 		// Test default value against default admin.
-		$this->assertTrue( $field->is_displayed() );
+		$this->assertTrue( $field->is_displayed( $this->post->ID ) );
 
 		// Re-setup the field with some capability logic in there.
 		$field = new CMB_Text_Field( 'foo', 'Title', array( 1 ), array( 'capability' => 'edit_others_posts' ) );
 
 		// Should still return true for admin.
-		$this->assertTrue( $field->is_displayed() );
+		$this->assertTrue( $field->is_displayed( $this->post->ID ) );
 
 		// Change to the author and test against our modified permission.
 		wp_set_current_user( $this->users['author'] );
 
-		$this->assertFalse( $field->is_displayed() );
+		$this->assertFalse( $field->is_displayed( $this->post->ID ) );
 	}
 }

From 67a701b0b31f7bb4c55a39ba98f0f3ae06430efe Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Sat, 2 Dec 2017 17:22:26 -0600
Subject: [PATCH 128/148] Cast the checkbox multi default value to an array

---
 fields/class-cmb-checkbox-multi.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fields/class-cmb-checkbox-multi.php b/fields/class-cmb-checkbox-multi.php
index 1769bfa8..0b8ac2a4 100644
--- a/fields/class-cmb-checkbox-multi.php
+++ b/fields/class-cmb-checkbox-multi.php
@@ -117,6 +117,6 @@ public function &get_values() {
 			return $this->values;
 		}
 
-		return array_flip( $this->args['default'] );
+		return array_flip( (array) $this->args['default'] );
 	}
 }

From 3685f76029fc326708ae649b80055920ce990082 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Thu, 30 Nov 2017 08:17:17 -0800
Subject: [PATCH 129/148] Clean up setUp and pass postID in is_displayed tests

---
 tests/testField.php | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/tests/testField.php b/tests/testField.php
index 4b04dd0b..d4f82249 100644
--- a/tests/testField.php
+++ b/tests/testField.php
@@ -7,25 +7,20 @@ class FieldTestCase extends WP_UnitTestCase {
 	private $users = array();
 
 	function setUp() {
-
 		parent::setUp();
 
-		$args = array(
-			'post_author' => 1,
-			'post_status' => 'publish',
-			'post_content' => rand_str(),
-			'post_title' => rand_str(),
-			'post_type' => 'post',
-		);
-
-		$id = wp_insert_post( $args );
-
-		$this->post = get_post( $id );
-
 		// Setup some users to test our display logic.
 		$this->users['admin'] = $this->factory->user->create( array( 'role' => 'administrator' ) );
 		$this->users['author'] = $this->factory->user->create( array( 'role' => 'author' ) );
 
+		// Setup a post for testing is_displayed.
+		$this->post = $this->factory->post->create_and_get( array(
+			'post_author'  => 1,
+			'post_status'  => 'publish',
+			'post_content' => rand_str(),
+			'post_title'   => rand_str(),
+			'post_type'    => 'post',
+		) );
 	}
 
 	function tearDown() {
@@ -236,17 +231,17 @@ function testIsDisplayed() {
 		wp_set_current_user( $this->users['admin'] );
 
 		// Test default value against default admin.
-		$this->assertTrue( $field->is_displayed() );
+		$this->assertTrue( $field->is_displayed( $this->post->ID ) );
 
 		// Re-setup the field with some capability logic in there.
 		$field = new CMB_Text_Field( 'foo', 'Title', array( 1 ), array( 'capability' => 'edit_others_posts' ) );
 
 		// Should still return true for admin.
-		$this->assertTrue( $field->is_displayed() );
+		$this->assertTrue( $field->is_displayed( $this->post->ID ) );
 
 		// Change to the author and test against our modified permission.
 		wp_set_current_user( $this->users['author'] );
 
-		$this->assertFalse( $field->is_displayed() );
+		$this->assertFalse( $field->is_displayed( $this->post->ID ) );
 	}
 }

From 244c9fdcccee05de51fb42b8963be850c22cbf1b Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Sat, 2 Dec 2017 17:55:53 -0600
Subject: [PATCH 130/148] Remove unnecessary reference passing in group field
 for saving data

---
 fields/class-cmb-group-field.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/fields/class-cmb-group-field.php b/fields/class-cmb-group-field.php
index 620eddd4..eab9c712 100644
--- a/fields/class-cmb-group-field.php
+++ b/fields/class-cmb-group-field.php
@@ -163,7 +163,7 @@ public function display() {
 	 */
 	public function html() {
 
-		$fields = &$this->get_fields();
+		$fields = $this->get_fields();
 		$value  = $this->get_value();
 
 		// Reset all field values.
@@ -199,8 +199,8 @@ public function html() {
 	 */
 	public function parse_save_values() {
 
-		$fields = &$this->get_fields();
-		$values = &$this->get_values();
+		$fields = $this->get_fields();
+		$values = $this->get_values();
 
 		foreach ( $values as &$group_value ) {
 			foreach ( $group_value as $field_id => &$field_value ) {
@@ -224,6 +224,7 @@ public function parse_save_values() {
 			}
 		}
 
+		$this->set_values( $values );
 	}
 
 	/**
@@ -241,7 +242,7 @@ public function add_field( CMB_Field $field ) {
 	 *
 	 * @return array
 	 */
-	public function &get_fields() {
+	public function get_fields() {
 		return $this->fields;
 	}
 
@@ -252,7 +253,7 @@ public function &get_fields() {
 	 */
 	public function set_values( array $values ) {
 
-		$fields       = &$this->get_fields();
+		$fields       = $this->get_fields();
 		$this->values = $values;
 
 		// Reset all field values.

From 321ca5ed1e8b8441b32d06fe417de11c9b6058c5 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Sun, 3 Dec 2017 10:48:01 -0600
Subject: [PATCH 131/148] Passing class name to all class instantiations as the
 ID for easier general testing

---
 tests/fields/testCheckboxField.php          | 2 +-
 tests/fields/testCheckboxMultiField.php     | 2 +-
 tests/fields/testColorField.php             | 2 +-
 tests/fields/testDateField.php              | 2 +-
 tests/fields/testDateTimeTimestampField.php | 2 +-
 tests/fields/testDateTimestampField.php     | 2 +-
 tests/fields/testEmailField.php             | 2 +-
 tests/fields/testGmapField.php              | 2 +-
 tests/fields/testGroupField.php             | 2 +-
 tests/fields/testHiddenField.php            | 2 +-
 tests/fields/testImageField.php             | 2 +-
 tests/fields/testNumberField.php            | 2 +-
 tests/fields/testPostSelectField.php        | 2 +-
 tests/fields/testRadioField.php             | 2 +-
 tests/fields/testSelectField.php            | 2 +-
 tests/fields/testTaxonomyField.php          | 2 +-
 tests/fields/testTextField.php              | 2 +-
 tests/fields/testTextSmallField.php         | 2 +-
 tests/fields/testTextareaCodeField.php      | 2 +-
 tests/fields/testTextareaField.php          | 2 +-
 tests/fields/testTimeField.php              | 2 +-
 tests/fields/testTitleCodeField.php         | 2 +-
 tests/fields/testURLCodeField.php           | 2 +-
 tests/fields/testWYSIWYGCodeField.php       | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/tests/fields/testCheckboxField.php b/tests/fields/testCheckboxField.php
index f38e071f..f513285e 100644
--- a/tests/fields/testCheckboxField.php
+++ b/tests/fields/testCheckboxField.php
@@ -13,6 +13,6 @@ class CheckboxFieldTestCase extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->instance = new CMB_Checkbox( 'field', 'Field', [] );
+		$this->instance = new CMB_Checkbox( 'CMB_Checkbox', 'Field', [] );
 	}
 }
diff --git a/tests/fields/testCheckboxMultiField.php b/tests/fields/testCheckboxMultiField.php
index da6548b4..ee2e6794 100644
--- a/tests/fields/testCheckboxMultiField.php
+++ b/tests/fields/testCheckboxMultiField.php
@@ -13,7 +13,7 @@ class CheckboxMultiFieldTestCase extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->instance = new CMB_Checkbox_Multi( 'field', 'Field', [] );;
+		$this->instance = new CMB_Checkbox_Multi( 'CMB_Checkbox_Multi', 'Field', [] );;
 	}
 
 	public function testSaveValue() {
diff --git a/tests/fields/testColorField.php b/tests/fields/testColorField.php
index 76166956..26428a58 100644
--- a/tests/fields/testColorField.php
+++ b/tests/fields/testColorField.php
@@ -13,6 +13,6 @@ class ColorFieldTestCase extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->instance = new CMB_Color_Picker( 'field', 'Field', [] );
+		$this->instance = new CMB_Color_Picker( 'CMB_Color_Picker', 'Field', [] );
 	}
 }
diff --git a/tests/fields/testDateField.php b/tests/fields/testDateField.php
index eab73e5f..961a7587 100644
--- a/tests/fields/testDateField.php
+++ b/tests/fields/testDateField.php
@@ -13,7 +13,7 @@ class DateFieldsAssetsTestCase extends TestFieldCase {
 	function setUp() {
 		parent::setUp();
 
-		$this->instance = new CMB_Date_Field( 'field', 'Field', [] );;
+		$this->instance = new CMB_Date_Field( 'CMB_Date_Field', 'Field', [] );;
 	}
 
 	/**
diff --git a/tests/fields/testDateTimeTimestampField.php b/tests/fields/testDateTimeTimestampField.php
index 164e1634..5ab794d2 100644
--- a/tests/fields/testDateTimeTimestampField.php
+++ b/tests/fields/testDateTimeTimestampField.php
@@ -13,7 +13,7 @@ class DateTimeTimestampFieldTestCase extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->instance = new CMB_Datetime_Timestamp_Field( 'field', 'Field', [] );
+		$this->instance = new CMB_Datetime_Timestamp_Field( 'CMB_Datetime_Timestamp_Field', 'Field', [] );
 	}
 
 	function testAssets() {
diff --git a/tests/fields/testDateTimestampField.php b/tests/fields/testDateTimestampField.php
index 85845865..862c1c96 100644
--- a/tests/fields/testDateTimestampField.php
+++ b/tests/fields/testDateTimestampField.php
@@ -13,7 +13,7 @@ class DateTimestampFieldTestCase extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->instance = new CMB_Date_Timestamp_Field( 'field', 'Field', [] );
+		$this->instance = new CMB_Date_Timestamp_Field( 'CMB_Date_Timestamp_Field', 'Field', [] );
 	}
 
 	function testAssets() {
diff --git a/tests/fields/testEmailField.php b/tests/fields/testEmailField.php
index e4bf2689..d4c5b8b2 100644
--- a/tests/fields/testEmailField.php
+++ b/tests/fields/testEmailField.php
@@ -19,7 +19,7 @@ class EmailFieldTestCase extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->instance = new CMB_Email_Field( 'field', 'Field', [] );
+		$this->instance = new CMB_Email_Field( 'CMB_Email_Field', 'Field', [] );
 	}
 
 	function testSaveValue() {
diff --git a/tests/fields/testGmapField.php b/tests/fields/testGmapField.php
index d00f7b6f..bde3f022 100644
--- a/tests/fields/testGmapField.php
+++ b/tests/fields/testGmapField.php
@@ -13,7 +13,7 @@ class GmapFieldTestCase extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->instance = new CMB_Gmap_Field( 'field', 'Field', [] );
+		$this->instance = new CMB_Gmap_Field( 'CMB_Gmap_Field', 'Field', [] );
 	}
 
 	/**
diff --git a/tests/fields/testGroupField.php b/tests/fields/testGroupField.php
index 5d628dd9..03d63342 100644
--- a/tests/fields/testGroupField.php
+++ b/tests/fields/testGroupField.php
@@ -14,7 +14,7 @@ class GroupFieldTestCase extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->instance = new CMB_Group_Field( 'field', 'Field', [] );
+		$this->instance = new CMB_Group_Field( 'CMB_Group_Field', 'Field', [] );
 	}
 
 	function testAddField() {
diff --git a/tests/fields/testHiddenField.php b/tests/fields/testHiddenField.php
index e8d8cebf..bcf8586c 100644
--- a/tests/fields/testHiddenField.php
+++ b/tests/fields/testHiddenField.php
@@ -13,7 +13,7 @@ class HiddenFieldTestCase extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->instance = new CMB_Hidden_Field( 'field', 'Field', [] );
+		$this->instance = new CMB_Hidden_Field( 'CMB_Hidden_Field', 'Field', [] );
 	}
 
 	function testSaveValue() {
diff --git a/tests/fields/testImageField.php b/tests/fields/testImageField.php
index be74bc59..3f669da3 100644
--- a/tests/fields/testImageField.php
+++ b/tests/fields/testImageField.php
@@ -13,7 +13,7 @@ class ImageFieldTestCase extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->instance = new CMB_Image_Field( 'field', 'Field', [] );
+		$this->instance = new CMB_Image_Field( 'CMB_Image_Field', 'Field', [] );
 	}
 
 	/**
diff --git a/tests/fields/testNumberField.php b/tests/fields/testNumberField.php
index c36f7212..77d19204 100644
--- a/tests/fields/testNumberField.php
+++ b/tests/fields/testNumberField.php
@@ -19,7 +19,7 @@ class NumberFieldTestCase extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->instance = new CMB_Number_Field( 'field', 'Field', [] );
+		$this->instance = new CMB_Number_Field( 'CMB_Number_Field', 'Field', [] );
 	}
 
 	function testSaveValue() {
diff --git a/tests/fields/testPostSelectField.php b/tests/fields/testPostSelectField.php
index 7110deca..5f8f853c 100644
--- a/tests/fields/testPostSelectField.php
+++ b/tests/fields/testPostSelectField.php
@@ -13,7 +13,7 @@ class PostSelectFieldTestCase extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->instance = new CMB_Post_Select( 'field', 'Field', [] );
+		$this->instance = new CMB_Post_Select( 'CMB_Post_Select', 'Field', [] );
 	}
 
 	/**
diff --git a/tests/fields/testRadioField.php b/tests/fields/testRadioField.php
index 9ceb3c5b..c83181ff 100644
--- a/tests/fields/testRadioField.php
+++ b/tests/fields/testRadioField.php
@@ -13,7 +13,7 @@ class RadioFieldTestCase extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->instance = new CMB_Radio_Field( 'field', 'Field', [] );
+		$this->instance = new CMB_Radio_Field( 'CMB_Radio_Field', 'Field', [] );
 	}
 
 	/**
diff --git a/tests/fields/testSelectField.php b/tests/fields/testSelectField.php
index a6993322..ea728721 100644
--- a/tests/fields/testSelectField.php
+++ b/tests/fields/testSelectField.php
@@ -13,7 +13,7 @@ class SelectFieldTestCase extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->instance = new CMB_Select( 'field', 'Field', [] );
+		$this->instance = new CMB_Select( 'CMB_Select', 'Field', [] );
 	}
 
 	/**
diff --git a/tests/fields/testTaxonomyField.php b/tests/fields/testTaxonomyField.php
index 38c1884e..1777f36f 100644
--- a/tests/fields/testTaxonomyField.php
+++ b/tests/fields/testTaxonomyField.php
@@ -13,7 +13,7 @@ class TaxonomyFieldTestCase extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->instance = new CMB_Taxonomy( 'field', 'Field', [] );
+		$this->instance = new CMB_Taxonomy( 'CMB_Taxonomy', 'Field', [] );
 	}
 
 	/**
diff --git a/tests/fields/testTextField.php b/tests/fields/testTextField.php
index fd0343be..2071bce1 100644
--- a/tests/fields/testTextField.php
+++ b/tests/fields/testTextField.php
@@ -13,6 +13,6 @@ class TextFieldTestCase extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->instance = new CMB_Text_Field( 'field', 'Field', [] );
+		$this->instance = new CMB_Text_Field( 'CMB_Text_Field', 'Field', [] );
 	}
 }
diff --git a/tests/fields/testTextSmallField.php b/tests/fields/testTextSmallField.php
index cf939140..ed7e5b3f 100644
--- a/tests/fields/testTextSmallField.php
+++ b/tests/fields/testTextSmallField.php
@@ -13,6 +13,6 @@ class TextSmallFieldTestCase extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->instance = new CMB_Text_Small_Field( 'field', 'Field', [] );
+		$this->instance = new CMB_Text_Small_Field( 'CMB_Text_Small_Field', 'Field', [] );
 	}
 }
diff --git a/tests/fields/testTextareaCodeField.php b/tests/fields/testTextareaCodeField.php
index 886661d5..f5d5a1b2 100644
--- a/tests/fields/testTextareaCodeField.php
+++ b/tests/fields/testTextareaCodeField.php
@@ -13,6 +13,6 @@ class TextareaCodeFieldTestCase extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->instance = new CMB_Textarea_Field_Code( 'field', 'Field', [] );
+		$this->instance = new CMB_Textarea_Field_Code( 'CMB_Textarea_Field_Code', 'Field', [] );
 	}
 }
diff --git a/tests/fields/testTextareaField.php b/tests/fields/testTextareaField.php
index 23d0c037..a454d30b 100644
--- a/tests/fields/testTextareaField.php
+++ b/tests/fields/testTextareaField.php
@@ -13,6 +13,6 @@ class TextareaFieldTestCase extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->instance = new CMB_Textarea_Field( 'field', 'Field', [] );
+		$this->instance = new CMB_Textarea_Field( 'CMB_Textarea_Field', 'Field', [] );
 	}
 }
diff --git a/tests/fields/testTimeField.php b/tests/fields/testTimeField.php
index f3af2634..c36d63d9 100644
--- a/tests/fields/testTimeField.php
+++ b/tests/fields/testTimeField.php
@@ -13,7 +13,7 @@ class TimeTestCase extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->instance = new CMB_Time_Field( 'field', 'Field', [] );
+		$this->instance = new CMB_Time_Field( 'CMB_Time_Field', 'Field', [] );
 	}
 
 	function testAssets() {
diff --git a/tests/fields/testTitleCodeField.php b/tests/fields/testTitleCodeField.php
index 61ba898d..cdfbefdc 100644
--- a/tests/fields/testTitleCodeField.php
+++ b/tests/fields/testTitleCodeField.php
@@ -13,6 +13,6 @@ class TitleFieldTestCase extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->instance = new CMB_Title( 'field', 'Field', [] );
+		$this->instance = new CMB_Title( 'CMB_Title', 'Field', [] );
 	}
 }
diff --git a/tests/fields/testURLCodeField.php b/tests/fields/testURLCodeField.php
index 611b0c5a..5f5bf45f 100644
--- a/tests/fields/testURLCodeField.php
+++ b/tests/fields/testURLCodeField.php
@@ -13,6 +13,6 @@ class URLFieldTestCase extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->instance = new CMB_URL_Field( 'field', 'Field', [] );
+		$this->instance = new CMB_URL_Field( 'CMB_URL_Field', 'Field', [] );
 	}
 }
diff --git a/tests/fields/testWYSIWYGCodeField.php b/tests/fields/testWYSIWYGCodeField.php
index 930ff32c..6265ca31 100644
--- a/tests/fields/testWYSIWYGCodeField.php
+++ b/tests/fields/testWYSIWYGCodeField.php
@@ -13,7 +13,7 @@ class WYSIWYGFieldTestCase extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->instance = new CMB_wysiwyg( 'field', 'Field', [] );
+		$this->instance = new CMB_wysiwyg( 'CMB_wysiwyg', 'Field', [] );
 	}
 
 	/**

From 50a0c6e99ec0e3b9225f4b49d60cfaa9e47efe34 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Sun, 3 Dec 2017 11:22:42 -0600
Subject: [PATCH 132/148] Fixed issues with arguments providor and test

---
 tests/class-test-field-case.php | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/tests/class-test-field-case.php b/tests/class-test-field-case.php
index d70cf8b5..4d75a326 100644
--- a/tests/class-test-field-case.php
+++ b/tests/class-test-field-case.php
@@ -81,11 +81,9 @@ public function reset_wp_scripts() {
 	 *
 	 * @dataProvider argumentsProvider
 	 */
-	public function test_field_output( $arguments = [] ) {
+	public function test_field_output( $arguments ) {
 		$this->update_arguments( $arguments );
 
-		error_log( print_r( $arguments, true ) );
-
 		// Check the default HTML output.
 		// The point of these checks is to ensure that the field doesn't error out with each argument set.
 		$this->expectOutputRegex( '/data-class=\"' . get_class( $this->instance ) . '\"/' );
@@ -101,34 +99,34 @@ public function test_field_output( $arguments = [] ) {
 	 */
 	public function argumentsProvider() {
 		return [
-			[],
-			[
+			[ [] ],
+			[ [
 				'id' => 'my-ID',
-			],
-			[
+			] ],
+			[ [
 				'id'   => 'my-ID',
 				'name' => 'My Name'
-			],
-			[
+			] ],
+			[ [
 				'id'   => 'my-ID',
 				'name' => 'My Name',
 				'desc' => 'A long description',
-			],
-			[
+			] ],
+			[ [
 				'id'         => 'my-ID',
 				'name'       => 'My Name',
 				'desc'       => 'A long description',
 				'repeatable' => false,
 				'sortable'   => true,
-			],
-			[
+			] ],
+			[ [
 				'id'         => 'my-ID',
 				'name'       => 'My Name',
 				'desc'       => 'A long description',
 				'repeatable' => true,
 				'sortable'   => false,
-			],
-			[
+			] ],
+			[ [
 				'id'         => 'my-ID',
 				'name'       => 'My Name',
 				'desc'       => 'A long description',
@@ -138,7 +136,7 @@ public function argumentsProvider() {
 				'readonly'   => true,
 				'disabled'   => true,
 				'class'      => 'my-fancy-fancy-class',
-			],
+			] ],
 
 			// @todo:: add default
 		];

From df0c9c96d0cdf2a8e65e7b741d71bd6769483714 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Sun, 3 Dec 2017 11:23:03 -0600
Subject: [PATCH 133/148] Added basic values providor and test

---
 tests/class-test-field-case.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/tests/class-test-field-case.php b/tests/class-test-field-case.php
index 4d75a326..1f3b2fea 100644
--- a/tests/class-test-field-case.php
+++ b/tests/class-test-field-case.php
@@ -90,6 +90,18 @@ public function test_field_output( $arguments ) {
 		$this->instance->display();
 	}
 
+	/**
+	 * Verify that the field saves values correctly to meta.
+	 *
+	 * @dataProvider valuesProvider
+	 */
+	function test_save_value( $value ) {
+		$this->instance->save( self::$post->ID, $value );
+
+		// Verify single value is properly saved.
+		$this->assertEquals( get_post_meta( self::$post->ID, get_class( $this->instance ), false ), $value );
+	}
+
 	/**
 	 * Provide a set of arguments to test against.
 	 *
@@ -141,4 +153,17 @@ public function argumentsProvider() {
 			// @todo:: add default
 		];
 	}
+
+	/**
+	 * Provide a default set of values to test saving against.
+	 *
+	 * @return array Default values set.
+	 */
+	public function valuesProvider() {
+		return [
+			[ [ 'A string' ] ],
+			[ [ 162735 ] ],
+			[ [ true ] ],
+		];
+	}
 }
\ No newline at end of file

From fe152794674b795e160bd55f0fda266b04c6e234 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Tue, 5 Dec 2017 17:44:58 -0600
Subject: [PATCH 134/148] Added value objects to test

---
 tests/class-test-field-case.php             | 17 ++++++-
 tests/fields/testCheckboxMultiField.php     | 14 ------
 tests/fields/testDateTimeTimestampField.php | 24 +++++++++
 tests/fields/testDateTimestampField.php     | 12 +++++
 tests/fields/testEmailField.php             | 13 +++++
 tests/fields/testGroupField.php             | 54 +++++++++++++++++++++
 tests/fields/testHiddenField.php            | 14 ------
 tests/fields/testNumberField.php            | 27 +++++------
 8 files changed, 131 insertions(+), 44 deletions(-)

diff --git a/tests/class-test-field-case.php b/tests/class-test-field-case.php
index 1f3b2fea..a57365b6 100644
--- a/tests/class-test-field-case.php
+++ b/tests/class-test-field-case.php
@@ -80,6 +80,8 @@ public function reset_wp_scripts() {
 	 * Verify that the field outputs with no errors for each argument set.
 	 *
 	 * @dataProvider argumentsProvider
+	 *
+	 * @param
 	 */
 	public function test_field_output( $arguments ) {
 		$this->update_arguments( $arguments );
@@ -94,12 +96,23 @@ public function test_field_output( $arguments ) {
 	 * Verify that the field saves values correctly to meta.
 	 *
 	 * @dataProvider valuesProvider
+	 *
+	 * @param
+	 * @param
 	 */
-	function test_save_value( $value ) {
+	function test_save_value( $value, $expected_value = false ) {
 		$this->instance->save( self::$post->ID, $value );
 
+		// Usually, we only want to pass one value and not a parsed value. Accomodate this here.
+		if ( false === $expected_value ) {
+			$expected_value = $value;
+		}
+
 		// Verify single value is properly saved.
-		$this->assertEquals( get_post_meta( self::$post->ID, get_class( $this->instance ), false ), $value );
+		$this->assertEquals(
+			$expected_value,
+			get_post_meta( self::$post->ID, get_class( $this->instance ), false )
+		);
 	}
 
 	/**
diff --git a/tests/fields/testCheckboxMultiField.php b/tests/fields/testCheckboxMultiField.php
index ee2e6794..3293fabd 100644
--- a/tests/fields/testCheckboxMultiField.php
+++ b/tests/fields/testCheckboxMultiField.php
@@ -16,20 +16,6 @@ public function setUp() {
 		$this->instance = new CMB_Checkbox_Multi( 'CMB_Checkbox_Multi', 'Field', [] );;
 	}
 
-	public function testSaveValue() {
-		$value = array( 'value' );
-		$field = new CMB_Checkbox_Multi( 'foo', 'Foo', $value );
-
-		if ( ! self::$post ) {
-			$this->markTestSkipped( 'Post not found' );
-		}
-
-		$field->save( self::$post->ID, $value );
-
-		// Verify single value is properly saved.
-		$this->assertEquals( get_post_meta( self::$post->ID, 'foo', false ), $value );
-	}
-
 	public function testEmptyFieldOutput() {
 		$field = new CMB_Checkbox_Multi( 'foo', 'Foo', array( 'value' => 'value' ), array( 'options' => array( 'value' => 'value' ) ) );
 
diff --git a/tests/fields/testDateTimeTimestampField.php b/tests/fields/testDateTimeTimestampField.php
index 5ab794d2..95ff7b92 100644
--- a/tests/fields/testDateTimeTimestampField.php
+++ b/tests/fields/testDateTimeTimestampField.php
@@ -31,4 +31,28 @@ function testAssets() {
 		$this->assertContains( CMB_URL . '/js/jquery.timePicker.min.js', $scripts_output );
 		$this->assertContains( CMB_URL . '/js/field.datetime.js', $scripts_output );
 	}
+
+	/**
+	 * Provide a default set of values to test saving against.
+	 *
+	 * @return array Default values set.
+	 */
+	public function valuesProvider() {
+		return [
+			[
+				[ [
+					'date' => '12/12/2012',
+					'time' => '12:00 am',
+				] ],
+				[ '1355270400' ]
+			],
+			[
+				[ [
+					'date' => '12/12/2112',
+					'time' => '12:00 am',
+				] ],
+				[ '4510944000' ]
+			],
+		];
+	}
 }
diff --git a/tests/fields/testDateTimestampField.php b/tests/fields/testDateTimestampField.php
index 862c1c96..c24575b7 100644
--- a/tests/fields/testDateTimestampField.php
+++ b/tests/fields/testDateTimestampField.php
@@ -31,4 +31,16 @@ function testAssets() {
 		$this->assertContains( CMB_URL . '/js/jquery.timePicker.min.js', $scripts_output );
 		$this->assertContains( CMB_URL . '/js/field.datetime.js', $scripts_output );
 	}
+
+	/**
+	 * Provide a default set of values to test saving against.
+	 *
+	 * @return array Default values set.
+	 */
+	public function valuesProvider() {
+		return [
+			[ [ '12/12/2012' ], [ '1355270400' ] ],
+			[ [ '12/12/2112' ], [ '4510944000' ] ],
+		];
+	}
 }
diff --git a/tests/fields/testEmailField.php b/tests/fields/testEmailField.php
index d4c5b8b2..d5dba967 100644
--- a/tests/fields/testEmailField.php
+++ b/tests/fields/testEmailField.php
@@ -48,4 +48,17 @@ function testFieldOutput() {
 		// Trigger output.
 		$field->html();
 	}
+
+	/**
+	 * Provide a default set of values to test saving against.
+	 *
+	 * @return array Default values set.
+	 */
+	public function valuesProvider() {
+		return [
+			[ [ 'A string' ] ],
+			[ [ 'hm@md.com' ] ],
+			[ [ 'mike@mike.co.uk' ] ],
+		];
+	}
 }
diff --git a/tests/fields/testGroupField.php b/tests/fields/testGroupField.php
index 03d63342..b986c2bb 100644
--- a/tests/fields/testGroupField.php
+++ b/tests/fields/testGroupField.php
@@ -142,6 +142,47 @@ function testFieldIdAttrValue() {
 		$group->field_index = 0; // Unset
 	}
 
+	/**
+	 * Verify that the field saves values correctly to meta.
+	 *
+	 * We need to override this method because inner fields must be setup
+	 * in order for saving to work correctly.
+	 *
+	 * @dataProvider valuesProvider
+	 *
+	 * @param
+	 * @param
+	 */
+	function test_save_value( $value, $expected_value = false ) {
+		$field = new CMB_Group_Field( 'CMB_Group_Field', 'Field', [
+			'fields' => [
+				[
+					'id' => 'gac-4-f-1',
+					'name' => 'Text input field',
+					'type' => 'text',
+				],
+				[
+					'id' => 'gac-4-f-2',
+					'name' => 'Text input field',
+					'type' => 'text',
+				],
+			],
+		] );
+
+		$field->save( self::$post->ID, $value );
+
+		// Usually, we only want to pass one value and not a parsed value. Accomodate this here.
+		if ( false === $expected_value ) {
+			$expected_value = $value;
+		}
+
+		// Verify single value is properly saved.
+		$this->assertEquals(
+			$expected_value,
+			get_post_meta( self::$post->ID, get_class( $field ), false )
+		);
+	}
+
 	/**
 	 * Update our default argument set with specific args.
 	 *
@@ -167,4 +208,17 @@ public function argumentsProvider() {
 
 		return array_merge( $args, parent::argumentsProvider() );
 	}
+
+	/**
+	 * Provide a default set of values to test saving against.
+	 *
+	 * @return array Values set.
+	 */
+	public function valuesProvider() {
+		return [
+			[ [ [ 'foo' => 'A string' ] ] ],
+			[ [ [ 'foo' => 162735 ] ] ],
+			[ [ [ 'foo' =>  true ] ] ],
+		];
+	}
 }
diff --git a/tests/fields/testHiddenField.php b/tests/fields/testHiddenField.php
index bcf8586c..2c1a953e 100644
--- a/tests/fields/testHiddenField.php
+++ b/tests/fields/testHiddenField.php
@@ -16,20 +16,6 @@ public function setUp() {
 		$this->instance = new CMB_Hidden_Field( 'CMB_Hidden_Field', 'Field', [] );
 	}
 
-	function testSaveValue() {
-		$value = array( 'value' );
-		$field = new CMB_Hidden_Field( 'foo', 'Foo', $value );
-
-		if ( ! self::$post ) {
-			$this->markTestSkipped( 'Post not found' );
-		}
-
-		$field->save( self::$post->ID, $value );
-
-		// Verify single value is properly saved.
-		$this->assertEquals( get_post_meta( self::$post->ID, 'foo', false ), $value );
-	}
-
 	function testFieldOutput() {
 		$field = new CMB_Hidden_Field( 'foo', 'Foo', array( 'value' ) );
 
diff --git a/tests/fields/testNumberField.php b/tests/fields/testNumberField.php
index 77d19204..40f29eb5 100644
--- a/tests/fields/testNumberField.php
+++ b/tests/fields/testNumberField.php
@@ -22,20 +22,6 @@ public function setUp() {
 		$this->instance = new CMB_Number_Field( 'CMB_Number_Field', 'Field', [] );
 	}
 
-	function testSaveValue() {
-		$value = array( 0.5 );
-		$field = new CMB_Number_Field( 'foo', 'Foo', $value, array( 'min' => 0, 'max' => 1 ) );
-
-		if ( ! self::$post ) {
-			$this->markTestSkipped( 'Post not found' );
-		}
-
-		$field->save( self::$post->ID, $value );
-
-		// Verify single value is properly saved.
-		$this->assertEquals( get_post_meta( self::$post->ID, 'foo', false ), $value );
-	}
-
 	function testFieldOutput() {
 		$field = new CMB_Number_Field( 'foo', 'Foo', array( 0.5 ), array( 'min' => 0.4, 'max' => 1 ) );
 
@@ -48,4 +34,17 @@ function testFieldOutput() {
 		// Trigger output.
 		$field->html();
 	}
+
+	/**
+	 * Provide a default set of values to test saving against.
+	 *
+	 * @return array Default values set.
+	 */
+	public function valuesProvider() {
+		return [
+			[ [ '1' ] ],
+			[ [ 162735 ] ],
+			[ [ 0.5 ] ],
+		];
+	}
 }

From f978d5553d92ab8a307515449a0805af0906aa0d Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Tue, 5 Dec 2017 17:57:40 -0600
Subject: [PATCH 135/148] Fixed group field tests

---
 tests/fields/testGroupField.php | 36 ++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/tests/fields/testGroupField.php b/tests/fields/testGroupField.php
index b986c2bb..fd16a82b 100644
--- a/tests/fields/testGroupField.php
+++ b/tests/fields/testGroupField.php
@@ -154,22 +154,9 @@ function testFieldIdAttrValue() {
 	 * @param
 	 */
 	function test_save_value( $value, $expected_value = false ) {
-		$field = new CMB_Group_Field( 'CMB_Group_Field', 'Field', [
-			'fields' => [
-				[
-					'id' => 'gac-4-f-1',
-					'name' => 'Text input field',
-					'type' => 'text',
-				],
-				[
-					'id' => 'gac-4-f-2',
-					'name' => 'Text input field',
-					'type' => 'text',
-				],
-			],
-		] );
+		$this->instance->add_field( new CMB_Text_Field( 'foo', 'Title', array( 1, 2 ) ) );
 
-		$field->save( self::$post->ID, $value );
+		$this->instance->save( self::$post->ID, $value );
 
 		// Usually, we only want to pass one value and not a parsed value. Accomodate this here.
 		if ( false === $expected_value ) {
@@ -179,7 +166,7 @@ function test_save_value( $value, $expected_value = false ) {
 		// Verify single value is properly saved.
 		$this->assertEquals(
 			$expected_value,
-			get_post_meta( self::$post->ID, get_class( $field ), false )
+			get_post_meta( self::$post->ID, get_class( $this->instance ), false )
 		);
 	}
 
@@ -212,13 +199,24 @@ public function argumentsProvider() {
 	/**
 	 * Provide a default set of values to test saving against.
 	 *
+	 * P.S. the data structure for this field is NUTS.
+	 *
 	 * @return array Values set.
 	 */
 	public function valuesProvider() {
 		return [
-			[ [ [ 'foo' => 'A string' ] ] ],
-			[ [ [ 'foo' => 162735 ] ] ],
-			[ [ [ 'foo' =>  true ] ] ],
+			[
+				[ [ 'foo' => [ 'A string' ] ] ],
+				[ [ 'foo' => 'A string' ] ]
+			],
+			[
+				[ [ 'foo' => [ 162735 ] ] ],
+				[ [ 'foo' => 162735 ] ]
+			],
+			[
+				[ [ 'foo' =>  [ true ] ] ],
+				[ [ 'foo' => true ] ]
+			],
 		];
 	}
 }

From 296bb8013c17425fb939e7d87b1079c307cd98e2 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Tue, 5 Dec 2017 18:00:35 -0600
Subject: [PATCH 136/148] Add hanging commas to test arrays

---
 tests/fields/testCheckboxMultiField.php     |  2 +-
 tests/fields/testDateTimeTimestampField.php | 24 ++++++++++++---------
 tests/fields/testGmapField.php              |  2 +-
 tests/fields/testGroupField.php             |  6 +++---
 tests/fields/testPostSelectField.php        |  2 +-
 tests/fields/testRadioField.php             |  2 +-
 tests/fields/testSelectField.php            |  2 +-
 7 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/tests/fields/testCheckboxMultiField.php b/tests/fields/testCheckboxMultiField.php
index 3293fabd..da89e0d2 100644
--- a/tests/fields/testCheckboxMultiField.php
+++ b/tests/fields/testCheckboxMultiField.php
@@ -53,7 +53,7 @@ public function argumentsProvider() {
 		$args = [
 			[
 				'options' => [ 'Option 1', 'Option 2', 'Option 3' ],
-			]
+			],
 		];
 
 		return array_merge( $args, parent::argumentsProvider() );
diff --git a/tests/fields/testDateTimeTimestampField.php b/tests/fields/testDateTimeTimestampField.php
index 95ff7b92..b80e7722 100644
--- a/tests/fields/testDateTimeTimestampField.php
+++ b/tests/fields/testDateTimeTimestampField.php
@@ -40,18 +40,22 @@ function testAssets() {
 	public function valuesProvider() {
 		return [
 			[
-				[ [
-					'date' => '12/12/2012',
-					'time' => '12:00 am',
-				] ],
-				[ '1355270400' ]
+				[
+					[
+						'date' => '12/12/2012',
+						'time' => '12:00 am',
+					],
+				],
+				[ '1355270400' ],
 			],
 			[
-				[ [
-					'date' => '12/12/2112',
-					'time' => '12:00 am',
-				] ],
-				[ '4510944000' ]
+				[
+					[
+						'date' => '12/12/2112',
+						'time' => '12:00 am',
+					],
+				],
+				[ '4510944000' ],
 			],
 		];
 	}
diff --git a/tests/fields/testGmapField.php b/tests/fields/testGmapField.php
index bde3f022..2a2b6de4 100644
--- a/tests/fields/testGmapField.php
+++ b/tests/fields/testGmapField.php
@@ -27,7 +27,7 @@ public function argumentsProvider() {
 				'google_api_key' => 'abcdefghijk',
 				'default_lat'    => '1.234',
 				'default_long'   => '1.234',
-			]
+			],
 		];
 
 		return array_merge( $args, parent::argumentsProvider() );
diff --git a/tests/fields/testGroupField.php b/tests/fields/testGroupField.php
index fd16a82b..8a36d7dc 100644
--- a/tests/fields/testGroupField.php
+++ b/tests/fields/testGroupField.php
@@ -207,15 +207,15 @@ public function valuesProvider() {
 		return [
 			[
 				[ [ 'foo' => [ 'A string' ] ] ],
-				[ [ 'foo' => 'A string' ] ]
+				[ [ 'foo' => 'A string' ] ],
 			],
 			[
 				[ [ 'foo' => [ 162735 ] ] ],
-				[ [ 'foo' => 162735 ] ]
+				[ [ 'foo' => 162735 ] ],
 			],
 			[
 				[ [ 'foo' =>  [ true ] ] ],
-				[ [ 'foo' => true ] ]
+				[ [ 'foo' => true ] ],
 			],
 		];
 	}
diff --git a/tests/fields/testPostSelectField.php b/tests/fields/testPostSelectField.php
index 5f8f853c..18643cc2 100644
--- a/tests/fields/testPostSelectField.php
+++ b/tests/fields/testPostSelectField.php
@@ -36,7 +36,7 @@ public function argumentsProvider() {
 				'query'    => [
 					'posts_per_page' => 20,
 				],
-			]
+			],
 		];
 
 		return array_merge( $args, parent::argumentsProvider() );
diff --git a/tests/fields/testRadioField.php b/tests/fields/testRadioField.php
index c83181ff..1ae72b1c 100644
--- a/tests/fields/testRadioField.php
+++ b/tests/fields/testRadioField.php
@@ -25,7 +25,7 @@ public function argumentsProvider() {
 		$args = [
 			[
 				'options' => [ 'Option 1', 'Option 2', 'Option 3' ],
-			]
+			],
 		];
 
 		return array_merge( $args, parent::argumentsProvider() );
diff --git a/tests/fields/testSelectField.php b/tests/fields/testSelectField.php
index ea728721..e6aedffd 100644
--- a/tests/fields/testSelectField.php
+++ b/tests/fields/testSelectField.php
@@ -33,7 +33,7 @@ public function argumentsProvider() {
 				'options' => [ 'Option 1', 'Option 2', 'Option 3' ],
 				'allow_none'      => true,
 				'multiple'        => false,
-			]
+			],
 		];
 
 		return array_merge( $args, parent::argumentsProvider() );

From 299097a13a97ce6b04e83897aa24f266c87e6225 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Tue, 5 Dec 2017 18:03:39 -0600
Subject: [PATCH 137/148] Added param documentation

---
 tests/class-test-field-case.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/class-test-field-case.php b/tests/class-test-field-case.php
index a57365b6..ea704fcf 100644
--- a/tests/class-test-field-case.php
+++ b/tests/class-test-field-case.php
@@ -81,7 +81,7 @@ public function reset_wp_scripts() {
 	 *
 	 * @dataProvider argumentsProvider
 	 *
-	 * @param
+	 * @param array $arguments Arguments to parse against.
 	 */
 	public function test_field_output( $arguments ) {
 		$this->update_arguments( $arguments );
@@ -97,8 +97,8 @@ public function test_field_output( $arguments ) {
 	 *
 	 * @dataProvider valuesProvider
 	 *
-	 * @param
-	 * @param
+	 * @param mixed $value          Value to save
+	 * @param mixed $expected_value Optional. Expected value to save.
 	 */
 	function test_save_value( $value, $expected_value = false ) {
 		$this->instance->save( self::$post->ID, $value );

From 78019888b6495864ed9d45d8d6fdffa44f8bef2a Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Wed, 6 Dec 2017 17:04:39 -0800
Subject: [PATCH 138/148] Small CS sweep

---
 fields/class-cmb-field.php              |  1 -
 tests/class-test-field-case.php         | 11 +++++++----
 tests/fields/testCheckboxMultiField.php |  2 +-
 tests/fields/testDateField.php          |  2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/fields/class-cmb-field.php b/fields/class-cmb-field.php
index fd66f8ea..c26112be 100644
--- a/fields/class-cmb-field.php
+++ b/fields/class-cmb-field.php
@@ -605,7 +605,6 @@ public function set_arguments( $arguments ) {
 			_deprecated_argument( 'CMB_Field', '0.9', "field argument 'std' is deprecated, use 'default' instead" );
 		}
 
-
 		if ( ! empty( $this->args['options'] ) && is_array( reset( $this->args['options'] ) ) ) {
 			$re_format = array();
 			foreach ( $this->args['options'] as $option ) {
diff --git a/tests/class-test-field-case.php b/tests/class-test-field-case.php
index ea704fcf..bcb64763 100644
--- a/tests/class-test-field-case.php
+++ b/tests/class-test-field-case.php
@@ -19,7 +19,7 @@ abstract class TestFieldCase extends WP_UnitTestCase {
 	/**
 	 * Consistent post for use with testing fields.
 	 *
-	 * @var
+	 * @var \WP_Post
 	 */
 	protected static $post;
 
@@ -31,12 +31,12 @@ abstract class TestFieldCase extends WP_UnitTestCase {
 	/**
 	 * Store a reference to global scripts to reset after tests are complete.
 	 *
-	 * @var
+	 * @var array
 	 */
 	private static $old_wp_scripts;
 
 	/**
-	 * Setup objects for our tests.
+	 * Setup fixtures for our tests.
 	 *
 	 * @param $factory
 	 */
@@ -54,6 +54,9 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 		self::$old_wp_scripts = isset( $GLOBALS['wp_scripts'] ) ? $GLOBALS['wp_scripts'] : null;
 	}
 
+	/**
+	 * Clean up fixtures.
+	 */
 	public static function wpTearDownAfterClass() {
 		wp_delete_post( self::$post->ID );
 		$GLOBALS['wp_scripts'] = self::$old_wp_scripts;
@@ -179,4 +182,4 @@ public function valuesProvider() {
 			[ [ true ] ],
 		];
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/fields/testCheckboxMultiField.php b/tests/fields/testCheckboxMultiField.php
index da89e0d2..eefb4346 100644
--- a/tests/fields/testCheckboxMultiField.php
+++ b/tests/fields/testCheckboxMultiField.php
@@ -13,7 +13,7 @@ class CheckboxMultiFieldTestCase extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->instance = new CMB_Checkbox_Multi( 'CMB_Checkbox_Multi', 'Field', [] );;
+		$this->instance = new CMB_Checkbox_Multi( 'CMB_Checkbox_Multi', 'Field', [] );
 	}
 
 	public function testEmptyFieldOutput() {
diff --git a/tests/fields/testDateField.php b/tests/fields/testDateField.php
index 961a7587..418ed559 100644
--- a/tests/fields/testDateField.php
+++ b/tests/fields/testDateField.php
@@ -13,7 +13,7 @@ class DateFieldsAssetsTestCase extends TestFieldCase {
 	function setUp() {
 		parent::setUp();
 
-		$this->instance = new CMB_Date_Field( 'CMB_Date_Field', 'Field', [] );;
+		$this->instance = new CMB_Date_Field( 'CMB_Date_Field', 'Field', [] );
 	}
 
 	/**

From 46e0b1da28a0ef01870bef70500d3eb55eaf5666 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Wed, 6 Dec 2017 17:10:29 -0800
Subject: [PATCH 139/148] Add file docblocks

---
 tests/fields/testCheckboxField.php          | 8 ++++++++
 tests/fields/testCheckboxMultiField.php     | 8 ++++++++
 tests/fields/testColorField.php             | 8 ++++++++
 tests/fields/testDateField.php              | 8 ++++++++
 tests/fields/testDateTimeTimestampField.php | 8 ++++++++
 tests/fields/testDateTimestampField.php     | 8 ++++++++
 tests/fields/testEmailField.php             | 2 ++
 tests/fields/testGmapField.php              | 8 ++++++++
 tests/fields/testGroupField.php             | 8 ++++++++
 tests/fields/testHiddenField.php            | 8 ++++++++
 tests/fields/testNumberField.php            | 2 ++
 tests/fields/testPostSelectField.php        | 8 ++++++++
 tests/fields/testRadioField.php             | 8 ++++++++
 tests/fields/testSelectField.php            | 8 ++++++++
 tests/fields/testTaxonomyField.php          | 8 ++++++++
 tests/fields/testTextField.php              | 8 ++++++++
 tests/fields/testTextSmallField.php         | 8 ++++++++
 tests/fields/testTextareaCodeField.php      | 8 ++++++++
 tests/fields/testTextareaField.php          | 8 ++++++++
 tests/fields/testTimeField.php              | 8 ++++++++
 tests/fields/testTitleCodeField.php         | 8 ++++++++
 tests/fields/testURLCodeField.php           | 8 ++++++++
 tests/fields/testWYSIWYGCodeField.php       | 8 ++++++++
 23 files changed, 172 insertions(+)

diff --git a/tests/fields/testCheckboxField.php b/tests/fields/testCheckboxField.php
index f513285e..61b963ca 100644
--- a/tests/fields/testCheckboxField.php
+++ b/tests/fields/testCheckboxField.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Tests for the single checkox field type.
+ *
+ * @since 1.1.0
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
 
 namespace HMCMB\Tests;
 
diff --git a/tests/fields/testCheckboxMultiField.php b/tests/fields/testCheckboxMultiField.php
index eefb4346..25948375 100644
--- a/tests/fields/testCheckboxMultiField.php
+++ b/tests/fields/testCheckboxMultiField.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Tests for the multi-checkbox field type.
+ *
+ * @since 1.1.0
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
 
 namespace HMCMB\Tests;
 
diff --git a/tests/fields/testColorField.php b/tests/fields/testColorField.php
index 26428a58..21104a98 100644
--- a/tests/fields/testColorField.php
+++ b/tests/fields/testColorField.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Tests for the color field type.
+ *
+ * @since 1.1.0
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
 
 namespace HMCMB\Tests;
 
diff --git a/tests/fields/testDateField.php b/tests/fields/testDateField.php
index 418ed559..de48a545 100644
--- a/tests/fields/testDateField.php
+++ b/tests/fields/testDateField.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Tests for the plain date field type.
+ *
+ * @since 1.1.0
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
 
 namespace HMCMB\Tests;
 
diff --git a/tests/fields/testDateTimeTimestampField.php b/tests/fields/testDateTimeTimestampField.php
index b80e7722..52527348 100644
--- a/tests/fields/testDateTimeTimestampField.php
+++ b/tests/fields/testDateTimeTimestampField.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Tests for the date & time/UNIX timestamp field type.
+ *
+ * @since 1.1.0
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
 
 namespace HMCMB\Tests;
 
diff --git a/tests/fields/testDateTimestampField.php b/tests/fields/testDateTimestampField.php
index c24575b7..a2f62bd2 100644
--- a/tests/fields/testDateTimestampField.php
+++ b/tests/fields/testDateTimestampField.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Tests for the date/UNIX timestamp field type.
+ *
+ * @since 1.1.0
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
 
 namespace HMCMB\Tests;
 
diff --git a/tests/fields/testEmailField.php b/tests/fields/testEmailField.php
index d5dba967..2697c3c3 100644
--- a/tests/fields/testEmailField.php
+++ b/tests/fields/testEmailField.php
@@ -2,6 +2,8 @@
 /**
  * Tests for the email field type.
  *
+ * @since 1.1.0
+ *
  * @package WordPress
  * @subpackage Custom Meta Boxes
  */
diff --git a/tests/fields/testGmapField.php b/tests/fields/testGmapField.php
index 2a2b6de4..e1977f02 100644
--- a/tests/fields/testGmapField.php
+++ b/tests/fields/testGmapField.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Tests for the Google Maps field type.
+ *
+ * @since 1.1.0
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
 
 namespace HMCMB\Tests;
 
diff --git a/tests/fields/testGroupField.php b/tests/fields/testGroupField.php
index 8a36d7dc..fa2b6267 100644
--- a/tests/fields/testGroupField.php
+++ b/tests/fields/testGroupField.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Tests for the group field type.
+ *
+ * @since 1.1.0
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
 
 namespace HMCMB\Tests;
 
diff --git a/tests/fields/testHiddenField.php b/tests/fields/testHiddenField.php
index 2c1a953e..ede94e8e 100644
--- a/tests/fields/testHiddenField.php
+++ b/tests/fields/testHiddenField.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Tests for the hidden field type.
+ *
+ * @since 1.1.0
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
 
 namespace HMCMB\Tests;
 
diff --git a/tests/fields/testNumberField.php b/tests/fields/testNumberField.php
index 40f29eb5..f790c54e 100644
--- a/tests/fields/testNumberField.php
+++ b/tests/fields/testNumberField.php
@@ -2,6 +2,8 @@
 /**
  * Tests for the number field type.
  *
+ * @since 1.1.0
+ *
  * @package WordPress
  * @subpackage Custom Meta Boxes
  */
diff --git a/tests/fields/testPostSelectField.php b/tests/fields/testPostSelectField.php
index 18643cc2..a0bbb4ce 100644
--- a/tests/fields/testPostSelectField.php
+++ b/tests/fields/testPostSelectField.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Tests for the post select field type.
+ *
+ * @since 1.1.0
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
 
 namespace HMCMB\Tests;
 
diff --git a/tests/fields/testRadioField.php b/tests/fields/testRadioField.php
index 1ae72b1c..340b47ec 100644
--- a/tests/fields/testRadioField.php
+++ b/tests/fields/testRadioField.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Tests for the radio field type.
+ *
+ * @since 1.1.0
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
 
 namespace HMCMB\Tests;
 
diff --git a/tests/fields/testSelectField.php b/tests/fields/testSelectField.php
index e6aedffd..a7575443 100644
--- a/tests/fields/testSelectField.php
+++ b/tests/fields/testSelectField.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Tests for the select field type.
+ *
+ * @since 1.1.0
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
 
 namespace HMCMB\Tests;
 
diff --git a/tests/fields/testTaxonomyField.php b/tests/fields/testTaxonomyField.php
index 1777f36f..4de12ecf 100644
--- a/tests/fields/testTaxonomyField.php
+++ b/tests/fields/testTaxonomyField.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Tests for the taxonomy field type.
+ *
+ * @since 1.1.0
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
 
 namespace HMCMB\Tests;
 
diff --git a/tests/fields/testTextField.php b/tests/fields/testTextField.php
index 2071bce1..e05b93ac 100644
--- a/tests/fields/testTextField.php
+++ b/tests/fields/testTextField.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Tests for the text field type.
+ *
+ * @since 1.1.0
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
 
 namespace HMCMB\Tests;
 
diff --git a/tests/fields/testTextSmallField.php b/tests/fields/testTextSmallField.php
index ed7e5b3f..1b1055c0 100644
--- a/tests/fields/testTextSmallField.php
+++ b/tests/fields/testTextSmallField.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Tests for the small-sized text field type.
+ *
+ * @since 1.1.0
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
 
 namespace HMCMB\Tests;
 
diff --git a/tests/fields/testTextareaCodeField.php b/tests/fields/testTextareaCodeField.php
index f5d5a1b2..8da9dade 100644
--- a/tests/fields/testTextareaCodeField.php
+++ b/tests/fields/testTextareaCodeField.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Tests for the textarea-saved-as-code field type.
+ *
+ * @since 1.1.0
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
 
 namespace HMCMB\Tests;
 
diff --git a/tests/fields/testTextareaField.php b/tests/fields/testTextareaField.php
index a454d30b..cec9b41f 100644
--- a/tests/fields/testTextareaField.php
+++ b/tests/fields/testTextareaField.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Tests for the plain textarea field type.
+ *
+ * @since 1.1.0
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
 
 namespace HMCMB\Tests;
 
diff --git a/tests/fields/testTimeField.php b/tests/fields/testTimeField.php
index c36d63d9..326c4fbe 100644
--- a/tests/fields/testTimeField.php
+++ b/tests/fields/testTimeField.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Tests for the time field type.
+ *
+ * @since 1.1.0
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
 
 namespace HMCMB\Tests;
 
diff --git a/tests/fields/testTitleCodeField.php b/tests/fields/testTitleCodeField.php
index cdfbefdc..b6539788 100644
--- a/tests/fields/testTitleCodeField.php
+++ b/tests/fields/testTitleCodeField.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Tests for the title field type.
+ *
+ * @since 1.1.0
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
 
 namespace HMCMB\Tests;
 
diff --git a/tests/fields/testURLCodeField.php b/tests/fields/testURLCodeField.php
index 5f5bf45f..9cd6a68f 100644
--- a/tests/fields/testURLCodeField.php
+++ b/tests/fields/testURLCodeField.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Tests for the URL field type.
+ *
+ * @since 1.1.0
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
 
 namespace HMCMB\Tests;
 
diff --git a/tests/fields/testWYSIWYGCodeField.php b/tests/fields/testWYSIWYGCodeField.php
index 6265ca31..31a58a4c 100644
--- a/tests/fields/testWYSIWYGCodeField.php
+++ b/tests/fields/testWYSIWYGCodeField.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Tests for the WYSIWYG field type.
+ *
+ * @since 1.1.0
+ *
+ * @package WordPress
+ * @subpackage Custom Meta Boxes
+ */
 
 namespace HMCMB\Tests;
 

From 90d05379f8a5d5bc0dee80836fe051049938b73e Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Wed, 6 Dec 2017 17:20:29 -0800
Subject: [PATCH 140/148] Add docblocks to tests where missing

---
 tests/fields/testCheckboxMultiField.php     |  6 ++++++
 tests/fields/testDateTimeTimestampField.php |  3 +++
 tests/fields/testDateTimestampField.php     |  3 +++
 tests/fields/testEmailField.php             | 17 +++--------------
 tests/fields/testGroupField.php             | 19 +++++++++++++++++--
 tests/fields/testHiddenField.php            |  3 +++
 tests/fields/testNumberField.php            |  3 +++
 tests/fields/testTimeField.php              |  3 +++
 8 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/tests/fields/testCheckboxMultiField.php b/tests/fields/testCheckboxMultiField.php
index 25948375..7f2e8dc8 100644
--- a/tests/fields/testCheckboxMultiField.php
+++ b/tests/fields/testCheckboxMultiField.php
@@ -24,6 +24,9 @@ public function setUp() {
 		$this->instance = new CMB_Checkbox_Multi( 'CMB_Checkbox_Multi', 'Field', [] );
 	}
 
+	/**
+	 * Test that the number field outputs correctly against an empty value set.
+	 */
 	public function testEmptyFieldOutput() {
 		$field = new CMB_Checkbox_Multi( 'foo', 'Foo', array( 'value' => 'value' ), array( 'options' => array( 'value' => 'value' ) ) );
 
@@ -37,6 +40,9 @@ public function testEmptyFieldOutput() {
 		$field->html();
 	}
 
+	/**
+	 * Test that the number field outputs correctly against a saved value set.
+	 */
 	public function testSavedFieldOutput() {
 		$field = new CMB_Checkbox_Multi( 'foo', 'Foo', array( 'value' => 'value' ), array( 'options' => array( 'value' => 'value', 'value2' => 'value2' ) ) );
 
diff --git a/tests/fields/testDateTimeTimestampField.php b/tests/fields/testDateTimeTimestampField.php
index 52527348..ac6cfdf1 100644
--- a/tests/fields/testDateTimeTimestampField.php
+++ b/tests/fields/testDateTimeTimestampField.php
@@ -24,6 +24,9 @@ public function setUp() {
 		$this->instance = new CMB_Datetime_Timestamp_Field( 'CMB_Datetime_Timestamp_Field', 'Field', [] );
 	}
 
+	/**
+	 * Test that all required scripts & styles are correctly loaded.
+	 */
 	function testAssets() {
 		$this->reset_wp_scripts();
 
diff --git a/tests/fields/testDateTimestampField.php b/tests/fields/testDateTimestampField.php
index a2f62bd2..92c083c2 100644
--- a/tests/fields/testDateTimestampField.php
+++ b/tests/fields/testDateTimestampField.php
@@ -24,6 +24,9 @@ public function setUp() {
 		$this->instance = new CMB_Date_Timestamp_Field( 'CMB_Date_Timestamp_Field', 'Field', [] );
 	}
 
+	/**
+	 * Test that all required scripts & styles are correctly loaded.
+	 */
 	function testAssets() {
 		$this->reset_wp_scripts();
 
diff --git a/tests/fields/testEmailField.php b/tests/fields/testEmailField.php
index 2697c3c3..790d222b 100644
--- a/tests/fields/testEmailField.php
+++ b/tests/fields/testEmailField.php
@@ -24,20 +24,9 @@ public function setUp() {
 		$this->instance = new CMB_Email_Field( 'CMB_Email_Field', 'Field', [] );
 	}
 
-	function testSaveValue() {
-		$value = array( 'hm@hmn.md' );
-		$field = new CMB_Email_Field( 'foo', 'Foo', $value );
-
-		if ( ! self::$post ) {
-			$this->markTestSkipped( 'Post not found' );
-		}
-
-		$field->save( self::$post->ID, $value );
-
-		// Verify single value is properly saved.
-		$this->assertEquals( get_post_meta( self::$post->ID, 'foo', false ), $value );
-	}
-
+	/**
+	 * Test that the number field outputs correctly against more specific field output.
+	 */
 	function testFieldOutput() {
 		$field        = new CMB_Email_Field( 'foo', 'Foo', array( 'hm@hmn.md' ) );
 
diff --git a/tests/fields/testGroupField.php b/tests/fields/testGroupField.php
index fa2b6267..809c4fdd 100644
--- a/tests/fields/testGroupField.php
+++ b/tests/fields/testGroupField.php
@@ -25,6 +25,9 @@ public function setUp() {
 		$this->instance = new CMB_Group_Field( 'CMB_Group_Field', 'Field', [] );
 	}
 
+	/**
+	 * Test that a fields are correctly added to a group field.
+	 */
 	function testAddField() {
 		$group  = new CMB_Group_Field( 'group', 'Group Title', array() );
 		$field1 = new CMB_Text_Field( 'foo', 'Title', array( 1 ) );
@@ -37,6 +40,9 @@ function testAddField() {
 		$this->assertArrayHasKey( 'bar', $group->get_fields() );
 	}
 
+	/**
+	 * Test that value retrieval within a group field works correctly.
+	 */
 	function testGetValues() {
 		$group  = new CMB_Group_Field( 'group', 'Group Title', array() );
 		$field1 = new CMB_Text_Field( 'foo', 'Title', array() );
@@ -55,6 +61,9 @@ function testGetValues() {
 		$this->assertEquals( $group->get_values(), $values );
 	}
 
+	/**
+	 * Test that vsaving values within a group field works correctly.
+	 */
 	function testParseSaveValues() {
 		$group  = new CMB_Group_Field( 'group', 'Group Title', array() );
 		$field1 = new CMB_Text_Field( 'foo', 'Title', array( 1 ) );
@@ -82,6 +91,9 @@ function testParseSaveValues() {
 		$this->assertEquals( $group->get_values(), $expected );
 	}
 
+	/**
+	 * Test that the name attribute works correctly.
+	 */
 	function testFieldNameAttrValue() {
 		$group  = new CMB_Group_Field( 'group', 'Group Title', array() );
 		$field1 = new CMB_Text_Field( 'foo', 'Title', array( 1, 2 ) );
@@ -116,6 +128,9 @@ function testFieldNameAttrValue() {
 		$group->field_index = 0; // Unset
 	}
 
+	/**
+	 * Test that the ID attribute works correctly.
+	 */
 	function testFieldIdAttrValue() {
 		$group  = new CMB_Group_Field( 'group', 'Group Title', array() );
 		$field1 = new CMB_Text_Field( 'foo', 'Title', array( 1, 2 ) );
@@ -158,8 +173,8 @@ function testFieldIdAttrValue() {
 	 *
 	 * @dataProvider valuesProvider
 	 *
-	 * @param
-	 * @param
+	 * @param mixed $value          Value to save
+	 * @param mixed $expected_value Optional. Expected value to save.
 	 */
 	function test_save_value( $value, $expected_value = false ) {
 		$this->instance->add_field( new CMB_Text_Field( 'foo', 'Title', array( 1, 2 ) ) );
diff --git a/tests/fields/testHiddenField.php b/tests/fields/testHiddenField.php
index ede94e8e..a39bfbbe 100644
--- a/tests/fields/testHiddenField.php
+++ b/tests/fields/testHiddenField.php
@@ -24,6 +24,9 @@ public function setUp() {
 		$this->instance = new CMB_Hidden_Field( 'CMB_Hidden_Field', 'Field', [] );
 	}
 
+	/**
+	 * Test that the number field outputs correctly against more specific field output.
+	 */
 	function testFieldOutput() {
 		$field = new CMB_Hidden_Field( 'foo', 'Foo', array( 'value' ) );
 
diff --git a/tests/fields/testNumberField.php b/tests/fields/testNumberField.php
index f790c54e..f1e25de3 100644
--- a/tests/fields/testNumberField.php
+++ b/tests/fields/testNumberField.php
@@ -24,6 +24,9 @@ public function setUp() {
 		$this->instance = new CMB_Number_Field( 'CMB_Number_Field', 'Field', [] );
 	}
 
+	/**
+	 * Test that the number field outputs correctly against more specific field output.
+	 */
 	function testFieldOutput() {
 		$field = new CMB_Number_Field( 'foo', 'Foo', array( 0.5 ), array( 'min' => 0.4, 'max' => 1 ) );
 
diff --git a/tests/fields/testTimeField.php b/tests/fields/testTimeField.php
index 326c4fbe..e3188c1a 100644
--- a/tests/fields/testTimeField.php
+++ b/tests/fields/testTimeField.php
@@ -24,6 +24,9 @@ public function setUp() {
 		$this->instance = new CMB_Time_Field( 'CMB_Time_Field', 'Field', [] );
 	}
 
+	/**
+	 * Test that all required scripts & styles are correctly loaded.
+	 */
 	function testAssets() {
 		$this->reset_wp_scripts();
 

From 1bea8b906e8e08d52c147f28b03cb73d67178df2 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Wed, 6 Dec 2017 17:36:50 -0800
Subject: [PATCH 141/148] Update test suite to only run WP 4.1 and up

---
 .travis.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 09395f26..716bb632 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,8 +11,8 @@ php:
 env:
     - WP_VERSION=latest WP_MULTISITE=0
     - WP_VERSION=latest WP_MULTISITE=1
-    - WP_VERSION=4.0 WP_MULTISITE=0
-    - WP_VERSION=4.0 WP_MULTISITE=1
+    - WP_VERSION=4.1 WP_MULTISITE=0
+    - WP_VERSION=4.1 WP_MULTISITE=1
 
 matrix:
   allow_failures:
@@ -21,29 +21,29 @@ matrix:
   exclude:
     # We really only need to verify that each PHP/WP combination works generally, not that multisite works between them
     - php: 5.4
-      env: WP_VERSION=4.0 WP_MULTISITE=1
+      env: WP_VERSION=4.1 WP_MULTISITE=1
     - php: 5.4
       env: WP_VERSION=latest WP_MULTISITE=1
     - php: 5.5
-      env: WP_VERSION=4.0 WP_MULTISITE=1
+      env: WP_VERSION=4.1 WP_MULTISITE=1
     - php: 5.5
       env: WP_VERSION=latest WP_MULTISITE=1
     - php: 7.0
       env: WP_VERSION=latest WP_MULTISITE=1
     # Only test latest version of WP with HHVM
     - php: hhvm
-      env: WP_VERSION=4.0 WP_MULTISITE=0
+      env: WP_VERSION=4.1 WP_MULTISITE=0
     - php: hhvm
-      env: WP_VERSION=4.0 WP_MULTISITE=1
-    # Only test latest version of WP with PHP 7.0+ because 4.0 won't work at all
+      env: WP_VERSION=4.1 WP_MULTISITE=1
+    # Only test latest version of WP with PHP 7.0+ because 4.1 won't work at all
     - php: 7.0
-      env: WP_VERSION=4.0 WP_MULTISITE=0
+      env: WP_VERSION=4.1 WP_MULTISITE=0
     - php: 7.0
-      env: WP_VERSION=4.0 WP_MULTISITE=1
+      env: WP_VERSION=4.1 WP_MULTISITE=1
     - php: 7.1
-      env: WP_VERSION=4.0 WP_MULTISITE=0
+      env: WP_VERSION=4.1 WP_MULTISITE=0
     - php: 7.1
-      env: WP_VERSION=4.0 WP_MULTISITE=1
+      env: WP_VERSION=4.1 WP_MULTISITE=1
 
 before_script:
     - bash bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION

From 276f6f6e16d4b63737dabcae7d5edca43bd87f39 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Wed, 6 Dec 2017 17:37:21 -0800
Subject: [PATCH 142/148] Update README to reflect WP 4.1 and not 4.0

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index 97a781b4..afd5d2e5 100644
--- a/readme.md
+++ b/readme.md
@@ -48,7 +48,7 @@ It began as a fork of [Custom Meta Boxes](https://github.com/jaredatch/Custom-Me
 
 ## Minimum Requirements:
 * PHP >= 5.4
-* WP >= 4.0
+* WP >= 4.1
 
 ## Known Issues
 * Some fields do not work well as repeatable fields.

From 260f7a39a0ee29f209a6192c554b07d246f4f3a2 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Fri, 8 Dec 2017 15:54:11 -0800
Subject: [PATCH 143/148] Re-named all classes to be more appropriate and
 adjusted filenames accordingly

---
 .../fields/{testCheckboxField.php => test-checkbox-field.php} | 4 ++--
 ...stCheckboxMultiField.php => test-checkbox-multi-field.php} | 4 ++--
 tests/fields/{testColorField.php => test-color-field.php}     | 4 ++--
 tests/fields/{testDateField.php => test-date-field.php}       | 4 ++--
 ...eTimestampField.php => test-date-time-timestamp-field.php} | 4 ++--
 ...stDateTimestampField.php => test-date-timestamp-field.php} | 4 ++--
 tests/fields/{testEmailField.php => test-email-field.php}     | 4 ++--
 tests/fields/{testGmapField.php => test-gmap-field.php}       | 4 ++--
 tests/fields/{testGroupField.php => test-group-field.php}     | 4 ++--
 tests/fields/{testHiddenField.php => test-hidden-field.php}   | 4 ++--
 tests/fields/{testImageField.php => test-image-field.php}     | 4 ++--
 tests/fields/{testNumberField.php => test-number-field.php}   | 4 ++--
 .../{testPostSelectField.php => test-post-select-field.php}   | 4 ++--
 tests/fields/{testRadioField.php => test-radio-field.php}     | 4 ++--
 tests/fields/{testSelectField.php => test-select-field.php}   | 4 ++--
 .../fields/{testTaxonomyField.php => test-taxonomy-field.php} | 4 ++--
 tests/fields/{testTextField.php => test-text-field.php}       | 4 ++--
 .../{testTextSmallField.php => test-text-small-field.php}     | 4 ++--
 ...testTextareaCodeField.php => test-textarea-code-field.php} | 4 ++--
 .../fields/{testTextareaField.php => test-textarea-field.php} | 4 ++--
 tests/fields/{testTimeField.php => test-time-field.php}       | 4 ++--
 .../{testTitleCodeField.php => test-title-code-field.php}     | 4 ++--
 .../fields/{testURLCodeField.php => test-url-code-field.php}  | 4 ++--
 .../{testWYSIWYGCodeField.php => test-wysiwyg-code-field.php} | 4 ++--
 24 files changed, 48 insertions(+), 48 deletions(-)
 rename tests/fields/{testCheckboxField.php => test-checkbox-field.php} (79%)
 rename tests/fields/{testCheckboxMultiField.php => test-checkbox-multi-field.php} (94%)
 rename tests/fields/{testColorField.php => test-color-field.php} (81%)
 rename tests/fields/{testDateField.php => test-date-field.php} (94%)
 rename tests/fields/{testDateTimeTimestampField.php => test-date-time-timestamp-field.php} (93%)
 rename tests/fields/{testDateTimestampField.php => test-date-timestamp-field.php} (93%)
 rename tests/fields/{testEmailField.php => test-email-field.php} (92%)
 rename tests/fields/{testGmapField.php => test-gmap-field.php} (89%)
 rename tests/fields/{testGroupField.php => test-group-field.php} (98%)
 rename tests/fields/{testHiddenField.php => test-hidden-field.php} (90%)
 rename tests/fields/{testImageField.php => test-image-field.php} (86%)
 rename tests/fields/{testNumberField.php => test-number-field.php} (92%)
 rename tests/fields/{testPostSelectField.php => test-post-select-field.php} (89%)
 rename tests/fields/{testRadioField.php => test-radio-field.php} (88%)
 rename tests/fields/{testSelectField.php => test-select-field.php} (91%)
 rename tests/fields/{testTaxonomyField.php => test-taxonomy-field.php} (90%)
 rename tests/fields/{testTextField.php => test-text-field.php} (81%)
 rename tests/fields/{testTextSmallField.php => test-text-small-field.php} (80%)
 rename tests/fields/{testTextareaCodeField.php => test-textarea-code-field.php} (80%)
 rename tests/fields/{testTextareaField.php => test-textarea-field.php} (80%)
 rename tests/fields/{testTimeField.php => test-time-field.php} (93%)
 rename tests/fields/{testTitleCodeField.php => test-title-code-field.php} (80%)
 rename tests/fields/{testURLCodeField.php => test-url-code-field.php} (81%)
 rename tests/fields/{testWYSIWYGCodeField.php => test-wysiwyg-code-field.php} (87%)

diff --git a/tests/fields/testCheckboxField.php b/tests/fields/test-checkbox-field.php
similarity index 79%
rename from tests/fields/testCheckboxField.php
rename to tests/fields/test-checkbox-field.php
index 61b963ca..8c2b81b3 100644
--- a/tests/fields/testCheckboxField.php
+++ b/tests/fields/test-checkbox-field.php
@@ -13,11 +13,11 @@
 use CMB_Checkbox;
 
 /**
- * Class CheckboxFieldTestCase
+ * Class TestCheckboxField
  *
  * @group fields
  */
-class CheckboxFieldTestCase extends TestFieldCase {
+class TestCheckboxField extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
diff --git a/tests/fields/testCheckboxMultiField.php b/tests/fields/test-checkbox-multi-field.php
similarity index 94%
rename from tests/fields/testCheckboxMultiField.php
rename to tests/fields/test-checkbox-multi-field.php
index 7f2e8dc8..dd754a97 100644
--- a/tests/fields/testCheckboxMultiField.php
+++ b/tests/fields/test-checkbox-multi-field.php
@@ -13,11 +13,11 @@
 use CMB_Checkbox_Multi;
 
 /**
- * Class CheckboxMultiFieldTestCase
+ * Class TestCheckboxMultiField
  *
  * @group fields
  */
-class CheckboxMultiFieldTestCase extends TestFieldCase {
+class TestCheckboxMultiField extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
diff --git a/tests/fields/testColorField.php b/tests/fields/test-color-field.php
similarity index 81%
rename from tests/fields/testColorField.php
rename to tests/fields/test-color-field.php
index 21104a98..aa16cff3 100644
--- a/tests/fields/testColorField.php
+++ b/tests/fields/test-color-field.php
@@ -13,11 +13,11 @@
 use CMB_Color_Picker;
 
 /**
- * Class ColorFieldTestCase
+ * Class TestColorField
  *
  * @group fields
  */
-class ColorFieldTestCase extends TestFieldCase {
+class TestColorField extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
diff --git a/tests/fields/testDateField.php b/tests/fields/test-date-field.php
similarity index 94%
rename from tests/fields/testDateField.php
rename to tests/fields/test-date-field.php
index de48a545..d3fdf6dc 100644
--- a/tests/fields/testDateField.php
+++ b/tests/fields/test-date-field.php
@@ -13,11 +13,11 @@
 use CMB_Date_Field;
 
 /**
- * Class DateFieldsAssetsTestCase
+ * Class TestDateFieldsAssets
  *
  * @group fields
  */
-class DateFieldsAssetsTestCase extends TestFieldCase {
+class TestDateFieldsAssets extends TestFieldCase {
 	function setUp() {
 		parent::setUp();
 
diff --git a/tests/fields/testDateTimeTimestampField.php b/tests/fields/test-date-time-timestamp-field.php
similarity index 93%
rename from tests/fields/testDateTimeTimestampField.php
rename to tests/fields/test-date-time-timestamp-field.php
index ac6cfdf1..a4d5c4e7 100644
--- a/tests/fields/testDateTimeTimestampField.php
+++ b/tests/fields/test-date-time-timestamp-field.php
@@ -13,11 +13,11 @@
 use CMB_Datetime_Timestamp_Field;
 
 /**
- * Class DateTimeTimestampFieldTestCase
+ * Class TestDateTimeTimestampField
  *
  * @group fields
  */
-class DateTimeTimestampFieldTestCase extends TestFieldCase {
+class TestDateTimeTimestampField extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
diff --git a/tests/fields/testDateTimestampField.php b/tests/fields/test-date-timestamp-field.php
similarity index 93%
rename from tests/fields/testDateTimestampField.php
rename to tests/fields/test-date-timestamp-field.php
index 92c083c2..8f1c8bc2 100644
--- a/tests/fields/testDateTimestampField.php
+++ b/tests/fields/test-date-timestamp-field.php
@@ -13,11 +13,11 @@
 use CMB_Date_Timestamp_Field;
 
 /**
- * Class DateTimestampFieldTestCase
+ * Class TestDateTimestampField
  *
  * @group fields
  */
-class DateTimestampFieldTestCase extends TestFieldCase {
+class TestDateTimestampField extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
diff --git a/tests/fields/testEmailField.php b/tests/fields/test-email-field.php
similarity index 92%
rename from tests/fields/testEmailField.php
rename to tests/fields/test-email-field.php
index 790d222b..a3b1ca3f 100644
--- a/tests/fields/testEmailField.php
+++ b/tests/fields/test-email-field.php
@@ -13,11 +13,11 @@
 use CMB_Email_Field;
 
 /**
- * Class EmailFieldTestCase
+ * Class TestEmailField
  *
  * @group fields
  */
-class EmailFieldTestCase extends TestFieldCase {
+class TestEmailField extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
diff --git a/tests/fields/testGmapField.php b/tests/fields/test-gmap-field.php
similarity index 89%
rename from tests/fields/testGmapField.php
rename to tests/fields/test-gmap-field.php
index e1977f02..1da4158d 100644
--- a/tests/fields/testGmapField.php
+++ b/tests/fields/test-gmap-field.php
@@ -13,11 +13,11 @@
 use CMB_Gmap_Field;
 
 /**
- * Class GmapFieldTestCase
+ * Class TestGmapField
  *
  * @group fields
  */
-class GmapFieldTestCase extends TestFieldCase {
+class TestGmapField extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
diff --git a/tests/fields/testGroupField.php b/tests/fields/test-group-field.php
similarity index 98%
rename from tests/fields/testGroupField.php
rename to tests/fields/test-group-field.php
index 809c4fdd..acab9448 100644
--- a/tests/fields/testGroupField.php
+++ b/tests/fields/test-group-field.php
@@ -14,11 +14,11 @@
 use CMB_Text_Field;
 
 /**
- * Class GroupFieldTestCase
+ * Class TestGroupField
  *
  * @group fields
  */
-class GroupFieldTestCase extends TestFieldCase {
+class TestGroupField extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
diff --git a/tests/fields/testHiddenField.php b/tests/fields/test-hidden-field.php
similarity index 90%
rename from tests/fields/testHiddenField.php
rename to tests/fields/test-hidden-field.php
index a39bfbbe..217e0b78 100644
--- a/tests/fields/testHiddenField.php
+++ b/tests/fields/test-hidden-field.php
@@ -13,11 +13,11 @@
 use CMB_Hidden_Field;
 
 /**
- * Class HiddenFieldTestCase
+ * Class TestHiddenField
  *
  * @group fields
  */
-class HiddenFieldTestCase extends TestFieldCase {
+class TestHiddenField extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
diff --git a/tests/fields/testImageField.php b/tests/fields/test-image-field.php
similarity index 86%
rename from tests/fields/testImageField.php
rename to tests/fields/test-image-field.php
index 3f669da3..441e3f06 100644
--- a/tests/fields/testImageField.php
+++ b/tests/fields/test-image-field.php
@@ -5,11 +5,11 @@
 use CMB_Image_Field;
 
 /**
- * Class ImageFieldTestCase
+ * Class TestImageField
  *
  * @group fields
  */
-class ImageFieldTestCase extends TestFieldCase {
+class TestImageField extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
diff --git a/tests/fields/testNumberField.php b/tests/fields/test-number-field.php
similarity index 92%
rename from tests/fields/testNumberField.php
rename to tests/fields/test-number-field.php
index f1e25de3..408bd795 100644
--- a/tests/fields/testNumberField.php
+++ b/tests/fields/test-number-field.php
@@ -13,11 +13,11 @@
 use CMB_Number_Field;
 
 /**
- * Class NumberFieldTestCase
+ * Class TestNumberField
  *
  * @group fields
  */
-class NumberFieldTestCase extends TestFieldCase {
+class TestNumberField extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
diff --git a/tests/fields/testPostSelectField.php b/tests/fields/test-post-select-field.php
similarity index 89%
rename from tests/fields/testPostSelectField.php
rename to tests/fields/test-post-select-field.php
index a0bbb4ce..9ca982e6 100644
--- a/tests/fields/testPostSelectField.php
+++ b/tests/fields/test-post-select-field.php
@@ -13,11 +13,11 @@
 use CMB_Post_Select;
 
 /**
- * Class PostSelectFieldTestCase
+ * Class TestPostSelectField
  *
  * @group fields
  */
-class PostSelectFieldTestCase extends TestFieldCase {
+class TestPostSelectField extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
diff --git a/tests/fields/testRadioField.php b/tests/fields/test-radio-field.php
similarity index 88%
rename from tests/fields/testRadioField.php
rename to tests/fields/test-radio-field.php
index 340b47ec..dbacb2da 100644
--- a/tests/fields/testRadioField.php
+++ b/tests/fields/test-radio-field.php
@@ -13,11 +13,11 @@
 use CMB_Radio_Field;
 
 /**
- * Class RadioFieldTestCase
+ * Class TestRadioField
  *
  * @group fields
  */
-class RadioFieldTestCase extends TestFieldCase {
+class TestRadioField extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
diff --git a/tests/fields/testSelectField.php b/tests/fields/test-select-field.php
similarity index 91%
rename from tests/fields/testSelectField.php
rename to tests/fields/test-select-field.php
index a7575443..312b2990 100644
--- a/tests/fields/testSelectField.php
+++ b/tests/fields/test-select-field.php
@@ -13,11 +13,11 @@
 use CMB_Select;
 
 /**
- * Class SelectFieldTestCase
+ * Class TestSelectField
  *
  * @group fields
  */
-class SelectFieldTestCase extends TestFieldCase {
+class TestSelectField extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
diff --git a/tests/fields/testTaxonomyField.php b/tests/fields/test-taxonomy-field.php
similarity index 90%
rename from tests/fields/testTaxonomyField.php
rename to tests/fields/test-taxonomy-field.php
index 4de12ecf..2a8299f7 100644
--- a/tests/fields/testTaxonomyField.php
+++ b/tests/fields/test-taxonomy-field.php
@@ -13,11 +13,11 @@
 use CMB_Taxonomy;
 
 /**
- * Class TaxonomyFieldTestCase
+ * Class TestTaxonomyField
  *
  * @group fields
  */
-class TaxonomyFieldTestCase extends TestFieldCase {
+class TestTaxonomyField extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
diff --git a/tests/fields/testTextField.php b/tests/fields/test-text-field.php
similarity index 81%
rename from tests/fields/testTextField.php
rename to tests/fields/test-text-field.php
index e05b93ac..87cb20fa 100644
--- a/tests/fields/testTextField.php
+++ b/tests/fields/test-text-field.php
@@ -13,11 +13,11 @@
 use CMB_Text_Field;
 
 /**
- * Class TextFieldTestCase
+ * Class TestTextField
  *
  * @group fields
  */
-class TextFieldTestCase extends TestFieldCase {
+class TestTextField extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
diff --git a/tests/fields/testTextSmallField.php b/tests/fields/test-text-small-field.php
similarity index 80%
rename from tests/fields/testTextSmallField.php
rename to tests/fields/test-text-small-field.php
index 1b1055c0..1bbfc280 100644
--- a/tests/fields/testTextSmallField.php
+++ b/tests/fields/test-text-small-field.php
@@ -13,11 +13,11 @@
 use CMB_Text_Small_Field;
 
 /**
- * Class TextSmallFieldTestCase
+ * Class TestTextSmallField
  *
  * @group fields
  */
-class TextSmallFieldTestCase extends TestFieldCase {
+class TestTextSmallField extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
diff --git a/tests/fields/testTextareaCodeField.php b/tests/fields/test-textarea-code-field.php
similarity index 80%
rename from tests/fields/testTextareaCodeField.php
rename to tests/fields/test-textarea-code-field.php
index 8da9dade..b6205e38 100644
--- a/tests/fields/testTextareaCodeField.php
+++ b/tests/fields/test-textarea-code-field.php
@@ -13,11 +13,11 @@
 use CMB_Textarea_Field_Code;
 
 /**
- * Class TextareaCodeFieldTestCase
+ * Class TestTextareaCodeField
  *
  * @group fields
  */
-class TextareaCodeFieldTestCase extends TestFieldCase {
+class TestTextareaCodeField extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
diff --git a/tests/fields/testTextareaField.php b/tests/fields/test-textarea-field.php
similarity index 80%
rename from tests/fields/testTextareaField.php
rename to tests/fields/test-textarea-field.php
index cec9b41f..4a1469a3 100644
--- a/tests/fields/testTextareaField.php
+++ b/tests/fields/test-textarea-field.php
@@ -13,11 +13,11 @@
 use CMB_Textarea_Field;
 
 /**
- * Class TextareaFieldTestCase
+ * Class TestTextareaField
  *
  * @group fields
  */
-class TextareaFieldTestCase extends TestFieldCase {
+class TestTextareaField extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
diff --git a/tests/fields/testTimeField.php b/tests/fields/test-time-field.php
similarity index 93%
rename from tests/fields/testTimeField.php
rename to tests/fields/test-time-field.php
index e3188c1a..f7dca55b 100644
--- a/tests/fields/testTimeField.php
+++ b/tests/fields/test-time-field.php
@@ -13,11 +13,11 @@
 use CMB_Time_Field;
 
 /**
- * Class TimeTestCase
+ * Class TestTimeField
  *
  * @group fields
  */
-class TimeTestCase extends TestFieldCase {
+class TestTimeField extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
diff --git a/tests/fields/testTitleCodeField.php b/tests/fields/test-title-code-field.php
similarity index 80%
rename from tests/fields/testTitleCodeField.php
rename to tests/fields/test-title-code-field.php
index b6539788..29aa1061 100644
--- a/tests/fields/testTitleCodeField.php
+++ b/tests/fields/test-title-code-field.php
@@ -13,11 +13,11 @@
 use CMB_Title;
 
 /**
- * Class TitleFieldTestCase
+ * Class TestTitleField
  *
  * @group fields
  */
-class TitleFieldTestCase extends TestFieldCase {
+class TestTitleField extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
diff --git a/tests/fields/testURLCodeField.php b/tests/fields/test-url-code-field.php
similarity index 81%
rename from tests/fields/testURLCodeField.php
rename to tests/fields/test-url-code-field.php
index 9cd6a68f..8f886ca3 100644
--- a/tests/fields/testURLCodeField.php
+++ b/tests/fields/test-url-code-field.php
@@ -13,11 +13,11 @@
 use CMB_URL_Field;
 
 /**
- * Class URLFieldTestCase
+ * Class TestURLField
  *
  * @group fields
  */
-class URLFieldTestCase extends TestFieldCase {
+class TestURLField extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 
diff --git a/tests/fields/testWYSIWYGCodeField.php b/tests/fields/test-wysiwyg-code-field.php
similarity index 87%
rename from tests/fields/testWYSIWYGCodeField.php
rename to tests/fields/test-wysiwyg-code-field.php
index 31a58a4c..5fa1ffc8 100644
--- a/tests/fields/testWYSIWYGCodeField.php
+++ b/tests/fields/test-wysiwyg-code-field.php
@@ -13,11 +13,11 @@
 use CMB_wysiwyg;
 
 /**
- * Class WYSIWYGFieldTestCase
+ * Class TestWYSIWYGField
  *
  * @group fields
  */
-class WYSIWYGFieldTestCase extends TestFieldCase {
+class TestWYSIWYGField extends TestFieldCase {
 	public function setUp() {
 		parent::setUp();
 

From 55442a106803fd15d549cf19dba5d68765bfae34 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Fri, 8 Dec 2017 15:57:00 -0800
Subject: [PATCH 144/148] Fixed minor array CS issues

---
 tests/fields/test-group-field.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/fields/test-group-field.php b/tests/fields/test-group-field.php
index acab9448..93c170a0 100644
--- a/tests/fields/test-group-field.php
+++ b/tests/fields/test-group-field.php
@@ -213,7 +213,7 @@ public function argumentsProvider() {
 						'type' => 'text',
 					],
 				],
-			]
+			],
 		];
 
 		return array_merge( $args, parent::argumentsProvider() );
@@ -237,7 +237,7 @@ public function valuesProvider() {
 				[ [ 'foo' => 162735 ] ],
 			],
 			[
-				[ [ 'foo' =>  [ true ] ] ],
+				[ [ 'foo' => [ true ] ] ],
 				[ [ 'foo' => true ] ],
 			],
 		];

From a1b6b7e1c2c9f95fbb51f28c75b5d1c5279438dc Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Fri, 8 Dec 2017 15:57:23 -0800
Subject: [PATCH 145/148] Added backwards-compatibility layer for old WP
 version test-suites

---
 tests/class-test-field-case.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/class-test-field-case.php b/tests/class-test-field-case.php
index bcb64763..cd44de84 100644
--- a/tests/class-test-field-case.php
+++ b/tests/class-test-field-case.php
@@ -50,6 +50,11 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 			'post_type'    => 'post',
 		] );
 
+		// Backwards compatibility with old WP versions.
+		if ( is_int( self::$post ) ) {
+			self::$post = get_post( self::$post );
+		}
+
 		// Capture WP Scripts object before usage.
 		self::$old_wp_scripts = isset( $GLOBALS['wp_scripts'] ) ? $GLOBALS['wp_scripts'] : null;
 	}

From f200eeb434e3197400867434458ca9145a513cc6 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Fri, 8 Dec 2017 16:02:20 -0800
Subject: [PATCH 146/148] Plain using WP core function if the factory doesn't
 do the job correctly as a BC layer

---
 tests/class-test-field-case.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/tests/class-test-field-case.php b/tests/class-test-field-case.php
index cd44de84..f244b16a 100644
--- a/tests/class-test-field-case.php
+++ b/tests/class-test-field-case.php
@@ -11,6 +11,7 @@
 use WP_UnitTest_Factory;
 use WP_UnitTestCase;
 use WP_Scripts;
+use WP_Post;
 
 /**
  * Class TestFieldCase
@@ -41,18 +42,20 @@ abstract class TestFieldCase extends WP_UnitTestCase {
 	 * @param $factory
 	 */
 	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
-		// Setup a default post for usage within test.
-		self::$post = $factory->post->create_and_get( [
+		$post_args = [
 			'post_author'  => 1,
 			'post_status'  => 'publish',
 			'post_content' => rand_str(),
 			'post_title'   => rand_str(),
 			'post_type'    => 'post',
-		] );
+		];
+
+		// Setup a default post for usage within test.
+		self::$post = $factory->post->create_and_get( $post_args );
 
 		// Backwards compatibility with old WP versions.
-		if ( is_int( self::$post ) ) {
-			self::$post = get_post( self::$post );
+		if ( ! self::$post instanceof WP_Post ) {
+			self::$post = get_post( wp_insert_post( $post_args ) );
 		}
 
 		// Capture WP Scripts object before usage.

From a0fea1eccef8b04fe49d3e72e504b20742c1cdb6 Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Fri, 8 Dec 2017 16:25:56 -0800
Subject: [PATCH 147/148] Move from wpSetupBeforeClass to setUpBeforeClass for
 backwards-compatibility

---
 tests/class-test-field-case.php | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/tests/class-test-field-case.php b/tests/class-test-field-case.php
index f244b16a..66f1e556 100644
--- a/tests/class-test-field-case.php
+++ b/tests/class-test-field-case.php
@@ -11,7 +11,6 @@
 use WP_UnitTest_Factory;
 use WP_UnitTestCase;
 use WP_Scripts;
-use WP_Post;
 
 /**
  * Class TestFieldCase
@@ -38,10 +37,10 @@ abstract class TestFieldCase extends WP_UnitTestCase {
 
 	/**
 	 * Setup fixtures for our tests.
-	 *
-	 * @param $factory
 	 */
-	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+	public static function setUpBeforeClass() {
+		parent::setUpBeforeClass();
+
 		$post_args = [
 			'post_author'  => 1,
 			'post_status'  => 'publish',
@@ -51,13 +50,9 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 		];
 
 		// Setup a default post for usage within test.
+		$factory = new WP_UnitTest_Factory();
 		self::$post = $factory->post->create_and_get( $post_args );
 
-		// Backwards compatibility with old WP versions.
-		if ( ! self::$post instanceof WP_Post ) {
-			self::$post = get_post( wp_insert_post( $post_args ) );
-		}
-
 		// Capture WP Scripts object before usage.
 		self::$old_wp_scripts = isset( $GLOBALS['wp_scripts'] ) ? $GLOBALS['wp_scripts'] : null;
 	}
@@ -65,7 +60,9 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 	/**
 	 * Clean up fixtures.
 	 */
-	public static function wpTearDownAfterClass() {
+	public static function tearDownAfterClass() {
+		parent::tearDownAfterClass();
+
 		wp_delete_post( self::$post->ID );
 		$GLOBALS['wp_scripts'] = self::$old_wp_scripts;
 	}

From 99afe7da4ff63a53b41508b10d8fa8fc6896e3cf Mon Sep 17 00:00:00 2001
From: mikeselander <mikeselander@humanmade.co.uk>
Date: Fri, 15 Dec 2017 12:59:38 -0800
Subject: [PATCH 148/148] Updated readme with 1.1 release notes

---
 readme.md | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/readme.md b/readme.md
index afd5d2e5..abc4d846 100644
--- a/readme.md
+++ b/readme.md
@@ -2,7 +2,7 @@
 	<tr>
 		<td align="left" width="70">
 			<strong>HM Custom Meta Boxes for WordPress</strong><br />
-			A framework for easily adding custom fields  to the WordPress post edit page
+			A framework for easily adding custom fields to the WordPress post edit page
 		</td>
 		<td align="center" width="20%">
 		    <img src="https://hmn.md/content/themes/hmnmd/assets/images/hm-logo.svg" width="100" />
@@ -61,7 +61,23 @@ See [CONTRIBUTING.md](https://github.com/humanmade/Custom-Meta-Boxes/blob/master
 ## Changelog ##
 
 **1.1**
-* Added `capability` option to individual fields and groups
+
+_Enhancements_
+ - Added group field filter
+ - Cleaned up file upload styles
+ - Added Hindi translation (props @ajitbohra)
+ - Move all field classes to their own files
+ - Add min/max attributes to number input (props @shadvb)
+ - Use site language with Google Maps field (props @barryceelen)
+
+_Bug Fixes_
+ - Filter all arguments, not just select ones
+ - Only attempt to call getimagesize() if the icon is local (props @joehoyle)
+ - Add Dutch and German translations (props @barryceelen)
+ - Align the file button vertically (props @ocean90)
+ - Fix for multiple wysiwyg fields not displaying in groups (props @tareiking)
+ - Fix incorrect gmap grouped field structure (props @dan-westall)
+ - Fix enqueuing of cmb-scripts (props @barryceelen)
 
 **1.0.3**
 * Fix repeatable fields bugs (props @barryceelen )