From 95c0b0ec6072c6a32a647557fa6f57efc18bbd53 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Fri, 7 Feb 2014 10:01:28 -0500
Subject: [PATCH 01/71] revamp types to work with more repeatable field types

---
 helpers/cmb_Meta_Box_types.php |  256 ++--
 init.php                       |    9 +-
 js/cmb.js                      |  175 ++-
 js/cmb.min.js                  |   30 +-
 js/jquery.datePicker.min.js    | 2038 ++++++++++++++++++++++++++++++++
 5 files changed, 2286 insertions(+), 222 deletions(-)
 create mode 100644 js/jquery.datePicker.min.js

diff --git a/helpers/cmb_Meta_Box_types.php b/helpers/cmb_Meta_Box_types.php
index b462939..5c28a3a 100644
--- a/helpers/cmb_Meta_Box_types.php
+++ b/helpers/cmb_Meta_Box_types.php
@@ -73,22 +73,25 @@ public static function get() {
 	 * @return strgin             Field's description markup
 	 */
 	private static function desc( $paragraph = false ) {
+		// Prevent description from printing multiple times for repeatable fields
+		if ( self::$iterator > 0 ) {
+			return '';
+		}
+
 		$tag = $paragraph ? 'p' : 'span';
 		$desc = cmb_Meta_Box::$field['desc'];
 		return "\n<$tag class=\"cmb_metabox_description\">$desc</$tag>\n";
 	}
 
 	/**
-	 * Generates repeatable text fields
+	 * Generates repeatable fields
 	 * @since  1.0.0
-	 * @param  string  $field Metabox field
+	 * @param  array   $field Metabox field
 	 * @param  mixed   $meta  Field's meta value
-	 * @param  string  $class Field's class attribute
-	 * @param  string  $type  Field Type
+	 * @param  int     $object_id Object ID
+	 * @param  string  $object_type  Object Type
 	 */
-	private static function repeat_text_field( $meta, $class = '', $type = 'text' ) {
-
-		$field = cmb_Meta_Box::$field; self::$meta = $meta; self::$type = $type;
+	public static function render_repeatable_field( $field, $meta, $object_id, $object_type ) {
 
 		// check for default content
 		$default = isset( $field['default'] ) ? array( $field['default'] ) : false;
@@ -100,39 +103,33 @@ private static function repeat_text_field( $meta, $class = '', $type = 'text' )
 			$meta = $default;
 		}
 
-		self::repeat_table_open( $class );
-
-		$class = $class ? $class .' widefat' : 'widefat';
+		$class = 'widefat';
+		self::repeat_table_open();
 
 		if ( !empty( $meta ) ) {
 			foreach ( (array) $meta as $val ) {
-				self::repeat_row( self::text_input( $class, $val ) );
+				self::open_repeat_row();
+				self::$iterator = self::$iterator ? self::$iterator + 1 : 1;
+				call_user_func( array( __CLASS__, $field['type'] ), $field, $val, $object_id, $object_type );
+				self::close_repeat_row();
 			}
 		} else {
-			self::repeat_row( self::text_input( $class ) );
+			self::open_repeat_row();
+			self::$iterator = 1;
+			call_user_func( array( __CLASS__, $field['type'] ), $field, $meta, $object_id, $object_type );
+			self::close_repeat_row();
 		}
 
-		self::empty_row( self::text_input( $class ) );
+		self::open_empty_row();
+		self::$iterator = self::$iterator ? self::$iterator + 1 : 1;
+		call_user_func( array( __CLASS__, $field['type'] ), $field, null, $object_id, $object_type );
+		self::close_repeat_row();
+
 		self::repeat_table_close();
 		// reset iterator
 		self::$iterator = 0;
 	}
 
-	/**
-	 * Text input field used by repeatable fields
-	 * @since  1.0.0
-	 * @param  string  $class Field's class attribute
-	 * @param  mixed   $val   Field's meta value
-	 * @return string         HTML text input
-	 */
-	private static function text_input( $class = '', $val = '' ) {
-		self::$iterator = self::$iterator ? self::$iterator + 1 : 1;
-		$before = '';
-		if ( cmb_Meta_Box::$field['type'] == 'text_money' )
-			$before = ! empty( cmb_Meta_Box::$field['before'] ) ? ' ' : '$ ';
-		return $before . '<input type="'. self::$type .'" class="'. $class .'" name="'. cmb_Meta_Box::$field['id'] .'[]" id="'. cmb_Meta_Box::$field['id'] .'_'. self::$iterator .'" value="'. self::esc( $val ) .'" data-id="'. cmb_Meta_Box::$field['id'] .'" data-count="'. self::$iterator .'"/>';
-	}
-
 	/**
 	 * Generates repeatable field opening table markup for repeatable fields
 	 * @since  1.0.0
@@ -150,32 +147,19 @@ private static function repeat_table_close() {
 		echo '</tbody></table><p class="add-row"><a data-selector="', cmb_Meta_Box::$field['id'] ,'_repeat" class="add-row-button button" href="#">'. __( 'Add Row', 'cmb' ) .'</a></p>';
 	}
 
-	/**
-	 * Generates table row markup for repeatable fields
-	 * @since 1.0.0
-	 * @param string $input Table cell markup
-	 */
-	private static function repeat_row( $input ) {
-		echo '<tr class="repeat-row">', self::repeat_cell( $input ) ,'</tr>';
+	private static function open_repeat_row() {
+		echo '<tr class="repeat-row">';
+		echo '<td>';
 	}
 
-	/**
-	 * Generates the empty table row markup (for duplication) for repeatable fields
-	 * @since 1.0.0
-	 * @param string $input Table cell markup
-	 */
-	private static function empty_row( $input ) {
-		echo '<tr class="empty-row">', self::repeat_cell( $input ) ,'</tr>';
+	private static function open_empty_row() {
+		echo '<tr class="empty-row">';
+		echo '<td>';
 	}
 
-	/**
-	 * Generates table cell markup for repeatable fields
-	 * @since  1.0.0
-	 * @param  string $input Text input field
-	 * @return string        HTML table cell markup
-	 */
-	private static function repeat_cell( $input ) {
-		return '<td>'. $input .'</td><td class="remove-row"><a class="button remove-row-button" href="#">'. __( 'Remove', 'cmb' ) .'</a></td>';
+	private static function close_repeat_row() {
+		echo '</td><td class="remove-row"><a class="button remove-row-button" href="#">'. __( 'Remove', 'cmb' ) .'</a></td>';
+		echo '</tr>';
 	}
 
 	/**
@@ -262,75 +246,77 @@ public static function esc( $meta_value, $func = '' ) {
 		$func       = is_string( $func ) && ! empty( $func ) ? $func : 'esc_attr';
 		$meta_value = ! empty( $meta_value ) ? $meta_value : $field['default'];
 
-		return call_user_func( $func, $meta_value );
+		if ( is_array( $meta_value ) ) {
+			foreach ( $meta_value as $key => $value ) {
+				$meta_value[ $key ] = call_user_func( $func, $value );
+			}
+		} else {
+			$meta_value = call_user_func( $func, $meta_value );
+		}
+
+		return $meta_value;
+	}
+
+	public static function _name( $suffix ) {
+		return cmb_Meta_Box::$field['id'] . $suffix . ( cmb_Meta_Box::$field['repeatable'] ? '[]' : '' );
+	}
+
+	public static function _id( $suffix = '' ) {
+		return cmb_Meta_Box::$field['id'] . $suffix . ( cmb_Meta_Box::$field['repeatable'] ? '_'. self::$iterator .'" data-iterator="'. self::$iterator : '' );
 	}
 
+	public static function _input( $meta, $args = array() ) {
+		$args = wp_parse_args( $args, array(
+			'classes' => 'regular-text',
+			'type' => 'text',
+		) );
+		return '<input type="'. $args['type'] .'" class="'. $args['classes'] .'" name="'. self::_name() .'" id="'. self::_id(). '" value="'. self::esc( $meta ). '" />' . self::desc( true );
+	}
 
 	/**
 	 * Begin Field Types
 	 */
 
 	public static function text( $field, $meta ) {
-		if ( $field['repeatable'] ) {
-			return self::repeat_text_field( $meta );
-		}
-
-		echo '<input type="text" class="regular-text" name="', $field['id'], '" id="', $field['id'], '" value="', self::esc( $meta ), '" />', self::desc( true );
+		echo '<input type="text" class="regular-text" name="', self::_name(), '" id="', self::_id(), '" value="', self::esc( $meta ), '" />', self::desc( true );
 	}
 
 	public static function text_small( $field, $meta ) {
-		if ( $field['repeatable'] ) {
-			return self::repeat_text_field( $meta, 'cmb_text_small' );
-		}
-
-		echo '<input class="cmb_text_small" type="text" name="', $field['id'], '" id="', $field['id'], '" value="', self::esc( $meta ), '" />', self::desc();
+		echo '<input class="cmb_text_small" type="text" name="', self::_name(), '" id="', self::_id(), '" value="', self::esc( $meta ), '" />', self::desc();
 	}
 
 	public static function text_medium( $field, $meta ) {
-		if ( $field['repeatable'] ) {
-			return self::repeat_text_field( $meta, 'cmb_text_medium' );
-		}
-		echo '<input class="cmb_text_medium" type="text" name="', $field['id'], '" id="', $field['id'], '" value="', self::esc( $meta ), '" />', self::desc();
+		echo '<input class="cmb_text_medium" type="text" name="', self::_name(), '" id="', self::_id(), '" value="', self::esc( $meta ), '" />', self::desc();
 	}
 
 	public static function text_email( $field, $meta ) {
-		if ( $field['repeatable'] ) {
-			return self::repeat_text_field( $meta, 'cmb_text_email cmb_text_medium', 'email' );
-		}
-
-		echo '<input class="cmb_text_email cmb_text_medium" type="email" name="', $field['id'], '" id="', $field['id'], '" value="', self::esc( $meta ), '" />', self::desc( true );
+		echo '<input class="cmb_text_email cmb_text_medium" type="email" name="', self::_name(), '" id="', self::_id(), '" value="', self::esc( $meta ), '" />', self::desc( true );
 	}
 
 	public static function text_url( $field, $meta ) {
-		if ( $field['repeatable'] ) {
-			return self::repeat_text_field( $meta, 'cmb_text_url cmb_text_medium' );
-		}
-
-		echo '<input class="cmb_text_url cmb_text_medium regular-text" type="text" name="', $field['id'], '" id="', $field['id'], '" value="', self::esc( $meta, 'esc_url' ), '" />', self::desc( true );
+		echo '<input class="cmb_text_url cmb_text_medium regular-text" type="text" name="', self::_name(), '" id="', self::_id(), '" value="', self::esc( $meta, 'esc_url' ), '" />', self::desc( true );
 	}
 
 	public static function text_date( $field, $meta ) {
-		echo '<input class="cmb_text_small cmb_datepicker" type="text" name="', $field['id'], '" id="', $field['id'], '" value="', self::esc( $meta ), '" />', self::desc();
+		echo '<input class="cmb_text_small cmb_datepicker" type="text" name="', self::_name(), '" id="', self::_id(), '" value="', self::esc( $meta ), '" />', self::desc();
 	}
 
 	public static function text_date_timestamp( $field, $meta ) {
-		echo '<input class="cmb_text_small cmb_datepicker" type="text" name="', $field['id'], '" id="', $field['id'], '" value="', ! empty( $meta ) ? date( 'm\/d\/Y', $meta ) : $field['default'], '" />', self::desc();
+		echo '<input class="cmb_text_small cmb_datepicker" type="text" name="', self::_name(), '" id="', self::_id(), '" value="', ! empty( $meta ) ? date( 'm\/d\/Y', $meta ) : $field['default'], '" />', self::desc();
 	}
 
 	public static function text_datetime_timestamp( $field, $meta, $object_id ) {
-
 		// This will be used if there is a select_timezone set for this field
 		$tz_offset = cmb_Meta_Box::field_timezone_offset( $object_id );
 		if ( ! empty( $tz_offset ) ) {
 			$meta -= $tz_offset;
 		}
 
-		echo '<input class="cmb_text_small cmb_datepicker" type="text" name="', $field['id'], '[date]" id="', $field['id'], '_date" value="', ! empty( $meta ) ? date( 'm\/d\/Y', $meta ) : $field['default'], '" />';
-		echo '<input class="cmb_timepicker text_time" type="text" name="', $field['id'], '[time]" id="', $field['id'], '_time" value="', ! empty( $meta ) ? date( 'h:i A', $meta ) : $field['default'], '" />', self::desc();
+		echo '<input class="cmb_text_small cmb_datepicker" type="text" name="', self::_name( '[date]' ), '" id="', self::_id( '_date' ) ,'" value="', ! empty( $meta ) ? date( 'm\/d\/Y', $meta ) : $field['default'], '" />';
+		echo '<input class="cmb_timepicker text_time" type="text" name="', self::_name( '[time]' ), '" id="', self::_id( '_time' ) ,'" value="', ! empty( $meta ) ? date( 'h:i A', $meta ) : $field['default'], '" />', self::desc();
 	}
 
 	public static function text_datetime_timestamp_timezone( $field, $meta ) {
-
 		$datetime = unserialize( $meta );
 		$meta = $tzstring = false;
 
@@ -341,16 +327,16 @@ public static function text_datetime_timestamp_timezone( $field, $meta ) {
 			$meta = $datetime->getTimestamp() + $tz->getOffset( new DateTime('NOW') );
 		}
 
-		echo '<input class="cmb_text_small cmb_datepicker" type="text" name="', $field['id'], '[date]" id="', $field['id'], '_date" value="', ! empty( $meta ) ? date( 'm\/d\/Y', $meta ) : $field['default'], '" />';
-		echo '<input class="cmb_timepicker text_time" type="text" name="', $field['id'], '[time]" id="', $field['id'], '_time" value="', ! empty( $meta ) ? date( 'h:i A', $meta ) : $field['default'], '" />';
+		echo '<input class="cmb_text_small cmb_datepicker" type="text" name="', self::_name( '[date]' ), '" id="', self::_id( '_date' ) ,'" value="', ! empty( $meta ) ? date( 'm\/d\/Y', $meta ) : $field['default'], '" />';
+		echo '<input class="cmb_timepicker text_time" type="text" name="', self::_name( '[time]' ), '" id="', self::_id( '_time' ) ,'" value="', ! empty( $meta ) ? date( 'h:i A', $meta ) : $field['default'], '" />';
 
-		echo '<select name="', $field['id'], '[timezone]" id="', $field['id'], '_timezone">';
+		echo '<select name="', self::_name( '[timezone]' ), '" id="', self::_id( '_timezone' ) ,'">';
 		echo wp_timezone_choice( $tzstring );
 		echo '</select>', self::desc();
 	}
 
 	public static function text_time( $field, $meta ) {
-		echo '<input class="cmb_timepicker text_time" type="text" name="', $field['id'], '" id="', $field['id'], '" value="', self::esc( $meta ), '" />', self::desc();
+		echo '<input class="cmb_timepicker text_time" type="text" name="', self::_name(), '" id="', self::_id(), '" value="', self::esc( $meta ), '" />', self::desc();
 	}
 
 	public static function select_timezone( $field, $meta ) {
@@ -358,17 +344,13 @@ public static function select_timezone( $field, $meta ) {
 		if ( '' === $meta )
 			$meta = cmb_Meta_Box::timezone_string();
 
-		echo '<select name="', $field['id'], '" id="', $field['id'], '">';
+		echo '<select name="', self::_name(), '" id="', self::_id(), '">';
 		echo wp_timezone_choice( $meta );
 		echo '</select>';
 	}
 
 	public static function text_money( $field, $meta ) {
-		if ( $field['repeatable'] ) {
-			return self::repeat_text_field( $meta, 'cmb_text_money' );
-		}
-
-		echo ! empty( $field['before'] ) ? '' : '$', ' <input class="cmb_text_money" type="text" name="', $field['id'], '" id="', $field['id'], '" value="', self::esc( $meta ), '" />', self::desc();
+		echo ! empty( $field['before'] ) ? '' : '$', ' <input class="cmb_text_money" type="text" name="', self::_name(), '" id="', self::_id(), '" value="', self::esc( $meta ), '" />', self::desc();
 	}
 
 	public static function colorpicker( $field, $meta ) {
@@ -378,31 +360,31 @@ public static function colorpicker( $field, $meta ) {
 			$meta = '#' . $meta;
 		elseif ( ! preg_match( '/^#' . $hex_color . '/i', $meta ) ) // Value doesn't match #123abc, so sanitize to just #.
 			$meta = "#";
-		echo '<input class="cmb_colorpicker cmb_text_small" type="text" name="', $field['id'], '" id="', $field['id'], '" value="', $meta, '" />', self::desc();
+		echo '<input class="cmb_colorpicker cmb_text_small" type="text" name="', self::_name(), '" id="', self::_id(), '" value="', $meta, '" />', self::desc();
 	}
 
 	public static function textarea( $field, $meta ) {
-		echo '<textarea name="', $field['id'], '" id="', $field['id'], '" cols="60" rows="10">', self::esc( $meta, 'esc_textarea' ), '</textarea>', self::desc( true );
+		echo '<textarea name="', self::_name(), '" id="', self::_id(), '" cols="60" rows="10">', self::esc( $meta, 'esc_textarea' ), '</textarea>', self::desc( true );
 	}
 
 	public static function textarea_small( $field, $meta ) {
-		echo '<textarea name="', $field['id'], '" id="', $field['id'], '" cols="60" rows="4">', self::esc( $meta, 'esc_textarea' ), '</textarea>', self::desc( true );
+		echo '<textarea name="', self::_name(), '" id="', self::_id(), '" cols="60" rows="4">', self::esc( $meta, 'esc_textarea' ), '</textarea>', self::desc( true );
 	}
 
 	public static function textarea_code( $field, $meta ) {
-		echo '<pre><textarea name="', $field['id'], '" id="', $field['id'], '" cols="60" rows="10" class="cmb_textarea_code">', ! empty( $meta ) ? $meta : $field['default'], '</textarea></pre>', self::desc( true );
+		echo '<pre><textarea name="', self::_name(), '" id="', self::_id(), '" cols="60" rows="10" class="cmb_textarea_code">', ! empty( $meta ) ? $meta : $field['default'], '</textarea></pre>', self::desc( true );
 	}
 
 	public static function select( $field, $meta ) {
 		$meta = self::esc( $meta );
-		echo '<select name="', $field['id'], '" id="', $field['id'], '">';
+		echo '<select name="', self::_name(), '" id="', self::_id(), '">';
 		foreach ( $field['options'] as $option_key => $option ) {
 
 			// Check for the "old" way
 			$label = isset( $option['name'] ) ? $option['name'] : $option;
 			$value = isset( $option['value'] ) ? $option['value'] : $option_key;
 
-			echo '<option value="', $value, '" ', selected( $meta == $value ) ,'>', $label, '</option>';
+			echo '<option value="', $value, '" ', selected( $meta, $value ) ,'>', $label, '</option>';
 
 		}
 		echo '</select>', self::desc( true );
@@ -418,7 +400,7 @@ public static function radio( $field, $meta ) {
 			$label = isset( $option['name'] ) ? $option['name'] : $option;
 			$value = isset( $option['value'] ) ? $option['value'] : $option_key;
 
-			echo '<li class="cmb_option"><input type="radio" name="', $field['id'], '" id="', $field['id'], $i,'" value="', $value, '" ', checked( $meta == $value ), ' /> <label for="', $field['id'], $i, '">', $label ,'</label></li>';
+			echo '<li class="cmb_option"><input type="radio" name="', self::_name() ,'" id="', self::_id( $i ) ,'" value="', $value, '" ', checked( $meta, $value ), ' /> <label for="', self::_id( $i ) ,'">', $label ,'</label></li>';
 			$i++;
 		}
 		echo '</ul>', self::desc( true );
@@ -429,14 +411,14 @@ public static function radio_inline( $field, $meta ) {
 	}
 
 	public static function checkbox( $field, $meta ) {
-		echo '<input class="cmb_option" type="checkbox" name="', $field['id'], '" id="', $field['id'], '" ', checked( ! empty( $meta ) ), ' value="on"/> <label for="', $field['id'], '">', self::desc() ,'</label>';
+		echo '<input class="cmb_option" type="checkbox" name="', self::_name(), '" id="', self::_id(), '" ', checked( ! empty( $meta ) ), ' value="on"/> <label for="', $field['id'], '">', self::desc() ,'</label>';
 	}
 
 	public static function multicheck( $field, $meta ) {
 		echo '<ul>';
 		$i = 1;
 		foreach ( $field['options'] as $value => $name ) {
-			echo '<li><input class="cmb_option" type="checkbox" name="', $field['id'], '[]" id="', $field['id'], $i, '" value="', $value, '" ', checked( is_array( $meta ) && in_array( $value, $meta ) ), '  /> <label for="', $field['id'], $i, '">', $name, '</label></li>';
+			echo '<li><input class="cmb_option" type="checkbox" name="', self::_name(), '[]" id="', self::_id( $i ) ,'" value="', $value, '" ', checked( is_array( $meta ) && in_array( $value, $meta ) ), '  /> <label for="', self::_id( $i ) ,'">', $name, '</label></li>';
 			$i++;
 		}
 		echo '</ul>', self::desc();
@@ -458,7 +440,7 @@ public static function wysiwyg( $field, $meta ) {
 
 	public static function taxonomy_select( $field, $meta, $object_id ) {
 
-		echo '<select name="', $field['id'], '" id="', $field['id'], '">';
+		echo '<select name="', self::_name(), '" id="', self::_id(), '">';
 		$names = self::get_object_terms( $object_id, $field['taxonomy'] );
 		$terms = get_terms( $field['taxonomy'], 'hide_empty=0' );
 		foreach ( $terms as $term ) {
@@ -472,15 +454,15 @@ public static function taxonomy_select( $field, $meta, $object_id ) {
 	}
 
 	public static function taxonomy_radio( $field, $meta, $object_id ) {
-
 		$names = self::get_object_terms( $object_id, $field['taxonomy'] );
 		$terms = get_terms( $field['taxonomy'], 'hide_empty=0' );
+
 		echo '<ul>';
 		$i = 1;
 		foreach ( $terms as $term ) {
 			$checked = ( !is_wp_error( $names ) && !empty( $names ) && !strcmp( $term->slug, $names[0]->slug ) );
 
-			echo '<li class="cmb_option"><input type="radio" name="', $field['id'], '" id="', $field['id'], $i,'" value="'. $term->slug . '" ', checked( $checked ), ' /> <label for="', $field['id'], $i, '">' . $term->name . '</label></li>';
+			echo '<li class="cmb_option"><input type="radio" name="', self::_name(), '" id="', self::_id( $i ) ,'" value="'. $term->slug . '" ', checked( $checked ), ' /> <label for="', self::_id( $i ) , '">' . $term->name . '</label></li>';
 			$i++;
 		}
 		echo '</ul>', self::desc( true );
@@ -491,18 +473,24 @@ public static function taxonomy_radio_inline( $field, $meta ) {
 	}
 
 	public static function taxonomy_multicheck( $field, $meta, $object_id ) {
-		echo '<ul>';
 		$names = self::get_object_terms( $object_id, $field['taxonomy'] );
+		echo '<ul>';
 		$terms = get_terms( $field['taxonomy'], 'hide_empty=0' );
 		$i = 1;
-		foreach ( $terms as $term ) {
-			echo '<li><input class="cmb_option" type="checkbox" name="', $field['id'], '[]" id="', $field['id'], $i,'" value="'. $term->slug . '" ';
-			foreach ($names as $name) {
-				checked( $term->slug == $name->slug );
+		if ( $names ) {
+
+			foreach ( $terms as $term ) {
+				echo '<li><input class="cmb_option" type="checkbox" name="', self::_name(), '[]" id="', self::_id( $i )  ,'" value="'. $term->slug . '" ';
+				foreach ($names as $name) {
+					checked( $term->slug == $name->slug );
+				}
+
+				echo ' /> <label for="', self::_id( $i )  ,'">' . $term->name . '</label></li>';
+				$i++;
 			}
+		} else {
+			echo '<li><label>'. __( 'No terms', 'cmb' ) .'</label></li>';
 
-			echo ' /> <label for="', $field['id'], $i, '">' . $term->name . '</label></li>';
-			$i++;
 		}
 		echo '</ul>', self::desc();
 	}
@@ -512,11 +500,10 @@ public static function taxonomy_multicheck_inline( $field, $meta ) {
 	}
 
 	public static function file_list( $field, $meta, $object_id ) {
-
-		echo '<input class="cmb_upload_file cmb_upload_list" type="hidden" size="45" id="', $field['id'], '" name="', $field['id'], '" value="" />';
+		echo '<input class="cmb_upload_file cmb_upload_list" type="hidden" size="45" id="', self::_id(), '" name="', self::_name() ,'" value="" />';
 		echo '<input class="cmb_upload_button button cmb_upload_list" type="button" value="'. __( 'Add or Upload File', 'cmb' ) .'" />', self::desc( true );
 
-		echo '<ul id="', $field['id'], '_status" class="cmb_media_status attach_list">';
+		echo '<ul id="', self::_id( '_status' ) ,'" class="cmb_media_status attach_list">';
 
 		if ( $meta ) {
 
@@ -547,14 +534,17 @@ public static function file_list( $field, $meta, $object_id ) {
 	}
 
 	public static function file( $field, $meta, $object_id, $object_type ) {
-
 		$input_type_url = 'hidden';
 		if ( 'url' == $field['allow'] || ( is_array( $field['allow'] ) && in_array( 'url', $field['allow'] ) ) )
 			$input_type_url = 'text';
-		echo '<input class="cmb_upload_file" type="' . $input_type_url . '" size="45" id="', $field['id'], '" name="', $field['id'], '" value="', $meta, '" />';
+		echo '<input class="cmb_upload_file" type="' . $input_type_url . '" size="45" id="', self::_id(), '" name="', self::_name(), '" value="', $meta, '" />';
 		echo '<input class="cmb_upload_button button" type="button" value="'. __( 'Add or Upload File', 'cmb' ) .'" />';
 
-		$_id_name = $field['id'] .'_id';
+		$_id_name = $field['id'];
+		if ( $field['repeatable'] ) {
+			$_id_name .= '_' . self::$iterator;
+		}
+		$_id_name .= '_id';
 
 		$_id_meta = cmb_Meta_Box::get_data( $_id_name );
 
@@ -565,7 +555,7 @@ public static function file( $field, $meta, $object_id, $object_type ) {
 
 		echo '<input class="cmb_upload_file_id" type="hidden" id="', $_id_name, '" name="', $_id_name, '" value="', $_id_meta, '" />',
 		self::desc( true ),
-		'<div id="', $field['id'], '_status" class="cmb_media_status">';
+		'<div id="', self::_id( '_status' ) ,'" class="cmb_media_status">';
 			if ( ! empty( $meta ) ) {
 
 				if ( self::is_valid_img_ext( $meta ) ) {
@@ -586,46 +576,20 @@ public static function file( $field, $meta, $object_id, $object_type ) {
 	}
 
 	public static function oembed( $field, $meta, $object_id, $object_type ) {
-		echo '<input class="cmb_oembed regular-text" type="text" name="', $field['id'], '" id="', $field['id'], '" value="', self::esc( $meta ), '" data-objectid="', $object_id ,'" data-objecttype="', $object_type ,'" />', self::desc( true );
+		echo '<input class="cmb_oembed regular-text" type="text" name="', self::_name(), '" id="', self::_id(), '" value="', self::esc( $meta ), '" data-objectid="', $object_id ,'" data-objecttype="', $object_type ,'" />', self::desc( true );
 		echo '<p class="cmb-spinner spinner" style="display:none;"><img src="'. admin_url( '/images/wpspin_light.gif' ) .'" alt="spinner"/></p>';
-		echo '<div id="', $field['id'], '_status" class="cmb_media_status ui-helper-clearfix embed_wrap">';
+		echo '<div id="',self::_id( '_status' ) ,'" class="cmb_media_status ui-helper-clearfix embed_wrap">';
 
 			if ( $meta != '' )
 				echo cmb_Meta_Box_ajax::get_oembed( $meta, $object_id, array(
 					'object_type' => $object_type,
 					'oembed_args' => array( 'width' => '640' ),
-					'field_id'    => $field['id'],
+					'field_id'    => self::_id(),
 				) );
 
 		echo '</div>';
 	}
 
-	/**
-	 * Deprecated methods. use cmb_Meta_Box_types::repeat( true/false ) to toggle repeatable
-	 */
-
-	public static function text_repeat( $field, $meta ) {
-		self::repeat_text_field( $meta );
-	}
-	public static function text_small_repeat( $field, $meta ) {
-		self::repeat_text_field( $meta, 'cmb_text_small' );
-	}
-	public static function text_medium_repeat( $field, $meta ) {
-		self::repeat_text_field( $meta, 'cmb_text_medium' );
-	}
-	public static function text_email_repeat( $field, $meta ) {
-		self::repeat_text_field( $meta, 'cmb_text_email cmb_text_medium', 'email' );
-	}
-	public static function text_url_repeat( $field, $meta ) {
-		$val = self::esc( $meta );
-		$protocols = isset( $field['protocols'] ) ? (array) $field['protocols'] : null;
-		$val = $val ? esc_url( $val, $protocols ) : '';
-		self::repeat_text_field( $val, 'cmb_text_url cmb_text_medium' );
-	}
-	public static function text_money_repeat( $field, $meta ) {
-		self::repeat_text_field( $meta, 'cmb_text_money' );
-	}
-
 
 	/**
 	 * Default fallback. Allows rendering fields via "cmb_render_$name" hook
diff --git a/init.php b/init.php
index 743e0ca..2691a85 100644
--- a/init.php
+++ b/init.php
@@ -227,7 +227,7 @@ public function register_scripts() {
 		$min = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
 		// scripts required for cmb
-		$scripts = array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', /*'media-upload', */'cmb-timepicker' );
+		$scripts = array( 'jquery', 'jquery-ui-core', 'cmb-datepicker', /*'media-upload', */'cmb-timepicker' );
 		// styles required for cmb
 		$styles = array();
 
@@ -251,6 +251,7 @@ public function register_scripts() {
 			$scripts[] = 'farbtastic';
 			$styles[] = 'farbtastic';
 		}
+		wp_register_script( 'cmb-datepicker', CMB_META_BOX_URL . 'js/jquery.datePicker.min.js' );
 		wp_register_script( 'cmb-timepicker', CMB_META_BOX_URL . 'js/jquery.timePicker.min.js' );
 		wp_register_script( 'cmb-scripts', CMB_META_BOX_URL .'js/cmb'. $min .'.js', $scripts, self::CMB_VERSION );
 
@@ -426,7 +427,11 @@ public static function show_form( $meta_box, $object_id = 0, $object_type = '' )
 
 			echo empty( $field['before'] ) ? '' : $field['before'];
 
-			call_user_func( array( $types, $field['type'] ), $field, $meta, $object_id, $object_type );
+			if ( true == $field['repeatable'] ) {
+				call_user_func( array( $types, 'render_repeatable_field' ), $field, $meta, $object_id, $object_type );
+			} else {
+				call_user_func( array( $types, $field['type'] ), $field, $meta, $object_id, $object_type );
+			}
 
 			echo empty( $field['after'] ) ? '' : $field['after'];
 
diff --git a/js/cmb.js b/js/cmb.js
index f7840fd..3b119f8 100644
--- a/js/cmb.js
+++ b/js/cmb.js
@@ -20,7 +20,7 @@
 	// Move CMB functionality to an object
 	window.CMB = {
 		formfield : '',
-		iterator: 0,
+		idNumber  : false,
 		file_frames: {},
 
 		init: function() {
@@ -32,56 +32,20 @@
 			}
 
 			/**
-			 * Initialize timepicker (this will be moved inline in a future release)
+			 * Initialize time/date/color pickers
 			 */
-			$('.cmb_timepicker').each( function() {
-				$('#' + jQuery(this).attr('id')).timePicker({
-					startTime: "07:00",
-					endTime: "22:00",
-					show24Hours: false,
-					separator: ':',
-					step: 30
-				});
-			});
+			CMB.initPickers();
 
-			/**
-			 * Initialize jQuery UI datepicker (this will be moved inline in a future release)
-			 */
-			$('.cmb_datepicker').each( function() {
-				$('#' + jQuery(this).attr('id')).datepicker();
-				// $('#' + jQuery(this).attr('id')).datepicker({ dateFormat: 'yy-mm-dd' });
-				// For more options see http://jqueryui.com/demos/datepicker/#option-dateFormat
-			});
 			// Wrap date picker in class to narrow the scope of jQuery UI CSS and prevent conflicts
 			$("#ui-datepicker-div").wrap('<div class="cmb_element" />');
 
-			/**
-			 * Initialize color picker
-			 */
-			if (typeof jQuery.wp === 'object' && typeof jQuery.wp.wpColorPicker === 'function') {
-				$('input:text.cmb_colorpicker').wpColorPicker();
-			} else {
-				$('input:text.cmb_colorpicker').each( function(i) {
-					$(this).after('<div id="picker-' + i + '" style="z-index: 1000; background: #EEE; border: 1px solid #CCC; position: absolute; display: block;"></div>');
-					$('#picker-' + i).hide().farbtastic($(this));
-				})
-				.focus( function() {
-					$(this).next().show();
-				})
-				.blur( function() {
-					$(this).next().hide();
-				});
-			}
-
 
 			/**
 			 * File and image upload handling
 			 */
-
-
 			$('.cmb_metabox')
 			.on( 'change', '.cmb_upload_file', function() {
-				CMB.formfield = $(this).attr('name');
+				CMB.formfield = $(this).attr('id');
 				$('#' + CMB.formfield + '_id').val("");
 			})
 			.on( 'click', '.cmb_upload_button', function(event) {
@@ -89,7 +53,7 @@
 				event.preventDefault();
 
 				var $self = $(this);
-				CMB.formfield = $self.prev('input').attr('name');
+				CMB.formfield = $self.prev('input').attr('id');
 				var $formfield = $('#'+CMB.formfield);
 				var uploadStatus = true;
 				var attachment = true;
@@ -198,31 +162,39 @@
 			.on( 'click', '.add-row-button', function(e) {
 
 				e.preventDefault();
-				self = $(this);
-
-				var tableselector = '#'+ self.data('selector');
-				var $table = $(tableselector);
-				var row = $('.empty-row', $table).clone(true);
-				row.removeClass('empty-row').addClass('repeat-row');
-				row.insertBefore( tableselector +' tbody>tr:last' );
-				var input = $('input.cmb_datepicker',row);
-				var id = input.attr('id');
-				input.attr('id', id + CMB.iterator );
-				CMB.iterator++;
-
-				// @todo Make a colorpicker field repeatable
-				// row.find('.wp-color-result').remove();
-				// row.find('input:text.cmb_colorpicker').wpColorPicker();
 
+				var $self         = $(this);
+				var tableselector = '#'+ $self.data('selector');
+				var inputselector = tableselector.slice(1,tableselector.lastIndexOf('repeat'));
+				var $table        = $(tableselector).data('numberels', CMB.idNumber );
+				var $emptyrow     = $table.find('.empty-row');
+				CMB.idNumber      = parseInt( $emptyrow.find('input').data('iterator') ) + 1;
+				var $row          = $emptyrow.clone();
+				var $newInput     = $row.find('input');
+
+				CMB.log( $newInput.attr('id'), $newInput.data('iterator'));
+
+				$newInput.val('').attr( 'id', inputselector + (CMB.idNumber) ).attr('data-iterator', CMB.idNumber ).data('iterator', CMB.idNumber );
+				$emptyrow.removeClass('empty-row').addClass('repeat-row');
+				$emptyrow.after( $row );
+
+				// Init new timepicker and datepicker entries
+				CMB.initPickers();
 			})
 			.on( 'click', '.remove-row-button', function(e) {
 				e.preventDefault();
-				var $self = $(this);
-				var $parent = $self.parents('.cmb-repeat-table');
-				CMB.log( 'number of tbodys', $parent.length );
-				CMB.log( 'number of trs', $('tr', $parent).length );
-				if ( $('tr', $parent).length > 2 )
+				var $self   = $(this);
+				var $parent = $self.parents('tr');
+				var $table  = $self.parents('.cmb-repeat-table');
+
+				CMB.log( 'number of tbodys', $table.length );
+				CMB.log( 'number of trs', $('tr', $table).length );
+				if ( $('tr', $table).length > 1 ) {
+					if ( $parent.hasClass('empty-row') ) {
+						$parent.prev().addClass( 'empty-row' ).removeClass('repeat-row');
+					}
 					$self.parents('.cmb-repeat-table tr').remove();
+				}
 			})
 
 			/**
@@ -258,6 +230,87 @@
 
 		},
 
+		/**
+		 * @todo make work, always
+		 */
+		initPickers: function() {
+			// Initialize timepicker
+			CMB.initTimePickers();
+
+			// Initialize jQuery UI datepicker
+			CMB.initDatePickers();
+
+			// Initialize color picker
+			CMB.initColorPickers();
+		},
+
+		initTimePickers: function() {
+			$('input:text.cmb_timepicker').each( function() {
+				var $clone = $(this);
+				// var $picker = $('#' + $(this).attr('id'));
+				// var $clone = $picker.clone();
+				// $picker.after( $clone );
+				// $picker.remove();
+				CMB.initTimePicker( $clone );
+			});
+		},
+
+		initTimePicker: function($target) {
+			$('#' + $target.attr('id')).timePicker({
+				startTime: "00:00",
+				endTime: "23:59",
+				show24Hours: false,
+				separator: ':',
+				step: 30
+			});
+		},
+
+		initDatePickers: function() {
+			$('.cmb_datepicker').each( function() {
+				// var $picker = $('#' + $(this).attr('id'));
+				CMB.initDatePicker($(this));
+			});
+		},
+
+		initDatePicker: function($target) {
+			$target.datepicker( "destroy" );
+			$target.datepicker();
+			// $('#' + jQuery(this).attr('id')).datepicker({ dateFormat: 'yy-mm-dd' });
+			// For more options see http://jqueryui.com/demos/datepicker/#option-dateFormat
+		},
+
+		initColorPickers: function() {
+			if (typeof jQuery.wp === 'object' && typeof jQuery.wp.wpColorPicker === 'function') {
+
+				$('input:text.cmb_colorpicker').each( function() {
+					var $picker = $(this);
+					var $clone = $picker.clone();
+					$picker.after( $clone );
+					$picker.remove();
+					$clone.wpColorPicker();
+				});
+
+			} else {
+				$('input:text.cmb_colorpicker').each( function(i) {
+					$(this).after('<div id="picker-' + i + '" style="z-index: 1000; background: #EEE; border: 1px solid #CCC; position: absolute; display: block;"></div>');
+					$('#picker-' + i).hide().farbtastic($(this));
+				})
+				.focus( function() {
+					$(this).next().show();
+				})
+				.blur( function() {
+					$(this).next().hide();
+				});
+			}
+		},
+
+		initColorPicker: function($target) {
+			$target.datepicker( "destroy" );
+			$target.datepicker();
+			// $('#' + jQuery(this).attr('id')).datepicker({ dateFormat: 'yy-mm-dd' });
+			// For more options see http://jqueryui.com/demos/datepicker/#option-dateFormat
+		},
+
 		/**
 		 * Safely log things if query var is set
 		 * @since  1.0.0
diff --git a/js/cmb.min.js b/js/cmb.min.js
index 9949e2b..f3ac04f 100644
--- a/js/cmb.min.js
+++ b/js/cmb.min.js
@@ -1,9 +1,6 @@
-(function(b,a,c,d){b.CMB={formfield:"",iterator:0,file_frames:{},init:function(){CMB.log(b.cmb_l10);if(b.cmb_l10.new_admin_style){c(".cmb-spinner img").hide();
-}c(".cmb_timepicker").each(function(){c("#"+jQuery(this).attr("id")).timePicker({startTime:"07:00",endTime:"22:00",show24Hours:false,separator:":",step:30});
-});c(".cmb_datepicker").each(function(){c("#"+jQuery(this).attr("id")).datepicker();});c("#ui-datepicker-div").wrap('<div class="cmb_element" />');if(typeof jQuery.wp==="object"&&typeof jQuery.wp.wpColorPicker==="function"){c("input:text.cmb_colorpicker").wpColorPicker();
-}else{c("input:text.cmb_colorpicker").each(function(e){c(this).after('<div id="picker-'+e+'" style="z-index: 1000; background: #EEE; border: 1px solid #CCC; position: absolute; display: block;"></div>');
-c("#picker-"+e).hide().farbtastic(c(this));}).focus(function(){c(this).next().show();}).blur(function(){c(this).next().hide();});}c(".cmb_metabox").on("change",".cmb_upload_file",function(){CMB.formfield=c(this).attr("name");
-c("#"+CMB.formfield+"_id").val("");}).on("click",".cmb_upload_button",function(f){f.preventDefault();var j=c(this);CMB.formfield=j.prev("input").attr("name");
+(function(b,a,c,d){b.CMB={formfield:"",idNumber:false,file_frames:{},init:function(){CMB.log(b.cmb_l10);if(b.cmb_l10.new_admin_style){c(".cmb-spinner img").hide();
+}CMB.initPickers();c("#ui-datepicker-div").wrap('<div class="cmb_element" />');c(".cmb_metabox").on("change",".cmb_upload_file",function(){CMB.formfield=c(this).attr("id");
+c("#"+CMB.formfield+"_id").val("");}).on("click",".cmb_upload_button",function(f){f.preventDefault();var j=c(this);CMB.formfield=j.prev("input").attr("id");
 var i=c("#"+CMB.formfield);var e=true;var h=true;var g=j.hasClass("cmb_upload_list");if(CMB.formfield in CMB.file_frames){CMB.file_frames[CMB.formfield].open();
 return;}CMB.file_frames[CMB.formfield]=wp.media.frames.file_frame=wp.media({title:c("label[for="+CMB.formfield+"]").text(),button:{text:b.cmb_l10.upload_file},multiple:g?true:false});
 CMB.file_frames[CMB.formfield].on("select",function(){if(g){h=CMB.file_frames[CMB.formfield].state().get("selection").toJSON();i.val(h.url);c("#"+CMB.formfield+"_id").val(h.id);
@@ -14,13 +11,20 @@ i.val(h.url);c("#"+CMB.formfield+"_id").val(h.id);if(h.type&&h.type==="image"){e
 }else{e=cmb_l10.file+" <strong>"+h.filename+'</strong>&nbsp;&nbsp;&nbsp; (<a href="'+h.url+'" target="_blank" rel="external">'+cmb_l10.download+'</a> / <a href="#" class="cmb_remove_file_button" rel="'+CMB.formfield+'">'+cmb_l10.remove_file+"</a>)";
 }i.siblings(".cmb_media_status").slideDown().html(e);}});CMB.file_frames[CMB.formfield].open();}).on("click",".cmb_remove_file_button",function(e){var g=c(this);
 if(g.is(".attach_list .cmb_remove_file_button")){g.parents("li").remove();return false;}CMB.formfield=g.attr("rel");var f=g.parents(".img_status");c("input#"+CMB.formfield).val("");
-c("input#"+CMB.formfield+"_id").val("");if(!f.length){g.parents(".cmb_media_status").html("");}else{f.html("");}return false;}).on("click",".add-row-button",function(i){i.preventDefault();
-self=c(this);var h="#"+self.data("selector");var g=c(h);var j=c(".empty-row",g).clone(true);j.removeClass("empty-row").addClass("repeat-row");j.insertBefore(h+" tbody>tr:last");
-var f=c("input.cmb_datepicker",j);var k=f.attr("id");f.attr("id",k+CMB.iterator);CMB.iterator++;}).on("click",".remove-row-button",function(g){g.preventDefault();
-var h=c(this);var f=h.parents(".cmb-repeat-table");CMB.log("number of tbodys",f.length);CMB.log("number of trs",c("tr",f).length);if(c("tr",f).length>2){h.parents(".cmb-repeat-table tr").remove();
-}}).on("keyup",".cmb_oembed",function(e){CMB.doAjax(c(this),e);});c(".cmb_oembed").bind("paste",function(g){var f=c(this);setTimeout(function(){CMB.doAjax(f,"paste");
-},100);}).blur(function(){setTimeout(function(){CMB.spinner(".postbox table.cmb_metabox",true);},2000);});setTimeout(CMB.resizeoEmbeds,500);c(b).on("resize",CMB.resizeoEmbeds);
-},log:function(){if(b.cmb_l10.script_debug&&console&&typeof console.log==="function"){console.log.apply(console,arguments);}},spinner:function(f,e){if(e){c(".cmb-spinner",f).hide();
+c("input#"+CMB.formfield+"_id").val("");if(!f.length){g.parents(".cmb_media_status").html("");}else{f.html("");}return false;}).on("click",".add-row-button",function(l){l.preventDefault();
+var m=c(this);var j="#"+m.data("selector");var k=j.slice(1,j.lastIndexOf("repeat"));var h=c(j).data("numberels",CMB.idNumber);var i=h.find(".empty-row");
+CMB.idNumber=parseInt(i.find("input").data("iterator"))+1;var f=i.clone();var g=f.find("input");CMB.log(g.attr("id"),g.data("iterator"));g.val("").attr("id",k+(CMB.idNumber)).attr("data-iterator",CMB.idNumber).data("iterator",CMB.idNumber);
+i.removeClass("empty-row").addClass("repeat-row");i.after(f);CMB.initPickers();}).on("click",".remove-row-button",function(h){h.preventDefault();var i=c(this);
+var g=i.parents("tr");var f=i.parents(".cmb-repeat-table");CMB.log("number of tbodys",f.length);CMB.log("number of trs",c("tr",f).length);if(c("tr",f).length>1){if(g.hasClass("empty-row")){g.prev().addClass("empty-row").removeClass("repeat-row");
+}i.parents(".cmb-repeat-table tr").remove();}}).on("keyup",".cmb_oembed",function(e){CMB.doAjax(c(this),e);});c(".cmb_oembed").bind("paste",function(g){var f=c(this);
+setTimeout(function(){CMB.doAjax(f,"paste");},100);}).blur(function(){setTimeout(function(){CMB.spinner(".postbox table.cmb_metabox",true);},2000);});setTimeout(CMB.resizeoEmbeds,500);
+c(b).on("resize",CMB.resizeoEmbeds);},initPickers:function(){CMB.initTimePickers();CMB.initDatePickers();CMB.initColorPickers();},initTimePickers:function(){c("input:text.cmb_timepicker").each(function(){var e=c(this);
+CMB.initTimePicker(e);});},initTimePicker:function(e){c("#"+e.attr("id")).timePicker({startTime:"00:00",endTime:"23:59",show24Hours:false,separator:":",step:30});
+},initDatePickers:function(){c(".cmb_datepicker").each(function(){CMB.initDatePicker(c(this));});},initDatePicker:function(e){e.datepicker("destroy");e.datepicker();
+},initColorPickers:function(){if(typeof jQuery.wp==="object"&&typeof jQuery.wp.wpColorPicker==="function"){c("input:text.cmb_colorpicker").each(function(){var e=c(this);
+var f=e.clone();e.after(f);e.remove();f.wpColorPicker();});}else{c("input:text.cmb_colorpicker").each(function(e){c(this).after('<div id="picker-'+e+'" style="z-index: 1000; background: #EEE; border: 1px solid #CCC; position: absolute; display: block;"></div>');
+c("#picker-"+e).hide().farbtastic(c(this));}).focus(function(){c(this).next().show();}).blur(function(){c(this).next().hide();});}},initColorPicker:function(e){e.datepicker("destroy");
+e.datepicker();},log:function(){if(b.cmb_l10.script_debug&&console&&typeof console.log==="function"){console.log.apply(console,arguments);}},spinner:function(f,e){if(e){c(".cmb-spinner",f).hide();
 }else{c(".cmb-spinner",f).show();}},doAjax:function(m,l){var h=m.val();if(h.length<6){return;}if(l==="paste"||l.which<=90&&l.which>=48||l.which>=96&&l.which<=111||l.which==8||l.which==9||l.which==187||l.which==190){var j=m.attr("id");
 var g=m.parents(".cmb_metabox tr td");var k=c(".embed_status",g);var f=m.width();var i=c(":first-child",k);f=(k.length&&i.length)?i.width():m.width();CMB.spinner(g);
 c(".embed_wrap",g).html("");setTimeout(function(){if(c(".cmb_oembed:focus").val()!=h){return;}c.ajax({type:"post",dataType:"json",url:b.cmb_l10.ajaxurl,data:{action:"cmb_oembed_handler",oembed_url:h,oembed_width:f>300?f:300,field_id:j,object_id:m.data("objectid"),object_type:m.data("objecttype"),cmb_ajax_nonce:b.cmb_l10.ajax_nonce},success:function(e){CMB.log(e);
diff --git a/js/jquery.datePicker.min.js b/js/jquery.datePicker.min.js
new file mode 100644
index 0000000..2e721f3
--- /dev/null
+++ b/js/jquery.datePicker.min.js
@@ -0,0 +1,2038 @@
+/*!
+ * jQuery UI Datepicker 1.10.4
+ * http://jqueryui.com
+ *
+ * Copyright 2014 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://api.jqueryui.com/datepicker/
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ */
+(function( $, undefined ) {
+
+$.extend($.ui, { datepicker: { version: "1.10.4" } });
+
+var PROP_NAME = "datepicker",
+	instActive;
+
+/* Date picker manager.
+   Use the singleton instance of this class, $.datepicker, to interact with the date picker.
+   Settings for (groups of) date pickers are maintained in an instance object,
+   allowing multiple different settings on the same page. */
+
+function Datepicker() {
+	this._curInst = null; // The current instance in use
+	this._keyEvent = false; // If the last event was a key event
+	this._disabledInputs = []; // List of date picker inputs that have been disabled
+	this._datepickerShowing = false; // True if the popup picker is showing , false if not
+	this._inDialog = false; // True if showing within a "dialog", false if not
+	this._mainDivId = "ui-datepicker-div"; // The ID of the main datepicker division
+	this._inlineClass = "ui-datepicker-inline"; // The name of the inline marker class
+	this._appendClass = "ui-datepicker-append"; // The name of the append marker class
+	this._triggerClass = "ui-datepicker-trigger"; // The name of the trigger marker class
+	this._dialogClass = "ui-datepicker-dialog"; // The name of the dialog marker class
+	this._disableClass = "ui-datepicker-disabled"; // The name of the disabled covering marker class
+	this._unselectableClass = "ui-datepicker-unselectable"; // The name of the unselectable cell marker class
+	this._currentClass = "ui-datepicker-current-day"; // The name of the current day marker class
+	this._dayOverClass = "ui-datepicker-days-cell-over"; // The name of the day hover marker class
+	this.regional = []; // Available regional settings, indexed by language code
+	this.regional[""] = { // Default regional settings
+		closeText: "Done", // Display text for close link
+		prevText: "Prev", // Display text for previous month link
+		nextText: "Next", // Display text for next month link
+		currentText: "Today", // Display text for current month link
+		monthNames: ["January","February","March","April","May","June",
+			"July","August","September","October","November","December"], // Names of months for drop-down and formatting
+		monthNamesShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"], // For formatting
+		dayNames: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"], // For formatting
+		dayNamesShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"], // For formatting
+		dayNamesMin: ["Su","Mo","Tu","We","Th","Fr","Sa"], // Column headings for days starting at Sunday
+		weekHeader: "Wk", // Column header for week of the year
+		dateFormat: "mm/dd/yy", // See format options on parseDate
+		firstDay: 0, // The first day of the week, Sun = 0, Mon = 1, ...
+		isRTL: false, // True if right-to-left language, false if left-to-right
+		showMonthAfterYear: false, // True if the year select precedes month, false for month then year
+		yearSuffix: "" // Additional text to append to the year in the month headers
+	};
+	this._defaults = { // Global defaults for all the date picker instances
+		showOn: "focus", // "focus" for popup on focus,
+			// "button" for trigger button, or "both" for either
+		showAnim: "fadeIn", // Name of jQuery animation for popup
+		showOptions: {}, // Options for enhanced animations
+		defaultDate: null, // Used when field is blank: actual date,
+			// +/-number for offset from today, null for today
+		appendText: "", // Display text following the input box, e.g. showing the format
+		buttonText: "...", // Text for trigger button
+		buttonImage: "", // URL for trigger button image
+		buttonImageOnly: false, // True if the image appears alone, false if it appears on a button
+		hideIfNoPrevNext: false, // True to hide next/previous month links
+			// if not applicable, false to just disable them
+		navigationAsDateFormat: false, // True if date formatting applied to prev/today/next links
+		gotoCurrent: false, // True if today link goes back to current selection instead
+		changeMonth: false, // True if month can be selected directly, false if only prev/next
+		changeYear: false, // True if year can be selected directly, false if only prev/next
+		yearRange: "c-10:c+10", // Range of years to display in drop-down,
+			// either relative to today's year (-nn:+nn), relative to currently displayed year
+			// (c-nn:c+nn), absolute (nnnn:nnnn), or a combination of the above (nnnn:-n)
+		showOtherMonths: false, // True to show dates in other months, false to leave blank
+		selectOtherMonths: false, // True to allow selection of dates in other months, false for unselectable
+		showWeek: false, // True to show week of the year, false to not show it
+		calculateWeek: this.iso8601Week, // How to calculate the week of the year,
+			// takes a Date and returns the number of the week for it
+		shortYearCutoff: "+10", // Short year values < this are in the current century,
+			// > this are in the previous century,
+			// string value starting with "+" for current year + value
+		minDate: null, // The earliest selectable date, or null for no limit
+		maxDate: null, // The latest selectable date, or null for no limit
+		duration: "fast", // Duration of display/closure
+		beforeShowDay: null, // Function that takes a date and returns an array with
+			// [0] = true if selectable, false if not, [1] = custom CSS class name(s) or "",
+			// [2] = cell title (optional), e.g. $.datepicker.noWeekends
+		beforeShow: null, // Function that takes an input field and
+			// returns a set of custom settings for the date picker
+		onSelect: null, // Define a callback function when a date is selected
+		onChangeMonthYear: null, // Define a callback function when the month or year is changed
+		onClose: null, // Define a callback function when the datepicker is closed
+		numberOfMonths: 1, // Number of months to show at a time
+		showCurrentAtPos: 0, // The position in multipe months at which to show the current month (starting at 0)
+		stepMonths: 1, // Number of months to step back/forward
+		stepBigMonths: 12, // Number of months to step back/forward for the big links
+		altField: "", // Selector for an alternate field to store selected dates into
+		altFormat: "", // The date format to use for the alternate field
+		constrainInput: true, // The input is constrained by the current date format
+		showButtonPanel: false, // True to show button panel, false to not show it
+		autoSize: false, // True to size the input for the date format, false to leave as is
+		disabled: false // The initial disabled state
+	};
+	$.extend(this._defaults, this.regional[""]);
+	this.dpDiv = bindHover($("<div id='" + this._mainDivId + "' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"));
+}
+
+$.extend(Datepicker.prototype, {
+	/* Class name added to elements to indicate already configured with a date picker. */
+	markerClassName: "hasDatepicker",
+
+	//Keep track of the maximum number of rows displayed (see #7043)
+	maxRows: 4,
+
+	// TODO rename to "widget" when switching to widget factory
+	_widgetDatepicker: function() {
+		return this.dpDiv;
+	},
+
+	/* Override the default settings for all instances of the date picker.
+	 * @param  settings  object - the new settings to use as defaults (anonymous object)
+	 * @return the manager object
+	 */
+	setDefaults: function(settings) {
+		extendRemove(this._defaults, settings || {});
+		return this;
+	},
+
+	/* Attach the date picker to a jQuery selection.
+	 * @param  target	element - the target input field or division or span
+	 * @param  settings  object - the new settings to use for this date picker instance (anonymous)
+	 */
+	_attachDatepicker: function(target, settings) {
+		var nodeName, inline, inst;
+		nodeName = target.nodeName.toLowerCase();
+		inline = (nodeName === "div" || nodeName === "span");
+		if (!target.id) {
+			this.uuid += 1;
+			target.id = "dp" + this.uuid;
+		}
+		inst = this._newInst($(target), inline);
+		inst.settings = $.extend({}, settings || {});
+		if (nodeName === "input") {
+			this._connectDatepicker(target, inst);
+		} else if (inline) {
+			this._inlineDatepicker(target, inst);
+		}
+	},
+
+	/* Create a new instance object. */
+	_newInst: function(target, inline) {
+		var id = target[0].id.replace(/([^A-Za-z0-9_\-])/g, "\\\\$1"); // escape jQuery meta chars
+		return {id: id, input: target, // associated target
+			selectedDay: 0, selectedMonth: 0, selectedYear: 0, // current selection
+			drawMonth: 0, drawYear: 0, // month being drawn
+			inline: inline, // is datepicker inline or not
+			dpDiv: (!inline ? this.dpDiv : // presentation div
+			bindHover($("<div class='" + this._inlineClass + " ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")))};
+	},
+
+	/* Attach the date picker to an input field. */
+	_connectDatepicker: function(target, inst) {
+		var input = $(target);
+		inst.append = $([]);
+		inst.trigger = $([]);
+		if (input.hasClass(this.markerClassName)) {
+			return;
+		}
+		this._attachments(input, inst);
+		input.addClass(this.markerClassName).keydown(this._doKeyDown).
+			keypress(this._doKeyPress).keyup(this._doKeyUp);
+		this._autoSize(inst);
+		$.data(target, PROP_NAME, inst);
+		//If disabled option is true, disable the datepicker once it has been attached to the input (see ticket #5665)
+		if( inst.settings.disabled ) {
+			this._disableDatepicker( target );
+		}
+	},
+
+	/* Make attachments based on settings. */
+	_attachments: function(input, inst) {
+		var showOn, buttonText, buttonImage,
+			appendText = this._get(inst, "appendText"),
+			isRTL = this._get(inst, "isRTL");
+
+		if (inst.append) {
+			inst.append.remove();
+		}
+		if (appendText) {
+			inst.append = $("<span class='" + this._appendClass + "'>" + appendText + "</span>");
+			input[isRTL ? "before" : "after"](inst.append);
+		}
+
+		input.unbind("focus", this._showDatepicker);
+
+		if (inst.trigger) {
+			inst.trigger.remove();
+		}
+
+		showOn = this._get(inst, "showOn");
+		if (showOn === "focus" || showOn === "both") { // pop-up date picker when in the marked field
+			input.focus(this._showDatepicker);
+		}
+		if (showOn === "button" || showOn === "both") { // pop-up date picker when button clicked
+			buttonText = this._get(inst, "buttonText");
+			buttonImage = this._get(inst, "buttonImage");
+			inst.trigger = $(this._get(inst, "buttonImageOnly") ?
+				$("<img/>").addClass(this._triggerClass).
+					attr({ src: buttonImage, alt: buttonText, title: buttonText }) :
+				$("<button type='button'></button>").addClass(this._triggerClass).
+					html(!buttonImage ? buttonText : $("<img/>").attr(
+					{ src:buttonImage, alt:buttonText, title:buttonText })));
+			input[isRTL ? "before" : "after"](inst.trigger);
+			inst.trigger.click(function() {
+				if ($.datepicker._datepickerShowing && $.datepicker._lastInput === input[0]) {
+					$.datepicker._hideDatepicker();
+				} else if ($.datepicker._datepickerShowing && $.datepicker._lastInput !== input[0]) {
+					$.datepicker._hideDatepicker();
+					$.datepicker._showDatepicker(input[0]);
+				} else {
+					$.datepicker._showDatepicker(input[0]);
+				}
+				return false;
+			});
+		}
+	},
+
+	/* Apply the maximum length for the date format. */
+	_autoSize: function(inst) {
+		if (this._get(inst, "autoSize") && !inst.inline) {
+			var findMax, max, maxI, i,
+				date = new Date(2009, 12 - 1, 20), // Ensure double digits
+				dateFormat = this._get(inst, "dateFormat");
+
+			if (dateFormat.match(/[DM]/)) {
+				findMax = function(names) {
+					max = 0;
+					maxI = 0;
+					for (i = 0; i < names.length; i++) {
+						if (names[i].length > max) {
+							max = names[i].length;
+							maxI = i;
+						}
+					}
+					return maxI;
+				};
+				date.setMonth(findMax(this._get(inst, (dateFormat.match(/MM/) ?
+					"monthNames" : "monthNamesShort"))));
+				date.setDate(findMax(this._get(inst, (dateFormat.match(/DD/) ?
+					"dayNames" : "dayNamesShort"))) + 20 - date.getDay());
+			}
+			inst.input.attr("size", this._formatDate(inst, date).length);
+		}
+	},
+
+	/* Attach an inline date picker to a div. */
+	_inlineDatepicker: function(target, inst) {
+		var divSpan = $(target);
+		if (divSpan.hasClass(this.markerClassName)) {
+			return;
+		}
+		divSpan.addClass(this.markerClassName).append(inst.dpDiv);
+		$.data(target, PROP_NAME, inst);
+		this._setDate(inst, this._getDefaultDate(inst), true);
+		this._updateDatepicker(inst);
+		this._updateAlternate(inst);
+		//If disabled option is true, disable the datepicker before showing it (see ticket #5665)
+		if( inst.settings.disabled ) {
+			this._disableDatepicker( target );
+		}
+		// Set display:block in place of inst.dpDiv.show() which won't work on disconnected elements
+		// http://bugs.jqueryui.com/ticket/7552 - A Datepicker created on a detached div has zero height
+		inst.dpDiv.css( "display", "block" );
+	},
+
+	/* Pop-up the date picker in a "dialog" box.
+	 * @param  input element - ignored
+	 * @param  date	string or Date - the initial date to display
+	 * @param  onSelect  function - the function to call when a date is selected
+	 * @param  settings  object - update the dialog date picker instance's settings (anonymous object)
+	 * @param  pos int[2] - coordinates for the dialog's position within the screen or
+	 *					event - with x/y coordinates or
+	 *					leave empty for default (screen centre)
+	 * @return the manager object
+	 */
+	_dialogDatepicker: function(input, date, onSelect, settings, pos) {
+		var id, browserWidth, browserHeight, scrollX, scrollY,
+			inst = this._dialogInst; // internal instance
+
+		if (!inst) {
+			this.uuid += 1;
+			id = "dp" + this.uuid;
+			this._dialogInput = $("<input type='text' id='" + id +
+				"' style='position: absolute; top: -100px; width: 0px;'/>");
+			this._dialogInput.keydown(this._doKeyDown);
+			$("body").append(this._dialogInput);
+			inst = this._dialogInst = this._newInst(this._dialogInput, false);
+			inst.settings = {};
+			$.data(this._dialogInput[0], PROP_NAME, inst);
+		}
+		extendRemove(inst.settings, settings || {});
+		date = (date && date.constructor === Date ? this._formatDate(inst, date) : date);
+		this._dialogInput.val(date);
+
+		this._pos = (pos ? (pos.length ? pos : [pos.pageX, pos.pageY]) : null);
+		if (!this._pos) {
+			browserWidth = document.documentElement.clientWidth;
+			browserHeight = document.documentElement.clientHeight;
+			scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;
+			scrollY = document.documentElement.scrollTop || document.body.scrollTop;
+			this._pos = // should use actual width/height below
+				[(browserWidth / 2) - 100 + scrollX, (browserHeight / 2) - 150 + scrollY];
+		}
+
+		// move input on screen for focus, but hidden behind dialog
+		this._dialogInput.css("left", (this._pos[0] + 20) + "px").css("top", this._pos[1] + "px");
+		inst.settings.onSelect = onSelect;
+		this._inDialog = true;
+		this.dpDiv.addClass(this._dialogClass);
+		this._showDatepicker(this._dialogInput[0]);
+		if ($.blockUI) {
+			$.blockUI(this.dpDiv);
+		}
+		$.data(this._dialogInput[0], PROP_NAME, inst);
+		return this;
+	},
+
+	/* Detach a datepicker from its control.
+	 * @param  target	element - the target input field or division or span
+	 */
+	_destroyDatepicker: function(target) {
+		var nodeName,
+			$target = $(target),
+			inst = $.data(target, PROP_NAME);
+
+		if (!$target.hasClass(this.markerClassName)) {
+			return;
+		}
+
+		nodeName = target.nodeName.toLowerCase();
+		$.removeData(target, PROP_NAME);
+		if (nodeName === "input") {
+			inst.append.remove();
+			inst.trigger.remove();
+			$target.removeClass(this.markerClassName).
+				unbind("focus", this._showDatepicker).
+				unbind("keydown", this._doKeyDown).
+				unbind("keypress", this._doKeyPress).
+				unbind("keyup", this._doKeyUp);
+		} else if (nodeName === "div" || nodeName === "span") {
+			$target.removeClass(this.markerClassName).empty();
+		}
+	},
+
+	/* Enable the date picker to a jQuery selection.
+	 * @param  target	element - the target input field or division or span
+	 */
+	_enableDatepicker: function(target) {
+		var nodeName, inline,
+			$target = $(target),
+			inst = $.data(target, PROP_NAME);
+
+		if (!$target.hasClass(this.markerClassName)) {
+			return;
+		}
+
+		nodeName = target.nodeName.toLowerCase();
+		if (nodeName === "input") {
+			target.disabled = false;
+			inst.trigger.filter("button").
+				each(function() { this.disabled = false; }).end().
+				filter("img").css({opacity: "1.0", cursor: ""});
+		} else if (nodeName === "div" || nodeName === "span") {
+			inline = $target.children("." + this._inlineClass);
+			inline.children().removeClass("ui-state-disabled");
+			inline.find("select.ui-datepicker-month, select.ui-datepicker-year").
+				prop("disabled", false);
+		}
+		this._disabledInputs = $.map(this._disabledInputs,
+			function(value) { return (value === target ? null : value); }); // delete entry
+	},
+
+	/* Disable the date picker to a jQuery selection.
+	 * @param  target	element - the target input field or division or span
+	 */
+	_disableDatepicker: function(target) {
+		var nodeName, inline,
+			$target = $(target),
+			inst = $.data(target, PROP_NAME);
+
+		if (!$target.hasClass(this.markerClassName)) {
+			return;
+		}
+
+		nodeName = target.nodeName.toLowerCase();
+		if (nodeName === "input") {
+			target.disabled = true;
+			inst.trigger.filter("button").
+				each(function() { this.disabled = true; }).end().
+				filter("img").css({opacity: "0.5", cursor: "default"});
+		} else if (nodeName === "div" || nodeName === "span") {
+			inline = $target.children("." + this._inlineClass);
+			inline.children().addClass("ui-state-disabled");
+			inline.find("select.ui-datepicker-month, select.ui-datepicker-year").
+				prop("disabled", true);
+		}
+		this._disabledInputs = $.map(this._disabledInputs,
+			function(value) { return (value === target ? null : value); }); // delete entry
+		this._disabledInputs[this._disabledInputs.length] = target;
+	},
+
+	/* Is the first field in a jQuery collection disabled as a datepicker?
+	 * @param  target	element - the target input field or division or span
+	 * @return boolean - true if disabled, false if enabled
+	 */
+	_isDisabledDatepicker: function(target) {
+		if (!target) {
+			return false;
+		}
+		for (var i = 0; i < this._disabledInputs.length; i++) {
+			if (this._disabledInputs[i] === target) {
+				return true;
+			}
+		}
+		return false;
+	},
+
+	/* Retrieve the instance data for the target control.
+	 * @param  target  element - the target input field or division or span
+	 * @return  object - the associated instance data
+	 * @throws  error if a jQuery problem getting data
+	 */
+	_getInst: function(target) {
+		try {
+			return $.data(target, PROP_NAME);
+		}
+		catch (err) {
+			throw "Missing instance data for this datepicker";
+		}
+	},
+
+	/* Update or retrieve the settings for a date picker attached to an input field or division.
+	 * @param  target  element - the target input field or division or span
+	 * @param  name	object - the new settings to update or
+	 *				string - the name of the setting to change or retrieve,
+	 *				when retrieving also "all" for all instance settings or
+	 *				"defaults" for all global defaults
+	 * @param  value   any - the new value for the setting
+	 *				(omit if above is an object or to retrieve a value)
+	 */
+	_optionDatepicker: function(target, name, value) {
+		var settings, date, minDate, maxDate,
+			inst = this._getInst(target);
+
+		if (arguments.length === 2 && typeof name === "string") {
+			return (name === "defaults" ? $.extend({}, $.datepicker._defaults) :
+				(inst ? (name === "all" ? $.extend({}, inst.settings) :
+				this._get(inst, name)) : null));
+		}
+
+		settings = name || {};
+		if (typeof name === "string") {
+			settings = {};
+			settings[name] = value;
+		}
+
+		if (inst) {
+			if (this._curInst === inst) {
+				this._hideDatepicker();
+			}
+
+			date = this._getDateDatepicker(target, true);
+			minDate = this._getMinMaxDate(inst, "min");
+			maxDate = this._getMinMaxDate(inst, "max");
+			extendRemove(inst.settings, settings);
+			// reformat the old minDate/maxDate values if dateFormat changes and a new minDate/maxDate isn't provided
+			if (minDate !== null && settings.dateFormat !== undefined && settings.minDate === undefined) {
+				inst.settings.minDate = this._formatDate(inst, minDate);
+			}
+			if (maxDate !== null && settings.dateFormat !== undefined && settings.maxDate === undefined) {
+				inst.settings.maxDate = this._formatDate(inst, maxDate);
+			}
+			if ( "disabled" in settings ) {
+				if ( settings.disabled ) {
+					this._disableDatepicker(target);
+				} else {
+					this._enableDatepicker(target);
+				}
+			}
+			this._attachments($(target), inst);
+			this._autoSize(inst);
+			this._setDate(inst, date);
+			this._updateAlternate(inst);
+			this._updateDatepicker(inst);
+		}
+	},
+
+	// change method deprecated
+	_changeDatepicker: function(target, name, value) {
+		this._optionDatepicker(target, name, value);
+	},
+
+	/* Redraw the date picker attached to an input field or division.
+	 * @param  target  element - the target input field or division or span
+	 */
+	_refreshDatepicker: function(target) {
+		var inst = this._getInst(target);
+		if (inst) {
+			this._updateDatepicker(inst);
+		}
+	},
+
+	/* Set the dates for a jQuery selection.
+	 * @param  target element - the target input field or division or span
+	 * @param  date	Date - the new date
+	 */
+	_setDateDatepicker: function(target, date) {
+		var inst = this._getInst(target);
+		if (inst) {
+			this._setDate(inst, date);
+			this._updateDatepicker(inst);
+			this._updateAlternate(inst);
+		}
+	},
+
+	/* Get the date(s) for the first entry in a jQuery selection.
+	 * @param  target element - the target input field or division or span
+	 * @param  noDefault boolean - true if no default date is to be used
+	 * @return Date - the current date
+	 */
+	_getDateDatepicker: function(target, noDefault) {
+		var inst = this._getInst(target);
+		if (inst && !inst.inline) {
+			this._setDateFromField(inst, noDefault);
+		}
+		return (inst ? this._getDate(inst) : null);
+	},
+
+	/* Handle keystrokes. */
+	_doKeyDown: function(event) {
+		var onSelect, dateStr, sel,
+			inst = $.datepicker._getInst(event.target),
+			handled = true,
+			isRTL = inst.dpDiv.is(".ui-datepicker-rtl");
+
+		inst._keyEvent = true;
+		if ($.datepicker._datepickerShowing) {
+			switch (event.keyCode) {
+				case 9: $.datepicker._hideDatepicker();
+						handled = false;
+						break; // hide on tab out
+				case 13: sel = $("td." + $.datepicker._dayOverClass + ":not(." +
+									$.datepicker._currentClass + ")", inst.dpDiv);
+						if (sel[0]) {
+							$.datepicker._selectDay(event.target, inst.selectedMonth, inst.selectedYear, sel[0]);
+						}
+
+						onSelect = $.datepicker._get(inst, "onSelect");
+						if (onSelect) {
+							dateStr = $.datepicker._formatDate(inst);
+
+							// trigger custom callback
+							onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]);
+						} else {
+							$.datepicker._hideDatepicker();
+						}
+
+						return false; // don't submit the form
+				case 27: $.datepicker._hideDatepicker();
+						break; // hide on escape
+				case 33: $.datepicker._adjustDate(event.target, (event.ctrlKey ?
+							-$.datepicker._get(inst, "stepBigMonths") :
+							-$.datepicker._get(inst, "stepMonths")), "M");
+						break; // previous month/year on page up/+ ctrl
+				case 34: $.datepicker._adjustDate(event.target, (event.ctrlKey ?
+							+$.datepicker._get(inst, "stepBigMonths") :
+							+$.datepicker._get(inst, "stepMonths")), "M");
+						break; // next month/year on page down/+ ctrl
+				case 35: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._clearDate(event.target);
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // clear on ctrl or command +end
+				case 36: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._gotoToday(event.target);
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // current on ctrl or command +home
+				case 37: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._adjustDate(event.target, (isRTL ? +1 : -1), "D");
+						}
+						handled = event.ctrlKey || event.metaKey;
+						// -1 day on ctrl or command +left
+						if (event.originalEvent.altKey) {
+							$.datepicker._adjustDate(event.target, (event.ctrlKey ?
+								-$.datepicker._get(inst, "stepBigMonths") :
+								-$.datepicker._get(inst, "stepMonths")), "M");
+						}
+						// next month/year on alt +left on Mac
+						break;
+				case 38: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._adjustDate(event.target, -7, "D");
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // -1 week on ctrl or command +up
+				case 39: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._adjustDate(event.target, (isRTL ? -1 : +1), "D");
+						}
+						handled = event.ctrlKey || event.metaKey;
+						// +1 day on ctrl or command +right
+						if (event.originalEvent.altKey) {
+							$.datepicker._adjustDate(event.target, (event.ctrlKey ?
+								+$.datepicker._get(inst, "stepBigMonths") :
+								+$.datepicker._get(inst, "stepMonths")), "M");
+						}
+						// next month/year on alt +right
+						break;
+				case 40: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._adjustDate(event.target, +7, "D");
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // +1 week on ctrl or command +down
+				default: handled = false;
+			}
+		} else if (event.keyCode === 36 && event.ctrlKey) { // display the date picker on ctrl+home
+			$.datepicker._showDatepicker(this);
+		} else {
+			handled = false;
+		}
+
+		if (handled) {
+			event.preventDefault();
+			event.stopPropagation();
+		}
+	},
+
+	/* Filter entered characters - based on date format. */
+	_doKeyPress: function(event) {
+		var chars, chr,
+			inst = $.datepicker._getInst(event.target);
+
+		if ($.datepicker._get(inst, "constrainInput")) {
+			chars = $.datepicker._possibleChars($.datepicker._get(inst, "dateFormat"));
+			chr = String.fromCharCode(event.charCode == null ? event.keyCode : event.charCode);
+			return event.ctrlKey || event.metaKey || (chr < " " || !chars || chars.indexOf(chr) > -1);
+		}
+	},
+
+	/* Synchronise manual entry and field/alternate field. */
+	_doKeyUp: function(event) {
+		var date,
+			inst = $.datepicker._getInst(event.target);
+
+		if (inst.input.val() !== inst.lastVal) {
+			try {
+				date = $.datepicker.parseDate($.datepicker._get(inst, "dateFormat"),
+					(inst.input ? inst.input.val() : null),
+					$.datepicker._getFormatConfig(inst));
+
+				if (date) { // only if valid
+					$.datepicker._setDateFromField(inst);
+					$.datepicker._updateAlternate(inst);
+					$.datepicker._updateDatepicker(inst);
+				}
+			}
+			catch (err) {
+			}
+		}
+		return true;
+	},
+
+	/* Pop-up the date picker for a given input field.
+	 * If false returned from beforeShow event handler do not show.
+	 * @param  input  element - the input field attached to the date picker or
+	 *					event - if triggered by focus
+	 */
+	_showDatepicker: function(input) {
+		input = input.target || input;
+		if (input.nodeName.toLowerCase() !== "input") { // find from button/image trigger
+			input = $("input", input.parentNode)[0];
+		}
+
+		if ($.datepicker._isDisabledDatepicker(input) || $.datepicker._lastInput === input) { // already here
+			return;
+		}
+
+		var inst, beforeShow, beforeShowSettings, isFixed,
+			offset, showAnim, duration;
+
+		inst = $.datepicker._getInst(input);
+		if ($.datepicker._curInst && $.datepicker._curInst !== inst) {
+			$.datepicker._curInst.dpDiv.stop(true, true);
+			if ( inst && $.datepicker._datepickerShowing ) {
+				$.datepicker._hideDatepicker( $.datepicker._curInst.input[0] );
+			}
+		}
+
+		beforeShow = $.datepicker._get(inst, "beforeShow");
+		beforeShowSettings = beforeShow ? beforeShow.apply(input, [input, inst]) : {};
+		if(beforeShowSettings === false){
+			return;
+		}
+		extendRemove(inst.settings, beforeShowSettings);
+
+		inst.lastVal = null;
+		$.datepicker._lastInput = input;
+		$.datepicker._setDateFromField(inst);
+
+		if ($.datepicker._inDialog) { // hide cursor
+			input.value = "";
+		}
+		if (!$.datepicker._pos) { // position below input
+			$.datepicker._pos = $.datepicker._findPos(input);
+			$.datepicker._pos[1] += input.offsetHeight; // add the height
+		}
+
+		isFixed = false;
+		$(input).parents().each(function() {
+			isFixed |= $(this).css("position") === "fixed";
+			return !isFixed;
+		});
+
+		offset = {left: $.datepicker._pos[0], top: $.datepicker._pos[1]};
+		$.datepicker._pos = null;
+		//to avoid flashes on Firefox
+		inst.dpDiv.empty();
+		// determine sizing offscreen
+		inst.dpDiv.css({position: "absolute", display: "block", top: "-1000px"});
+		$.datepicker._updateDatepicker(inst);
+		// fix width for dynamic number of date pickers
+		// and adjust position before showing
+		offset = $.datepicker._checkOffset(inst, offset, isFixed);
+		inst.dpDiv.css({position: ($.datepicker._inDialog && $.blockUI ?
+			"static" : (isFixed ? "fixed" : "absolute")), display: "none",
+			left: offset.left + "px", top: offset.top + "px"});
+
+		if (!inst.inline) {
+			showAnim = $.datepicker._get(inst, "showAnim");
+			duration = $.datepicker._get(inst, "duration");
+			inst.dpDiv.zIndex($(input).zIndex()+1);
+			$.datepicker._datepickerShowing = true;
+
+			if ( $.effects && $.effects.effect[ showAnim ] ) {
+				inst.dpDiv.show(showAnim, $.datepicker._get(inst, "showOptions"), duration);
+			} else {
+				inst.dpDiv[showAnim || "show"](showAnim ? duration : null);
+			}
+
+			if ( $.datepicker._shouldFocusInput( inst ) ) {
+				inst.input.focus();
+			}
+
+			$.datepicker._curInst = inst;
+		}
+	},
+
+	/* Generate the date picker content. */
+	_updateDatepicker: function(inst) {
+		this.maxRows = 4; //Reset the max number of rows being displayed (see #7043)
+		instActive = inst; // for delegate hover events
+		inst.dpDiv.empty().append(this._generateHTML(inst));
+		this._attachHandlers(inst);
+		inst.dpDiv.find("." + this._dayOverClass + " a").mouseover();
+
+		var origyearshtml,
+			numMonths = this._getNumberOfMonths(inst),
+			cols = numMonths[1],
+			width = 17;
+
+		inst.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");
+		if (cols > 1) {
+			inst.dpDiv.addClass("ui-datepicker-multi-" + cols).css("width", (width * cols) + "em");
+		}
+		inst.dpDiv[(numMonths[0] !== 1 || numMonths[1] !== 1 ? "add" : "remove") +
+			"Class"]("ui-datepicker-multi");
+		inst.dpDiv[(this._get(inst, "isRTL") ? "add" : "remove") +
+			"Class"]("ui-datepicker-rtl");
+
+		if (inst === $.datepicker._curInst && $.datepicker._datepickerShowing && $.datepicker._shouldFocusInput( inst ) ) {
+			inst.input.focus();
+		}
+
+		// deffered render of the years select (to avoid flashes on Firefox)
+		if( inst.yearshtml ){
+			origyearshtml = inst.yearshtml;
+			setTimeout(function(){
+				//assure that inst.yearshtml didn't change.
+				if( origyearshtml === inst.yearshtml && inst.yearshtml ){
+					inst.dpDiv.find("select.ui-datepicker-year:first").replaceWith(inst.yearshtml);
+				}
+				origyearshtml = inst.yearshtml = null;
+			}, 0);
+		}
+	},
+
+	// #6694 - don't focus the input if it's already focused
+	// this breaks the change event in IE
+	// Support: IE and jQuery <1.9
+	_shouldFocusInput: function( inst ) {
+		return inst.input && inst.input.is( ":visible" ) && !inst.input.is( ":disabled" ) && !inst.input.is( ":focus" );
+	},
+
+	/* Check positioning to remain on screen. */
+	_checkOffset: function(inst, offset, isFixed) {
+		var dpWidth = inst.dpDiv.outerWidth(),
+			dpHeight = inst.dpDiv.outerHeight(),
+			inputWidth = inst.input ? inst.input.outerWidth() : 0,
+			inputHeight = inst.input ? inst.input.outerHeight() : 0,
+			viewWidth = document.documentElement.clientWidth + (isFixed ? 0 : $(document).scrollLeft()),
+			viewHeight = document.documentElement.clientHeight + (isFixed ? 0 : $(document).scrollTop());
+
+		offset.left -= (this._get(inst, "isRTL") ? (dpWidth - inputWidth) : 0);
+		offset.left -= (isFixed && offset.left === inst.input.offset().left) ? $(document).scrollLeft() : 0;
+		offset.top -= (isFixed && offset.top === (inst.input.offset().top + inputHeight)) ? $(document).scrollTop() : 0;
+
+		// now check if datepicker is showing outside window viewport - move to a better place if so.
+		offset.left -= Math.min(offset.left, (offset.left + dpWidth > viewWidth && viewWidth > dpWidth) ?
+			Math.abs(offset.left + dpWidth - viewWidth) : 0);
+		offset.top -= Math.min(offset.top, (offset.top + dpHeight > viewHeight && viewHeight > dpHeight) ?
+			Math.abs(dpHeight + inputHeight) : 0);
+
+		return offset;
+	},
+
+	/* Find an object's position on the screen. */
+	_findPos: function(obj) {
+		var position,
+			inst = this._getInst(obj),
+			isRTL = this._get(inst, "isRTL");
+
+		while (obj && (obj.type === "hidden" || obj.nodeType !== 1 || $.expr.filters.hidden(obj))) {
+			obj = obj[isRTL ? "previousSibling" : "nextSibling"];
+		}
+
+		position = $(obj).offset();
+		return [position.left, position.top];
+	},
+
+	/* Hide the date picker from view.
+	 * @param  input  element - the input field attached to the date picker
+	 */
+	_hideDatepicker: function(input) {
+		var showAnim, duration, postProcess, onClose,
+			inst = this._curInst;
+
+		if (!inst || (input && inst !== $.data(input, PROP_NAME))) {
+			return;
+		}
+
+		if (this._datepickerShowing) {
+			showAnim = this._get(inst, "showAnim");
+			duration = this._get(inst, "duration");
+			postProcess = function() {
+				$.datepicker._tidyDialog(inst);
+			};
+
+			// DEPRECATED: after BC for 1.8.x $.effects[ showAnim ] is not needed
+			if ( $.effects && ( $.effects.effect[ showAnim ] || $.effects[ showAnim ] ) ) {
+				inst.dpDiv.hide(showAnim, $.datepicker._get(inst, "showOptions"), duration, postProcess);
+			} else {
+				inst.dpDiv[(showAnim === "slideDown" ? "slideUp" :
+					(showAnim === "fadeIn" ? "fadeOut" : "hide"))]((showAnim ? duration : null), postProcess);
+			}
+
+			if (!showAnim) {
+				postProcess();
+			}
+			this._datepickerShowing = false;
+
+			onClose = this._get(inst, "onClose");
+			if (onClose) {
+				onClose.apply((inst.input ? inst.input[0] : null), [(inst.input ? inst.input.val() : ""), inst]);
+			}
+
+			this._lastInput = null;
+			if (this._inDialog) {
+				this._dialogInput.css({ position: "absolute", left: "0", top: "-100px" });
+				if ($.blockUI) {
+					$.unblockUI();
+					$("body").append(this.dpDiv);
+				}
+			}
+			this._inDialog = false;
+		}
+	},
+
+	/* Tidy up after a dialog display. */
+	_tidyDialog: function(inst) {
+		inst.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar");
+	},
+
+	/* Close date picker if clicked elsewhere. */
+	_checkExternalClick: function(event) {
+		if (!$.datepicker._curInst) {
+			return;
+		}
+
+		var $target = $(event.target),
+			inst = $.datepicker._getInst($target[0]);
+
+		if ( ( ( $target[0].id !== $.datepicker._mainDivId &&
+				$target.parents("#" + $.datepicker._mainDivId).length === 0 &&
+				!$target.hasClass($.datepicker.markerClassName) &&
+				!$target.closest("." + $.datepicker._triggerClass).length &&
+				$.datepicker._datepickerShowing && !($.datepicker._inDialog && $.blockUI) ) ) ||
+			( $target.hasClass($.datepicker.markerClassName) && $.datepicker._curInst !== inst ) ) {
+				$.datepicker._hideDatepicker();
+		}
+	},
+
+	/* Adjust one of the date sub-fields. */
+	_adjustDate: function(id, offset, period) {
+		var target = $(id),
+			inst = this._getInst(target[0]);
+
+		if (this._isDisabledDatepicker(target[0])) {
+			return;
+		}
+		this._adjustInstDate(inst, offset +
+			(period === "M" ? this._get(inst, "showCurrentAtPos") : 0), // undo positioning
+			period);
+		this._updateDatepicker(inst);
+	},
+
+	/* Action for current link. */
+	_gotoToday: function(id) {
+		var date,
+			target = $(id),
+			inst = this._getInst(target[0]);
+
+		if (this._get(inst, "gotoCurrent") && inst.currentDay) {
+			inst.selectedDay = inst.currentDay;
+			inst.drawMonth = inst.selectedMonth = inst.currentMonth;
+			inst.drawYear = inst.selectedYear = inst.currentYear;
+		} else {
+			date = new Date();
+			inst.selectedDay = date.getDate();
+			inst.drawMonth = inst.selectedMonth = date.getMonth();
+			inst.drawYear = inst.selectedYear = date.getFullYear();
+		}
+		this._notifyChange(inst);
+		this._adjustDate(target);
+	},
+
+	/* Action for selecting a new month/year. */
+	_selectMonthYear: function(id, select, period) {
+		var target = $(id),
+			inst = this._getInst(target[0]);
+
+		inst["selected" + (period === "M" ? "Month" : "Year")] =
+		inst["draw" + (period === "M" ? "Month" : "Year")] =
+			parseInt(select.options[select.selectedIndex].value,10);
+
+		this._notifyChange(inst);
+		this._adjustDate(target);
+	},
+
+	/* Action for selecting a day. */
+	_selectDay: function(id, month, year, td) {
+		var inst,
+			target = $(id);
+
+		if ($(td).hasClass(this._unselectableClass) || this._isDisabledDatepicker(target[0])) {
+			return;
+		}
+
+		inst = this._getInst(target[0]);
+		inst.selectedDay = inst.currentDay = $("a", td).html();
+		inst.selectedMonth = inst.currentMonth = month;
+		inst.selectedYear = inst.currentYear = year;
+		this._selectDate(id, this._formatDate(inst,
+			inst.currentDay, inst.currentMonth, inst.currentYear));
+	},
+
+	/* Erase the input field and hide the date picker. */
+	_clearDate: function(id) {
+		var target = $(id);
+		this._selectDate(target, "");
+	},
+
+	/* Update the input field with the selected date. */
+	_selectDate: function(id, dateStr) {
+		var onSelect,
+			target = $(id),
+			inst = this._getInst(target[0]);
+
+		dateStr = (dateStr != null ? dateStr : this._formatDate(inst));
+		if (inst.input) {
+			inst.input.val(dateStr);
+		}
+		this._updateAlternate(inst);
+
+		onSelect = this._get(inst, "onSelect");
+		if (onSelect) {
+			onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]);  // trigger custom callback
+		} else if (inst.input) {
+			inst.input.trigger("change"); // fire the change event
+		}
+
+		if (inst.inline){
+			this._updateDatepicker(inst);
+		} else {
+			this._hideDatepicker();
+			this._lastInput = inst.input[0];
+			if (typeof(inst.input[0]) !== "object") {
+				inst.input.focus(); // restore focus
+			}
+			this._lastInput = null;
+		}
+	},
+
+	/* Update any alternate field to synchronise with the main field. */
+	_updateAlternate: function(inst) {
+		var altFormat, date, dateStr,
+			altField = this._get(inst, "altField");
+
+		if (altField) { // update alternate field too
+			altFormat = this._get(inst, "altFormat") || this._get(inst, "dateFormat");
+			date = this._getDate(inst);
+			dateStr = this.formatDate(altFormat, date, this._getFormatConfig(inst));
+			$(altField).each(function() { $(this).val(dateStr); });
+		}
+	},
+
+	/* Set as beforeShowDay function to prevent selection of weekends.
+	 * @param  date  Date - the date to customise
+	 * @return [boolean, string] - is this date selectable?, what is its CSS class?
+	 */
+	noWeekends: function(date) {
+		var day = date.getDay();
+		return [(day > 0 && day < 6), ""];
+	},
+
+	/* Set as calculateWeek to determine the week of the year based on the ISO 8601 definition.
+	 * @param  date  Date - the date to get the week for
+	 * @return  number - the number of the week within the year that contains this date
+	 */
+	iso8601Week: function(date) {
+		var time,
+			checkDate = new Date(date.getTime());
+
+		// Find Thursday of this week starting on Monday
+		checkDate.setDate(checkDate.getDate() + 4 - (checkDate.getDay() || 7));
+
+		time = checkDate.getTime();
+		checkDate.setMonth(0); // Compare with Jan 1
+		checkDate.setDate(1);
+		return Math.floor(Math.round((time - checkDate) / 86400000) / 7) + 1;
+	},
+
+	/* Parse a string value into a date object.
+	 * See formatDate below for the possible formats.
+	 *
+	 * @param  format string - the expected format of the date
+	 * @param  value string - the date in the above format
+	 * @param  settings Object - attributes include:
+	 *					shortYearCutoff  number - the cutoff year for determining the century (optional)
+	 *					dayNamesShort	string[7] - abbreviated names of the days from Sunday (optional)
+	 *					dayNames		string[7] - names of the days from Sunday (optional)
+	 *					monthNamesShort string[12] - abbreviated names of the months (optional)
+	 *					monthNames		string[12] - names of the months (optional)
+	 * @return  Date - the extracted date value or null if value is blank
+	 */
+	parseDate: function (format, value, settings) {
+		if (format == null || value == null) {
+			throw "Invalid arguments";
+		}
+
+		value = (typeof value === "object" ? value.toString() : value + "");
+		if (value === "") {
+			return null;
+		}
+
+		var iFormat, dim, extra,
+			iValue = 0,
+			shortYearCutoffTemp = (settings ? settings.shortYearCutoff : null) || this._defaults.shortYearCutoff,
+			shortYearCutoff = (typeof shortYearCutoffTemp !== "string" ? shortYearCutoffTemp :
+				new Date().getFullYear() % 100 + parseInt(shortYearCutoffTemp, 10)),
+			dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort,
+			dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames,
+			monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort,
+			monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames,
+			year = -1,
+			month = -1,
+			day = -1,
+			doy = -1,
+			literal = false,
+			date,
+			// Check whether a format character is doubled
+			lookAhead = function(match) {
+				var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match);
+				if (matches) {
+					iFormat++;
+				}
+				return matches;
+			},
+			// Extract a number from the string value
+			getNumber = function(match) {
+				var isDoubled = lookAhead(match),
+					size = (match === "@" ? 14 : (match === "!" ? 20 :
+					(match === "y" && isDoubled ? 4 : (match === "o" ? 3 : 2)))),
+					digits = new RegExp("^\\d{1," + size + "}"),
+					num = value.substring(iValue).match(digits);
+				if (!num) {
+					throw "Missing number at position " + iValue;
+				}
+				iValue += num[0].length;
+				return parseInt(num[0], 10);
+			},
+			// Extract a name from the string value and convert to an index
+			getName = function(match, shortNames, longNames) {
+				var index = -1,
+					names = $.map(lookAhead(match) ? longNames : shortNames, function (v, k) {
+						return [ [k, v] ];
+					}).sort(function (a, b) {
+						return -(a[1].length - b[1].length);
+					});
+
+				$.each(names, function (i, pair) {
+					var name = pair[1];
+					if (value.substr(iValue, name.length).toLowerCase() === name.toLowerCase()) {
+						index = pair[0];
+						iValue += name.length;
+						return false;
+					}
+				});
+				if (index !== -1) {
+					return index + 1;
+				} else {
+					throw "Unknown name at position " + iValue;
+				}
+			},
+			// Confirm that a literal character matches the string value
+			checkLiteral = function() {
+				if (value.charAt(iValue) !== format.charAt(iFormat)) {
+					throw "Unexpected literal at position " + iValue;
+				}
+				iValue++;
+			};
+
+		for (iFormat = 0; iFormat < format.length; iFormat++) {
+			if (literal) {
+				if (format.charAt(iFormat) === "'" && !lookAhead("'")) {
+					literal = false;
+				} else {
+					checkLiteral();
+				}
+			} else {
+				switch (format.charAt(iFormat)) {
+					case "d":
+						day = getNumber("d");
+						break;
+					case "D":
+						getName("D", dayNamesShort, dayNames);
+						break;
+					case "o":
+						doy = getNumber("o");
+						break;
+					case "m":
+						month = getNumber("m");
+						break;
+					case "M":
+						month = getName("M", monthNamesShort, monthNames);
+						break;
+					case "y":
+						year = getNumber("y");
+						break;
+					case "@":
+						date = new Date(getNumber("@"));
+						year = date.getFullYear();
+						month = date.getMonth() + 1;
+						day = date.getDate();
+						break;
+					case "!":
+						date = new Date((getNumber("!") - this._ticksTo1970) / 10000);
+						year = date.getFullYear();
+						month = date.getMonth() + 1;
+						day = date.getDate();
+						break;
+					case "'":
+						if (lookAhead("'")){
+							checkLiteral();
+						} else {
+							literal = true;
+						}
+						break;
+					default:
+						checkLiteral();
+				}
+			}
+		}
+
+		if (iValue < value.length){
+			extra = value.substr(iValue);
+			if (!/^\s+/.test(extra)) {
+				throw "Extra/unparsed characters found in date: " + extra;
+			}
+		}
+
+		if (year === -1) {
+			year = new Date().getFullYear();
+		} else if (year < 100) {
+			year += new Date().getFullYear() - new Date().getFullYear() % 100 +
+				(year <= shortYearCutoff ? 0 : -100);
+		}
+
+		if (doy > -1) {
+			month = 1;
+			day = doy;
+			do {
+				dim = this._getDaysInMonth(year, month - 1);
+				if (day <= dim) {
+					break;
+				}
+				month++;
+				day -= dim;
+			} while (true);
+		}
+
+		date = this._daylightSavingAdjust(new Date(year, month - 1, day));
+		if (date.getFullYear() !== year || date.getMonth() + 1 !== month || date.getDate() !== day) {
+			throw "Invalid date"; // E.g. 31/02/00
+		}
+		return date;
+	},
+
+	/* Standard date formats. */
+	ATOM: "yy-mm-dd", // RFC 3339 (ISO 8601)
+	COOKIE: "D, dd M yy",
+	ISO_8601: "yy-mm-dd",
+	RFC_822: "D, d M y",
+	RFC_850: "DD, dd-M-y",
+	RFC_1036: "D, d M y",
+	RFC_1123: "D, d M yy",
+	RFC_2822: "D, d M yy",
+	RSS: "D, d M y", // RFC 822
+	TICKS: "!",
+	TIMESTAMP: "@",
+	W3C: "yy-mm-dd", // ISO 8601
+
+	_ticksTo1970: (((1970 - 1) * 365 + Math.floor(1970 / 4) - Math.floor(1970 / 100) +
+		Math.floor(1970 / 400)) * 24 * 60 * 60 * 10000000),
+
+	/* Format a date object into a string value.
+	 * The format can be combinations of the following:
+	 * d  - day of month (no leading zero)
+	 * dd - day of month (two digit)
+	 * o  - day of year (no leading zeros)
+	 * oo - day of year (three digit)
+	 * D  - day name short
+	 * DD - day name long
+	 * m  - month of year (no leading zero)
+	 * mm - month of year (two digit)
+	 * M  - month name short
+	 * MM - month name long
+	 * y  - year (two digit)
+	 * yy - year (four digit)
+	 * @ - Unix timestamp (ms since 01/01/1970)
+	 * ! - Windows ticks (100ns since 01/01/0001)
+	 * "..." - literal text
+	 * '' - single quote
+	 *
+	 * @param  format string - the desired format of the date
+	 * @param  date Date - the date value to format
+	 * @param  settings Object - attributes include:
+	 *					dayNamesShort	string[7] - abbreviated names of the days from Sunday (optional)
+	 *					dayNames		string[7] - names of the days from Sunday (optional)
+	 *					monthNamesShort string[12] - abbreviated names of the months (optional)
+	 *					monthNames		string[12] - names of the months (optional)
+	 * @return  string - the date in the above format
+	 */
+	formatDate: function (format, date, settings) {
+		if (!date) {
+			return "";
+		}
+
+		var iFormat,
+			dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort,
+			dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames,
+			monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort,
+			monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames,
+			// Check whether a format character is doubled
+			lookAhead = function(match) {
+				var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match);
+				if (matches) {
+					iFormat++;
+				}
+				return matches;
+			},
+			// Format a number, with leading zero if necessary
+			formatNumber = function(match, value, len) {
+				var num = "" + value;
+				if (lookAhead(match)) {
+					while (num.length < len) {
+						num = "0" + num;
+					}
+				}
+				return num;
+			},
+			// Format a name, short or long as requested
+			formatName = function(match, value, shortNames, longNames) {
+				return (lookAhead(match) ? longNames[value] : shortNames[value]);
+			},
+			output = "",
+			literal = false;
+
+		if (date) {
+			for (iFormat = 0; iFormat < format.length; iFormat++) {
+				if (literal) {
+					if (format.charAt(iFormat) === "'" && !lookAhead("'")) {
+						literal = false;
+					} else {
+						output += format.charAt(iFormat);
+					}
+				} else {
+					switch (format.charAt(iFormat)) {
+						case "d":
+							output += formatNumber("d", date.getDate(), 2);
+							break;
+						case "D":
+							output += formatName("D", date.getDay(), dayNamesShort, dayNames);
+							break;
+						case "o":
+							output += formatNumber("o",
+								Math.round((new Date(date.getFullYear(), date.getMonth(), date.getDate()).getTime() - new Date(date.getFullYear(), 0, 0).getTime()) / 86400000), 3);
+							break;
+						case "m":
+							output += formatNumber("m", date.getMonth() + 1, 2);
+							break;
+						case "M":
+							output += formatName("M", date.getMonth(), monthNamesShort, monthNames);
+							break;
+						case "y":
+							output += (lookAhead("y") ? date.getFullYear() :
+								(date.getYear() % 100 < 10 ? "0" : "") + date.getYear() % 100);
+							break;
+						case "@":
+							output += date.getTime();
+							break;
+						case "!":
+							output += date.getTime() * 10000 + this._ticksTo1970;
+							break;
+						case "'":
+							if (lookAhead("'")) {
+								output += "'";
+							} else {
+								literal = true;
+							}
+							break;
+						default:
+							output += format.charAt(iFormat);
+					}
+				}
+			}
+		}
+		return output;
+	},
+
+	/* Extract all possible characters from the date format. */
+	_possibleChars: function (format) {
+		var iFormat,
+			chars = "",
+			literal = false,
+			// Check whether a format character is doubled
+			lookAhead = function(match) {
+				var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match);
+				if (matches) {
+					iFormat++;
+				}
+				return matches;
+			};
+
+		for (iFormat = 0; iFormat < format.length; iFormat++) {
+			if (literal) {
+				if (format.charAt(iFormat) === "'" && !lookAhead("'")) {
+					literal = false;
+				} else {
+					chars += format.charAt(iFormat);
+				}
+			} else {
+				switch (format.charAt(iFormat)) {
+					case "d": case "m": case "y": case "@":
+						chars += "0123456789";
+						break;
+					case "D": case "M":
+						return null; // Accept anything
+					case "'":
+						if (lookAhead("'")) {
+							chars += "'";
+						} else {
+							literal = true;
+						}
+						break;
+					default:
+						chars += format.charAt(iFormat);
+				}
+			}
+		}
+		return chars;
+	},
+
+	/* Get a setting value, defaulting if necessary. */
+	_get: function(inst, name) {
+		return inst.settings[name] !== undefined ?
+			inst.settings[name] : this._defaults[name];
+	},
+
+	/* Parse existing date and initialise date picker. */
+	_setDateFromField: function(inst, noDefault) {
+		if (inst.input.val() === inst.lastVal) {
+			return;
+		}
+
+		var dateFormat = this._get(inst, "dateFormat"),
+			dates = inst.lastVal = inst.input ? inst.input.val() : null,
+			defaultDate = this._getDefaultDate(inst),
+			date = defaultDate,
+			settings = this._getFormatConfig(inst);
+
+		try {
+			date = this.parseDate(dateFormat, dates, settings) || defaultDate;
+		} catch (event) {
+			dates = (noDefault ? "" : dates);
+		}
+		inst.selectedDay = date.getDate();
+		inst.drawMonth = inst.selectedMonth = date.getMonth();
+		inst.drawYear = inst.selectedYear = date.getFullYear();
+		inst.currentDay = (dates ? date.getDate() : 0);
+		inst.currentMonth = (dates ? date.getMonth() : 0);
+		inst.currentYear = (dates ? date.getFullYear() : 0);
+		this._adjustInstDate(inst);
+	},
+
+	/* Retrieve the default date shown on opening. */
+	_getDefaultDate: function(inst) {
+		return this._restrictMinMax(inst,
+			this._determineDate(inst, this._get(inst, "defaultDate"), new Date()));
+	},
+
+	/* A date may be specified as an exact value or a relative one. */
+	_determineDate: function(inst, date, defaultDate) {
+		var offsetNumeric = function(offset) {
+				var date = new Date();
+				date.setDate(date.getDate() + offset);
+				return date;
+			},
+			offsetString = function(offset) {
+				try {
+					return $.datepicker.parseDate($.datepicker._get(inst, "dateFormat"),
+						offset, $.datepicker._getFormatConfig(inst));
+				}
+				catch (e) {
+					// Ignore
+				}
+
+				var date = (offset.toLowerCase().match(/^c/) ?
+					$.datepicker._getDate(inst) : null) || new Date(),
+					year = date.getFullYear(),
+					month = date.getMonth(),
+					day = date.getDate(),
+					pattern = /([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,
+					matches = pattern.exec(offset);
+
+				while (matches) {
+					switch (matches[2] || "d") {
+						case "d" : case "D" :
+							day += parseInt(matches[1],10); break;
+						case "w" : case "W" :
+							day += parseInt(matches[1],10) * 7; break;
+						case "m" : case "M" :
+							month += parseInt(matches[1],10);
+							day = Math.min(day, $.datepicker._getDaysInMonth(year, month));
+							break;
+						case "y": case "Y" :
+							year += parseInt(matches[1],10);
+							day = Math.min(day, $.datepicker._getDaysInMonth(year, month));
+							break;
+					}
+					matches = pattern.exec(offset);
+				}
+				return new Date(year, month, day);
+			},
+			newDate = (date == null || date === "" ? defaultDate : (typeof date === "string" ? offsetString(date) :
+				(typeof date === "number" ? (isNaN(date) ? defaultDate : offsetNumeric(date)) : new Date(date.getTime()))));
+
+		newDate = (newDate && newDate.toString() === "Invalid Date" ? defaultDate : newDate);
+		if (newDate) {
+			newDate.setHours(0);
+			newDate.setMinutes(0);
+			newDate.setSeconds(0);
+			newDate.setMilliseconds(0);
+		}
+		return this._daylightSavingAdjust(newDate);
+	},
+
+	/* Handle switch to/from daylight saving.
+	 * Hours may be non-zero on daylight saving cut-over:
+	 * > 12 when midnight changeover, but then cannot generate
+	 * midnight datetime, so jump to 1AM, otherwise reset.
+	 * @param  date  (Date) the date to check
+	 * @return  (Date) the corrected date
+	 */
+	_daylightSavingAdjust: function(date) {
+		if (!date) {
+			return null;
+		}
+		date.setHours(date.getHours() > 12 ? date.getHours() + 2 : 0);
+		return date;
+	},
+
+	/* Set the date(s) directly. */
+	_setDate: function(inst, date, noChange) {
+		var clear = !date,
+			origMonth = inst.selectedMonth,
+			origYear = inst.selectedYear,
+			newDate = this._restrictMinMax(inst, this._determineDate(inst, date, new Date()));
+
+		inst.selectedDay = inst.currentDay = newDate.getDate();
+		inst.drawMonth = inst.selectedMonth = inst.currentMonth = newDate.getMonth();
+		inst.drawYear = inst.selectedYear = inst.currentYear = newDate.getFullYear();
+		if ((origMonth !== inst.selectedMonth || origYear !== inst.selectedYear) && !noChange) {
+			this._notifyChange(inst);
+		}
+		this._adjustInstDate(inst);
+		if (inst.input) {
+			inst.input.val(clear ? "" : this._formatDate(inst));
+		}
+	},
+
+	/* Retrieve the date(s) directly. */
+	_getDate: function(inst) {
+		var startDate = (!inst.currentYear || (inst.input && inst.input.val() === "") ? null :
+			this._daylightSavingAdjust(new Date(
+			inst.currentYear, inst.currentMonth, inst.currentDay)));
+			return startDate;
+	},
+
+	/* Attach the onxxx handlers.  These are declared statically so
+	 * they work with static code transformers like Caja.
+	 */
+	_attachHandlers: function(inst) {
+		var stepMonths = this._get(inst, "stepMonths"),
+			id = "#" + inst.id.replace( /\\\\/g, "\\" );
+		inst.dpDiv.find("[data-handler]").map(function () {
+			var handler = {
+				prev: function () {
+					$.datepicker._adjustDate(id, -stepMonths, "M");
+				},
+				next: function () {
+					$.datepicker._adjustDate(id, +stepMonths, "M");
+				},
+				hide: function () {
+					$.datepicker._hideDatepicker();
+				},
+				today: function () {
+					$.datepicker._gotoToday(id);
+				},
+				selectDay: function () {
+					$.datepicker._selectDay(id, +this.getAttribute("data-month"), +this.getAttribute("data-year"), this);
+					return false;
+				},
+				selectMonth: function () {
+					$.datepicker._selectMonthYear(id, this, "M");
+					return false;
+				},
+				selectYear: function () {
+					$.datepicker._selectMonthYear(id, this, "Y");
+					return false;
+				}
+			};
+			$(this).bind(this.getAttribute("data-event"), handler[this.getAttribute("data-handler")]);
+		});
+	},
+
+	/* Generate the HTML for the current state of the date picker. */
+	_generateHTML: function(inst) {
+		var maxDraw, prevText, prev, nextText, next, currentText, gotoDate,
+			controls, buttonPanel, firstDay, showWeek, dayNames, dayNamesMin,
+			monthNames, monthNamesShort, beforeShowDay, showOtherMonths,
+			selectOtherMonths, defaultDate, html, dow, row, group, col, selectedDate,
+			cornerClass, calender, thead, day, daysInMonth, leadDays, curRows, numRows,
+			printDate, dRow, tbody, daySettings, otherMonth, unselectable,
+			tempDate = new Date(),
+			today = this._daylightSavingAdjust(
+				new Date(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate())), // clear time
+			isRTL = this._get(inst, "isRTL"),
+			showButtonPanel = this._get(inst, "showButtonPanel"),
+			hideIfNoPrevNext = this._get(inst, "hideIfNoPrevNext"),
+			navigationAsDateFormat = this._get(inst, "navigationAsDateFormat"),
+			numMonths = this._getNumberOfMonths(inst),
+			showCurrentAtPos = this._get(inst, "showCurrentAtPos"),
+			stepMonths = this._get(inst, "stepMonths"),
+			isMultiMonth = (numMonths[0] !== 1 || numMonths[1] !== 1),
+			currentDate = this._daylightSavingAdjust((!inst.currentDay ? new Date(9999, 9, 9) :
+				new Date(inst.currentYear, inst.currentMonth, inst.currentDay))),
+			minDate = this._getMinMaxDate(inst, "min"),
+			maxDate = this._getMinMaxDate(inst, "max"),
+			drawMonth = inst.drawMonth - showCurrentAtPos,
+			drawYear = inst.drawYear;
+
+		if (drawMonth < 0) {
+			drawMonth += 12;
+			drawYear--;
+		}
+		if (maxDate) {
+			maxDraw = this._daylightSavingAdjust(new Date(maxDate.getFullYear(),
+				maxDate.getMonth() - (numMonths[0] * numMonths[1]) + 1, maxDate.getDate()));
+			maxDraw = (minDate && maxDraw < minDate ? minDate : maxDraw);
+			while (this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1)) > maxDraw) {
+				drawMonth--;
+				if (drawMonth < 0) {
+					drawMonth = 11;
+					drawYear--;
+				}
+			}
+		}
+		inst.drawMonth = drawMonth;
+		inst.drawYear = drawYear;
+
+		prevText = this._get(inst, "prevText");
+		prevText = (!navigationAsDateFormat ? prevText : this.formatDate(prevText,
+			this._daylightSavingAdjust(new Date(drawYear, drawMonth - stepMonths, 1)),
+			this._getFormatConfig(inst)));
+
+		prev = (this._canAdjustMonth(inst, -1, drawYear, drawMonth) ?
+			"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click'" +
+			" title='" + prevText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "e" : "w") + "'>" + prevText + "</span></a>" :
+			(hideIfNoPrevNext ? "" : "<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='"+ prevText +"'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "e" : "w") + "'>" + prevText + "</span></a>"));
+
+		nextText = this._get(inst, "nextText");
+		nextText = (!navigationAsDateFormat ? nextText : this.formatDate(nextText,
+			this._daylightSavingAdjust(new Date(drawYear, drawMonth + stepMonths, 1)),
+			this._getFormatConfig(inst)));
+
+		next = (this._canAdjustMonth(inst, +1, drawYear, drawMonth) ?
+			"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click'" +
+			" title='" + nextText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "w" : "e") + "'>" + nextText + "</span></a>" :
+			(hideIfNoPrevNext ? "" : "<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='"+ nextText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "w" : "e") + "'>" + nextText + "</span></a>"));
+
+		currentText = this._get(inst, "currentText");
+		gotoDate = (this._get(inst, "gotoCurrent") && inst.currentDay ? currentDate : today);
+		currentText = (!navigationAsDateFormat ? currentText :
+			this.formatDate(currentText, gotoDate, this._getFormatConfig(inst)));
+
+		controls = (!inst.inline ? "<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>" +
+			this._get(inst, "closeText") + "</button>" : "");
+
+		buttonPanel = (showButtonPanel) ? "<div class='ui-datepicker-buttonpane ui-widget-content'>" + (isRTL ? controls : "") +
+			(this._isInRange(inst, gotoDate) ? "<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'" +
+			">" + currentText + "</button>" : "") + (isRTL ? "" : controls) + "</div>" : "";
+
+		firstDay = parseInt(this._get(inst, "firstDay"),10);
+		firstDay = (isNaN(firstDay) ? 0 : firstDay);
+
+		showWeek = this._get(inst, "showWeek");
+		dayNames = this._get(inst, "dayNames");
+		dayNamesMin = this._get(inst, "dayNamesMin");
+		monthNames = this._get(inst, "monthNames");
+		monthNamesShort = this._get(inst, "monthNamesShort");
+		beforeShowDay = this._get(inst, "beforeShowDay");
+		showOtherMonths = this._get(inst, "showOtherMonths");
+		selectOtherMonths = this._get(inst, "selectOtherMonths");
+		defaultDate = this._getDefaultDate(inst);
+		html = "";
+		dow;
+		for (row = 0; row < numMonths[0]; row++) {
+			group = "";
+			this.maxRows = 4;
+			for (col = 0; col < numMonths[1]; col++) {
+				selectedDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, inst.selectedDay));
+				cornerClass = " ui-corner-all";
+				calender = "";
+				if (isMultiMonth) {
+					calender += "<div class='ui-datepicker-group";
+					if (numMonths[1] > 1) {
+						switch (col) {
+							case 0: calender += " ui-datepicker-group-first";
+								cornerClass = " ui-corner-" + (isRTL ? "right" : "left"); break;
+							case numMonths[1]-1: calender += " ui-datepicker-group-last";
+								cornerClass = " ui-corner-" + (isRTL ? "left" : "right"); break;
+							default: calender += " ui-datepicker-group-middle"; cornerClass = ""; break;
+						}
+					}
+					calender += "'>";
+				}
+				calender += "<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix" + cornerClass + "'>" +
+					(/all|left/.test(cornerClass) && row === 0 ? (isRTL ? next : prev) : "") +
+					(/all|right/.test(cornerClass) && row === 0 ? (isRTL ? prev : next) : "") +
+					this._generateMonthYearHeader(inst, drawMonth, drawYear, minDate, maxDate,
+					row > 0 || col > 0, monthNames, monthNamesShort) + // draw month headers
+					"</div><table class='ui-datepicker-calendar'><thead>" +
+					"<tr>";
+				thead = (showWeek ? "<th class='ui-datepicker-week-col'>" + this._get(inst, "weekHeader") + "</th>" : "");
+				for (dow = 0; dow < 7; dow++) { // days of the week
+					day = (dow + firstDay) % 7;
+					thead += "<th" + ((dow + firstDay + 6) % 7 >= 5 ? " class='ui-datepicker-week-end'" : "") + ">" +
+						"<span title='" + dayNames[day] + "'>" + dayNamesMin[day] + "</span></th>";
+				}
+				calender += thead + "</tr></thead><tbody>";
+				daysInMonth = this._getDaysInMonth(drawYear, drawMonth);
+				if (drawYear === inst.selectedYear && drawMonth === inst.selectedMonth) {
+					inst.selectedDay = Math.min(inst.selectedDay, daysInMonth);
+				}
+				leadDays = (this._getFirstDayOfMonth(drawYear, drawMonth) - firstDay + 7) % 7;
+				curRows = Math.ceil((leadDays + daysInMonth) / 7); // calculate the number of rows to generate
+				numRows = (isMultiMonth ? this.maxRows > curRows ? this.maxRows : curRows : curRows); //If multiple months, use the higher number of rows (see #7043)
+				this.maxRows = numRows;
+				printDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1 - leadDays));
+				for (dRow = 0; dRow < numRows; dRow++) { // create date picker rows
+					calender += "<tr>";
+					tbody = (!showWeek ? "" : "<td class='ui-datepicker-week-col'>" +
+						this._get(inst, "calculateWeek")(printDate) + "</td>");
+					for (dow = 0; dow < 7; dow++) { // create date picker days
+						daySettings = (beforeShowDay ?
+							beforeShowDay.apply((inst.input ? inst.input[0] : null), [printDate]) : [true, ""]);
+						otherMonth = (printDate.getMonth() !== drawMonth);
+						unselectable = (otherMonth && !selectOtherMonths) || !daySettings[0] ||
+							(minDate && printDate < minDate) || (maxDate && printDate > maxDate);
+						tbody += "<td class='" +
+							((dow + firstDay + 6) % 7 >= 5 ? " ui-datepicker-week-end" : "") + // highlight weekends
+							(otherMonth ? " ui-datepicker-other-month" : "") + // highlight days from other months
+							((printDate.getTime() === selectedDate.getTime() && drawMonth === inst.selectedMonth && inst._keyEvent) || // user pressed key
+							(defaultDate.getTime() === printDate.getTime() && defaultDate.getTime() === selectedDate.getTime()) ?
+							// or defaultDate is current printedDate and defaultDate is selectedDate
+							" " + this._dayOverClass : "") + // highlight selected day
+							(unselectable ? " " + this._unselectableClass + " ui-state-disabled": "") +  // highlight unselectable days
+							(otherMonth && !showOtherMonths ? "" : " " + daySettings[1] + // highlight custom dates
+							(printDate.getTime() === currentDate.getTime() ? " " + this._currentClass : "") + // highlight selected day
+							(printDate.getTime() === today.getTime() ? " ui-datepicker-today" : "")) + "'" + // highlight today (if different)
+							((!otherMonth || showOtherMonths) && daySettings[2] ? " title='" + daySettings[2].replace(/'/g, "&#39;") + "'" : "") + // cell title
+							(unselectable ? "" : " data-handler='selectDay' data-event='click' data-month='" + printDate.getMonth() + "' data-year='" + printDate.getFullYear() + "'") + ">" + // actions
+							(otherMonth && !showOtherMonths ? "&#xa0;" : // display for other months
+							(unselectable ? "<span class='ui-state-default'>" + printDate.getDate() + "</span>" : "<a class='ui-state-default" +
+							(printDate.getTime() === today.getTime() ? " ui-state-highlight" : "") +
+							(printDate.getTime() === currentDate.getTime() ? " ui-state-active" : "") + // highlight selected day
+							(otherMonth ? " ui-priority-secondary" : "") + // distinguish dates from other months
+							"' href='#'>" + printDate.getDate() + "</a>")) + "</td>"; // display selectable date
+						printDate.setDate(printDate.getDate() + 1);
+						printDate = this._daylightSavingAdjust(printDate);
+					}
+					calender += tbody + "</tr>";
+				}
+				drawMonth++;
+				if (drawMonth > 11) {
+					drawMonth = 0;
+					drawYear++;
+				}
+				calender += "</tbody></table>" + (isMultiMonth ? "</div>" +
+							((numMonths[0] > 0 && col === numMonths[1]-1) ? "<div class='ui-datepicker-row-break'></div>" : "") : "");
+				group += calender;
+			}
+			html += group;
+		}
+		html += buttonPanel;
+		inst._keyEvent = false;
+		return html;
+	},
+
+	/* Generate the month and year header. */
+	_generateMonthYearHeader: function(inst, drawMonth, drawYear, minDate, maxDate,
+			secondary, monthNames, monthNamesShort) {
+
+		var inMinYear, inMaxYear, month, years, thisYear, determineYear, year, endYear,
+			changeMonth = this._get(inst, "changeMonth"),
+			changeYear = this._get(inst, "changeYear"),
+			showMonthAfterYear = this._get(inst, "showMonthAfterYear"),
+			html = "<div class='ui-datepicker-title'>",
+			monthHtml = "";
+
+		// month selection
+		if (secondary || !changeMonth) {
+			monthHtml += "<span class='ui-datepicker-month'>" + monthNames[drawMonth] + "</span>";
+		} else {
+			inMinYear = (minDate && minDate.getFullYear() === drawYear);
+			inMaxYear = (maxDate && maxDate.getFullYear() === drawYear);
+			monthHtml += "<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>";
+			for ( month = 0; month < 12; month++) {
+				if ((!inMinYear || month >= minDate.getMonth()) && (!inMaxYear || month <= maxDate.getMonth())) {
+					monthHtml += "<option value='" + month + "'" +
+						(month === drawMonth ? " selected='selected'" : "") +
+						">" + monthNamesShort[month] + "</option>";
+				}
+			}
+			monthHtml += "</select>";
+		}
+
+		if (!showMonthAfterYear) {
+			html += monthHtml + (secondary || !(changeMonth && changeYear) ? "&#xa0;" : "");
+		}
+
+		// year selection
+		if ( !inst.yearshtml ) {
+			inst.yearshtml = "";
+			if (secondary || !changeYear) {
+				html += "<span class='ui-datepicker-year'>" + drawYear + "</span>";
+			} else {
+				// determine range of years to display
+				years = this._get(inst, "yearRange").split(":");
+				thisYear = new Date().getFullYear();
+				determineYear = function(value) {
+					var year = (value.match(/c[+\-].*/) ? drawYear + parseInt(value.substring(1), 10) :
+						(value.match(/[+\-].*/) ? thisYear + parseInt(value, 10) :
+						parseInt(value, 10)));
+					return (isNaN(year) ? thisYear : year);
+				};
+				year = determineYear(years[0]);
+				endYear = Math.max(year, determineYear(years[1] || ""));
+				year = (minDate ? Math.max(year, minDate.getFullYear()) : year);
+				endYear = (maxDate ? Math.min(endYear, maxDate.getFullYear()) : endYear);
+				inst.yearshtml += "<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";
+				for (; year <= endYear; year++) {
+					inst.yearshtml += "<option value='" + year + "'" +
+						(year === drawYear ? " selected='selected'" : "") +
+						">" + year + "</option>";
+				}
+				inst.yearshtml += "</select>";
+
+				html += inst.yearshtml;
+				inst.yearshtml = null;
+			}
+		}
+
+		html += this._get(inst, "yearSuffix");
+		if (showMonthAfterYear) {
+			html += (secondary || !(changeMonth && changeYear) ? "&#xa0;" : "") + monthHtml;
+		}
+		html += "</div>"; // Close datepicker_header
+		return html;
+	},
+
+	/* Adjust one of the date sub-fields. */
+	_adjustInstDate: function(inst, offset, period) {
+		var year = inst.drawYear + (period === "Y" ? offset : 0),
+			month = inst.drawMonth + (period === "M" ? offset : 0),
+			day = Math.min(inst.selectedDay, this._getDaysInMonth(year, month)) + (period === "D" ? offset : 0),
+			date = this._restrictMinMax(inst, this._daylightSavingAdjust(new Date(year, month, day)));
+
+		inst.selectedDay = date.getDate();
+		inst.drawMonth = inst.selectedMonth = date.getMonth();
+		inst.drawYear = inst.selectedYear = date.getFullYear();
+		if (period === "M" || period === "Y") {
+			this._notifyChange(inst);
+		}
+	},
+
+	/* Ensure a date is within any min/max bounds. */
+	_restrictMinMax: function(inst, date) {
+		var minDate = this._getMinMaxDate(inst, "min"),
+			maxDate = this._getMinMaxDate(inst, "max"),
+			newDate = (minDate && date < minDate ? minDate : date);
+		return (maxDate && newDate > maxDate ? maxDate : newDate);
+	},
+
+	/* Notify change of month/year. */
+	_notifyChange: function(inst) {
+		var onChange = this._get(inst, "onChangeMonthYear");
+		if (onChange) {
+			onChange.apply((inst.input ? inst.input[0] : null),
+				[inst.selectedYear, inst.selectedMonth + 1, inst]);
+		}
+	},
+
+	/* Determine the number of months to show. */
+	_getNumberOfMonths: function(inst) {
+		var numMonths = this._get(inst, "numberOfMonths");
+		return (numMonths == null ? [1, 1] : (typeof numMonths === "number" ? [1, numMonths] : numMonths));
+	},
+
+	/* Determine the current maximum date - ensure no time components are set. */
+	_getMinMaxDate: function(inst, minMax) {
+		return this._determineDate(inst, this._get(inst, minMax + "Date"), null);
+	},
+
+	/* Find the number of days in a given month. */
+	_getDaysInMonth: function(year, month) {
+		return 32 - this._daylightSavingAdjust(new Date(year, month, 32)).getDate();
+	},
+
+	/* Find the day of the week of the first of a month. */
+	_getFirstDayOfMonth: function(year, month) {
+		return new Date(year, month, 1).getDay();
+	},
+
+	/* Determines if we should allow a "next/prev" month display change. */
+	_canAdjustMonth: function(inst, offset, curYear, curMonth) {
+		var numMonths = this._getNumberOfMonths(inst),
+			date = this._daylightSavingAdjust(new Date(curYear,
+			curMonth + (offset < 0 ? offset : numMonths[0] * numMonths[1]), 1));
+
+		if (offset < 0) {
+			date.setDate(this._getDaysInMonth(date.getFullYear(), date.getMonth()));
+		}
+		return this._isInRange(inst, date);
+	},
+
+	/* Is the given date in the accepted range? */
+	_isInRange: function(inst, date) {
+		var yearSplit, currentYear,
+			minDate = this._getMinMaxDate(inst, "min"),
+			maxDate = this._getMinMaxDate(inst, "max"),
+			minYear = null,
+			maxYear = null,
+			years = this._get(inst, "yearRange");
+			if (years){
+				yearSplit = years.split(":");
+				currentYear = new Date().getFullYear();
+				minYear = parseInt(yearSplit[0], 10);
+				maxYear = parseInt(yearSplit[1], 10);
+				if ( yearSplit[0].match(/[+\-].*/) ) {
+					minYear += currentYear;
+				}
+				if ( yearSplit[1].match(/[+\-].*/) ) {
+					maxYear += currentYear;
+				}
+			}
+
+		return ((!minDate || date.getTime() >= minDate.getTime()) &&
+			(!maxDate || date.getTime() <= maxDate.getTime()) &&
+			(!minYear || date.getFullYear() >= minYear) &&
+			(!maxYear || date.getFullYear() <= maxYear));
+	},
+
+	/* Provide the configuration settings for formatting/parsing. */
+	_getFormatConfig: function(inst) {
+		var shortYearCutoff = this._get(inst, "shortYearCutoff");
+		shortYearCutoff = (typeof shortYearCutoff !== "string" ? shortYearCutoff :
+			new Date().getFullYear() % 100 + parseInt(shortYearCutoff, 10));
+		return {shortYearCutoff: shortYearCutoff,
+			dayNamesShort: this._get(inst, "dayNamesShort"), dayNames: this._get(inst, "dayNames"),
+			monthNamesShort: this._get(inst, "monthNamesShort"), monthNames: this._get(inst, "monthNames")};
+	},
+
+	/* Format the given date for display. */
+	_formatDate: function(inst, day, month, year) {
+		if (!day) {
+			inst.currentDay = inst.selectedDay;
+			inst.currentMonth = inst.selectedMonth;
+			inst.currentYear = inst.selectedYear;
+		}
+		var date = (day ? (typeof day === "object" ? day :
+			this._daylightSavingAdjust(new Date(year, month, day))) :
+			this._daylightSavingAdjust(new Date(inst.currentYear, inst.currentMonth, inst.currentDay)));
+		return this.formatDate(this._get(inst, "dateFormat"), date, this._getFormatConfig(inst));
+	}
+});
+
+/*
+ * Bind hover events for datepicker elements.
+ * Done via delegate so the binding only occurs once in the lifetime of the parent div.
+ * Global instActive, set by _updateDatepicker allows the handlers to find their way back to the active picker.
+ */
+function bindHover(dpDiv) {
+	var selector = "button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";
+	return dpDiv.delegate(selector, "mouseout", function() {
+			$(this).removeClass("ui-state-hover");
+			if (this.className.indexOf("ui-datepicker-prev") !== -1) {
+				$(this).removeClass("ui-datepicker-prev-hover");
+			}
+			if (this.className.indexOf("ui-datepicker-next") !== -1) {
+				$(this).removeClass("ui-datepicker-next-hover");
+			}
+		})
+		.delegate(selector, "mouseover", function(){
+			if (!$.datepicker._isDisabledDatepicker( instActive.inline ? dpDiv.parent()[0] : instActive.input[0])) {
+				$(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");
+				$(this).addClass("ui-state-hover");
+				if (this.className.indexOf("ui-datepicker-prev") !== -1) {
+					$(this).addClass("ui-datepicker-prev-hover");
+				}
+				if (this.className.indexOf("ui-datepicker-next") !== -1) {
+					$(this).addClass("ui-datepicker-next-hover");
+				}
+			}
+		});
+}
+
+/* jQuery extend now ignores nulls! */
+function extendRemove(target, props) {
+	$.extend(target, props);
+	for (var name in props) {
+		if (props[name] == null) {
+			target[name] = props[name];
+		}
+	}
+	return target;
+}
+
+/* Invoke the datepicker functionality.
+   @param  options  string - a command, optionally followed by additional parameters or
+					Object - settings for attaching new datepicker functionality
+   @return  jQuery object */
+$.fn.datepicker = function(options){
+
+	/* Verify an empty collection wasn't passed - Fixes #6976 */
+	if ( !this.length ) {
+		return this;
+	}
+
+	/* Initialise the date picker. */
+	if (!$.datepicker.initialized) {
+		$(document).mousedown($.datepicker._checkExternalClick);
+		$.datepicker.initialized = true;
+	}
+
+	/* Append datepicker main container to body if not exist. */
+	if ($("#"+$.datepicker._mainDivId).length === 0) {
+		$("body").append($.datepicker.dpDiv);
+	}
+
+	var otherArgs = Array.prototype.slice.call(arguments, 1);
+	if (typeof options === "string" && (options === "isDisabled" || options === "getDate" || options === "widget")) {
+		return $.datepicker["_" + options + "Datepicker"].
+			apply($.datepicker, [this[0]].concat(otherArgs));
+	}
+	if (options === "option" && arguments.length === 2 && typeof arguments[1] === "string") {
+		return $.datepicker["_" + options + "Datepicker"].
+			apply($.datepicker, [this[0]].concat(otherArgs));
+	}
+	return this.each(function() {
+		typeof options === "string" ?
+			$.datepicker["_" + options + "Datepicker"].
+				apply($.datepicker, [this].concat(otherArgs)) :
+			$.datepicker._attachDatepicker(this, options);
+	});
+};
+
+$.datepicker = new Datepicker(); // singleton instance
+$.datepicker.initialized = false;
+$.datepicker.uuid = new Date().getTime();
+$.datepicker.version = "1.10.4";
+
+})(jQuery);

From 396446bb9b41d9fea4b880effe50a3776252e454 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Thu, 13 Feb 2014 08:43:35 -0500
Subject: [PATCH 02/71] check that meta is array before looping

---
 helpers/cmb_Meta_Box_types.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helpers/cmb_Meta_Box_types.php b/helpers/cmb_Meta_Box_types.php
index 5c28a3a..6fa57c5 100644
--- a/helpers/cmb_Meta_Box_types.php
+++ b/helpers/cmb_Meta_Box_types.php
@@ -505,7 +505,7 @@ public static function file_list( $field, $meta, $object_id ) {
 
 		echo '<ul id="', self::_id( '_status' ) ,'" class="cmb_media_status attach_list">';
 
-		if ( $meta ) {
+		if ( $meta && is_array( $meta ) ) {
 
 			foreach ( $meta as $id => $fullurl ) {
 				if ( self::is_valid_img_ext( $fullurl ) ) {

From e02862d39fcc82d04c48812544b4b0e917bab001 Mon Sep 17 00:00:00 2001
From: senicar <senicar@gmail.com>
Date: Tue, 4 Mar 2014 11:14:56 +0100
Subject: [PATCH 03/71] Return array of meta values on show_form if multiple is
 set to true

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

diff --git a/init.php b/init.php
index 5452993..b690057 100644
--- a/init.php
+++ b/init.php
@@ -393,7 +393,8 @@ public static function show_form( $meta_box, $object_id = 0, $object_type = '' )
 			$field['default'] = apply_filters( 'cmb_std_filter', $field['default'], $field, $object_id, $object_type );
 			$field['allow'] = 'file' == $field['type'] && ! isset( $field['allow'] ) ? array( 'url', 'attachment' ) : array();
 			$field['save_id'] = 'file' == $field['type'] && ! isset( $field['save_id'] );
-			$field['multiple'] = 'multicheck' == $field['type'];
+			if ( ! isset( $field['multiple'] ) )
+				$field['multiple'] = ( 'multicheck' == $field['type'] ) ? true : false;
 
 			// Allow an override for the field's value
 			// (assuming no one would want to save 'cmb_no_override_val' as a value)

From 818bab9dd2e49ba6a6569635b4b10eacd01edc6e Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Tue, 4 Mar 2014 13:52:31 -0500
Subject: [PATCH 04/71] check for styles being false w/o type check

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

diff --git a/init.php b/init.php
index e39ad41..28a1b39 100644
--- a/init.php
+++ b/init.php
@@ -285,7 +285,7 @@ public function do_scripts( $hook ) {
 			wp_enqueue_script( 'cmb-scripts' );
 
 			// default is to show cmb styles on post pages
-			if ( $this->_meta_box['cmb_styles'] != false )
+			if ( $this->_meta_box['cmb_styles'] )
 				wp_enqueue_style( 'cmb-styles' );
 		}
 	}

From 09f57a0e6baa4bcde55a52e7447478afc2dd18d1 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Tue, 4 Mar 2014 14:10:39 -0500
Subject: [PATCH 05/71] use _id()

---
 helpers/cmb_Meta_Box_types.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helpers/cmb_Meta_Box_types.php b/helpers/cmb_Meta_Box_types.php
index 3e53c7c..b611551 100644
--- a/helpers/cmb_Meta_Box_types.php
+++ b/helpers/cmb_Meta_Box_types.php
@@ -440,7 +440,7 @@ public static function wysiwyg( $field, $meta ) {
 
 	public static function taxonomy_select( $field, $meta, $object_id ) {
 
-		echo '<select name="', $field['id'], '" id="', $field['id'], '">';
+		echo '<select name="', self::_name(), '" id="', self::_id(), '">';
 		$names    = self::get_object_terms( $object_id, $field['taxonomy'] );
 		$terms    = get_terms( $field['taxonomy'], 'hide_empty=0' );
 		$has_term = false;

From 6bb1eef2675652b987eaa208552f1ad111e08bd6 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Tue, 4 Mar 2014 14:44:40 -0500
Subject: [PATCH 06/71] move field defaults to a method, `set_field_defaults`

---
 init.php | 60 +++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 36 insertions(+), 24 deletions(-)

diff --git a/init.php b/init.php
index 28a1b39..d11ed30 100644
--- a/init.php
+++ b/init.php
@@ -378,22 +378,7 @@ public static function show_form( $meta_box, $object_id = 0, $object_type = '' )
 			if ( isset( $field['on_front'] ) && $field['on_front'] == false )
 				continue;
 
-			self::$field =& $field;
-
-			// Set up blank or default values for empty ones
-			if ( ! isset( $field['name'] ) ) $field['name'] = '';
-			if ( ! isset( $field['desc'] ) ) $field['desc'] = '';
-			if ( ! isset( $field['default'] ) ) {
-				// Phase out 'std', and use 'default' instead
-				$field['default'] = isset( $field['std'] ) ? $field['std'] : '';
-			}
-			// Allow a filter override of the default value
-			$field['default'] = apply_filters( 'cmb_default_filter', $field['default'], $field, $object_id, $object_type );
-			// 'cmb_std_filter' deprectated, use 'cmb_default_filter' instead
-			$field['default'] = apply_filters( 'cmb_std_filter', $field['default'], $field, $object_id, $object_type );
-			$field['allow'] = 'file' == $field['type'] && ! isset( $field['allow'] ) ? array( 'url', 'attachment' ) : array();
-			$field['save_id'] = 'file' == $field['type'] && ! isset( $field['save_id'] );
-			$field['multiple'] = 'multicheck' == $field['type'];
+			$field = self::set_field_defaults( $field );
 
 			// Allow an override for the field's value
 			// (assuming no one would want to save 'cmb_no_override_val' as a value)
@@ -404,16 +389,14 @@ public static function show_form( $meta_box, $object_id = 0, $object_type = '' )
 				$meta = self::get_data();
 
 			$classes = '';
-			$field['repeatable'] = isset( $field['repeatable'] ) && $field['repeatable'];
 			$classes .= $field['repeatable'] ? ' cmb-repeat' : '';
 			// 'inline' flag, or _inline in the field type, set to true
-			$inline = ( isset( $field['inline'] ) && $field['inline'] || false !== stripos( $field['type'], '_inline' ) );
-			$classes .= $inline ? ' cmb-inline' : '';
+			$classes .= $field['inline'] ? ' cmb-inline' : '';
 
 			echo '<tr class="cmb-type-'. sanitize_html_class( $field['type'] ) .' cmb_id_'. sanitize_html_class( $field['id'] ) . $classes .'">';
 
 			if ( $field['type'] == "title" ) {
-				echo '<td colspan="2">';
+				echo '<td colspan="2">'."\n";
 			} else {
 				if ( isset( $meta_box['show_names'] ) && $meta_box['show_names'] == true ) {
 					$style = $object_type == 'post' ? ' style="width:18%"' : '';
@@ -421,16 +404,16 @@ public static function show_form( $meta_box, $object_id = 0, $object_type = '' )
 				} else {
 					echo '<label style="display:none;" for="', $field['id'], '">', $field['name'], '</label></th>';
 				}
-				echo '<td>';
+				echo "<td>\n";
 			}
 
-			echo empty( $field['before'] ) ? '' : $field['before'];
+			echo $field['before'];
 
 			call_user_func( array( $types, $field['type'] ), $field, $meta, $object_id, $object_type );
 
-			echo empty( $field['after'] ) ? '' : $field['after'];
+			echo $field['after'];
 
-			echo '</td>','</tr>';
+			echo "\n<</td>\n</tr>";
 		}
 		echo '</table>';
 		do_action( 'cmb_after_table', $meta_box, $object_id, $object_type );
@@ -903,6 +886,35 @@ public static function get_meta_box_url() {
 		return trailingslashit( apply_filters('cmb_meta_box_url', $cmb_url ) );
 	}
 
+	/**
+	 * Fills in empty field parameters with defaults
+	 * @since  1.0.3
+	 * @param  array $field Metabox field config array
+	 */
+	public static function set_field_defaults( $field ) {
+		self::$field =& $field;
+
+		// Set up blank or default values for empty ones
+		if ( ! isset( $field['name'] ) ) $field['name'] = '';
+		if ( ! isset( $field['desc'] ) ) $field['desc'] = '';
+		if ( ! isset( $field['before'] ) ) $field['before'] = '';
+		if ( ! isset( $field['after'] ) ) $field['after'] = '';
+		if ( ! isset( $field['default'] ) ) {
+			// Phase out 'std', and use 'default' instead
+			$field['default'] = isset( $field['std'] ) ? $field['std'] : '';
+		}
+		if ( ! isset( $field['preview_size'] ) ) $field['preview_size'] = array( 50, 50 );
+		// Allow a filter override of the default value
+		$field['default']    = apply_filters( 'cmb_default_filter', $field['default'], $field, $object_id, $object_type );
+		// 'cmb_std_filter' deprectated, use 'cmb_default_filter' instead
+		$field['default']    = apply_filters( 'cmb_std_filter', $field['default'], $field, $object_id, $object_type );
+		$field['allow']      = 'file' == $field['type'] && ! isset( $field['allow'] ) ? array( 'url', 'attachment' ) : array();
+		$field['save_id']    = 'file' == $field['type'] && ! isset( $field['save_id'] );
+		$field['multiple']   = 'multicheck' == $field['type'];
+		$field['repeatable'] = isset( $field['repeatable'] ) && $field['repeatable'];
+		$field['inline']     = isset( $field['inline'] ) && $field['inline'] || false !== stripos( $field['type'], '_inline' );
+	}
+
 	/**
 	 * Fills in empty metabox parameters with defaults
 	 * @since  1.0.1

From b634b7ddd62c4019c8a27f451a639c80db1a8e5f Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Tue, 4 Mar 2014 14:44:58 -0500
Subject: [PATCH 07/71] move preview size to defaults method

---
 helpers/cmb_Meta_Box_types.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/helpers/cmb_Meta_Box_types.php b/helpers/cmb_Meta_Box_types.php
index a46eb3b..e038889 100644
--- a/helpers/cmb_Meta_Box_types.php
+++ b/helpers/cmb_Meta_Box_types.php
@@ -526,13 +526,11 @@ public static function file_list( $field, $meta, $object_id ) {
 
 		if ( $meta && is_array( $meta ) ) {
 
-			$preview_size = empty( $field['preview_size'] ) ? array( 50, 50 ) : $field['preview_size'];
-
 			foreach ( $meta as $id => $fullurl ) {
 				if ( self::is_valid_img_ext( $fullurl ) ) {
 					echo
 					'<li class="img_status">',
-						wp_get_attachment_image( $id, $preview_size ),
+						wp_get_attachment_image( $id, $field['preview_size'] ),
 						'<p><a href="#" class="cmb_remove_file_button">'. __( 'Remove Image', 'cmb' ) .'</a></p>
 						<input type="hidden" id="filelist-', $id ,'" name="', $field['id'] ,'[', $id ,']" value="', $fullurl ,'" />
 					</li>';

From 4653355e94d0307f55dc6c7619d346d5597e7370 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Tue, 4 Mar 2014 15:20:10 -0500
Subject: [PATCH 08/71] fix docs

---
 helpers/cmb_Meta_Box_Sanitize.php | 2 +-
 helpers/cmb_Meta_Box_ajax.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/helpers/cmb_Meta_Box_Sanitize.php b/helpers/cmb_Meta_Box_Sanitize.php
index ead4f77..5bedb9b 100644
--- a/helpers/cmb_Meta_Box_Sanitize.php
+++ b/helpers/cmb_Meta_Box_Sanitize.php
@@ -8,7 +8,7 @@ class cmb_Meta_Box_Sanitize {
 
 	/**
 	 * A single instance of this class.
-	 * @var   cmb_Meta_Box_types object
+	 * @var   cmb_Meta_Box_Sanitize object
 	 * @since 1.0.0
 	 */
 	public static $instance = null;
diff --git a/helpers/cmb_Meta_Box_ajax.php b/helpers/cmb_Meta_Box_ajax.php
index c76a99b..196364b 100644
--- a/helpers/cmb_Meta_Box_ajax.php
+++ b/helpers/cmb_Meta_Box_ajax.php
@@ -19,7 +19,7 @@ class cmb_Meta_Box_ajax {
 	/**
 	 * Creates or returns an instance of this class.
 	 * @since  0.1.0
-	 * @return cmb_Meta_Box_types A single instance of this class.
+	 * @return cmb_Meta_Box_ajax A single instance of this class.
 	 */
 	public static function get() {
 		if ( self::$instance === null )

From e838900bb53a1fc6eb902fe25b2319ddf7629424 Mon Sep 17 00:00:00 2001
From: senicar <senicar@gmail.com>
Date: Wed, 5 Mar 2014 18:33:41 +0100
Subject: [PATCH 09/71] Moved "return multiple meta" fix to set_field_defaults

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

diff --git a/init.php b/init.php
index e312a4b..1ff55e0 100644
--- a/init.php
+++ b/init.php
@@ -379,8 +379,6 @@ public static function show_form( $meta_box, $object_id = 0, $object_type = '' )
 				continue;
 
 			$field = self::set_field_defaults( $field );
-			if ( ! isset( $field['multiple'] ) )
-				$field['multiple'] = ( 'multicheck' == $field['type'] ) ? true : false;
 
 			// Allow an override for the field's value
 			// (assuming no one would want to save 'cmb_no_override_val' as a value)
@@ -912,7 +910,8 @@ public static function set_field_defaults( $field ) {
 		$field['default']    = apply_filters( 'cmb_std_filter', $field['default'], $field, $object_id, $object_type );
 		$field['allow']      = 'file' == $field['type'] && ! isset( $field['allow'] ) ? array( 'url', 'attachment' ) : array();
 		$field['save_id']    = 'file' == $field['type'] && ! isset( $field['save_id'] );
-		$field['multiple']   = 'multicheck' == $field['type'];
+		if ( ! isset( $field['multiple'] ) )
+			$field['multiple'] = ( 'multicheck' == $field['type'] ) ? true : false;
 		$field['repeatable'] = isset( $field['repeatable'] ) && $field['repeatable'];
 		$field['inline']     = isset( $field['inline'] ) && $field['inline'] || false !== stripos( $field['type'], '_inline' );
 	}

From b7096ac0b09a941d9779ce27a1dfa2ee7cccc96d Mon Sep 17 00:00:00 2001
From: senicar <senicar@gmail.com>
Date: Wed, 5 Mar 2014 18:48:19 +0100
Subject: [PATCH 10/71] typo fix, removed extra <

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

diff --git a/init.php b/init.php
index d11ed30..ba1ece7 100644
--- a/init.php
+++ b/init.php
@@ -413,7 +413,7 @@ public static function show_form( $meta_box, $object_id = 0, $object_type = '' )
 
 			echo $field['after'];
 
-			echo "\n<</td>\n</tr>";
+			echo "\n</td>\n</tr>";
 		}
 		echo '</table>';
 		do_action( 'cmb_after_table', $meta_box, $object_id, $object_type );

From 4cfc9602b84b9c03044d6ada1d0a5b6aad6e5387 Mon Sep 17 00:00:00 2001
From: senicar <senicar@gmail.com>
Date: Wed, 5 Mar 2014 18:49:40 +0100
Subject: [PATCH 11/71] fixes invalid callback for call_user_func in show_form

There is a $field = self::set_field_defaults( $field ) but
set_field_defaults doesn't return anything so $field is null
---
 init.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/init.php b/init.php
index ba1ece7..b661a92 100644
--- a/init.php
+++ b/init.php
@@ -913,8 +913,11 @@ public static function set_field_defaults( $field ) {
 		$field['multiple']   = 'multicheck' == $field['type'];
 		$field['repeatable'] = isset( $field['repeatable'] ) && $field['repeatable'];
 		$field['inline']     = isset( $field['inline'] ) && $field['inline'] || false !== stripos( $field['type'], '_inline' );
+
+		return $field;
 	}
 
+
 	/**
 	 * Fills in empty metabox parameters with defaults
 	 * @since  1.0.1

From cc61be7c644f38ff6c2f27b62d1c08cdfd27e72f Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Mon, 10 Mar 2014 12:55:28 -0400
Subject: [PATCH 12/71] add class to wrapper around oembed remove button

---
 helpers/cmb_Meta_Box_ajax.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helpers/cmb_Meta_Box_ajax.php b/helpers/cmb_Meta_Box_ajax.php
index 196364b..0667f5e 100644
--- a/helpers/cmb_Meta_Box_ajax.php
+++ b/helpers/cmb_Meta_Box_ajax.php
@@ -128,7 +128,7 @@ public static function get_oembed( $url, $object_id, $args = array() ) {
 
 		// Send back our embed
 		if ( $check_embed && $check_embed != $fallback )
-			return '<div class="embed_status">'. $check_embed .'<p><a href="#" class="cmb_remove_file_button" rel="'. $args['field_id'] .'">'. __( 'Remove Embed', 'cmb' ) .'</a></p></div>';
+			return '<div class="embed_status">'. $check_embed .'<p class="cmb_remove_wrapper"><a href="#" class="cmb_remove_file_button" rel="'. $args['field_id'] .'">'. __( 'Remove Embed', 'cmb' ) .'</a></p></div>';
 
 		// Otherwise, send back error info that no oEmbeds were found
 		return '<p class="ui-state-error-text">'. sprintf( __( 'No oEmbed Results Found for %s. View more info at', 'cmb' ), $fallback ) .' <a href="http://codex.wordpress.org/Embeds" target="_blank">codex.wordpress.org/Embeds</a>.</p>';

From c4ecac3e1b65ad381a554d59ac205b7c98f94563 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Mon, 10 Mar 2014 12:57:52 -0400
Subject: [PATCH 13/71] new class for generating a field object for use in the
 types and sanitize classes (as well as the main class)

---
 helpers/cmb_Meta_Box_field.php | 215 +++++++++++++++++++++++++++++++++
 1 file changed, 215 insertions(+)
 create mode 100644 helpers/cmb_Meta_Box_field.php

diff --git a/helpers/cmb_Meta_Box_field.php b/helpers/cmb_Meta_Box_field.php
new file mode 100644
index 0000000..4661fea
--- /dev/null
+++ b/helpers/cmb_Meta_Box_field.php
@@ -0,0 +1,215 @@
+<?php
+
+/**
+ * CMB field class
+ * @since  1.0.3
+ */
+class cmb_Meta_Box_field {
+
+	/**
+	 * Metabox object id
+	 * @var   mixed
+	 * @since 1.0.0
+	 */
+	public $object_id;
+
+	/**
+	 * Metabox object type
+	 * @var   mixed
+	 * @since 1.0.0
+	 */
+	public $object_type;
+
+	/**
+	 * Field arguments
+	 * @var   mixed
+	 * @since 1.0.0
+	 */
+	public $args;
+
+	/**
+	 * Field meta value
+	 * @var   mixed
+	 * @since 1.0.0
+	 */
+	public $meta;
+
+	/**
+	 * An iterator value for repeatable fields
+	 * @var   integer
+	 * @since 1.0.0
+	 */
+	public $iterator = 0;
+
+
+	public function __construct( $field_args, $object_id, $object_type ) {
+		$this->object_id   = $object_id;
+		$this->object_type = $object_type;
+		$this->args        = $this->set_field_defaults( $field_args );
+
+		// Allow an override for the field's value
+		// (assuming no one would want to save 'cmb_no_override_val' as a value)
+		$this->value = apply_filters( 'cmb_override_meta_value', 'cmb_no_override_val', $object_id, $this->args(), $object_type, $this );
+
+		// If no override, get our meta
+		$this->value = 'cmb_no_override_val' === $this->value
+			? $this->get_data()
+			: $this->value;
+	}
+
+	public function args( $key = '' ) {
+		return $this->_data( 'args', $key );
+	}
+
+	public function value( $key = '' ) {
+		return $this->_data( 'value', $key );
+	}
+
+	public function _data( $var, $key = '' ) {
+		$vars = $this->$var;
+		if ( $key ) {
+			return isset( $vars[ $key ] ) ? $vars[ $key ] : false;
+		}
+		return $vars;
+	}
+
+	/**
+	 * Retrieves metadata/option data
+	 * @since  1.0.1
+	 * @param  string  $field_id Meta key/Option array key
+	 * @return mixed             Meta/Option value
+	 */
+	public function get_data() {
+
+		$type     = $this->object_type;
+		$id       = $this->object_id;
+		$field_id = $this->args( 'id' );
+		$single   = ! $this->args( 'multiple' );
+		$repeat   = $this->args( 'repeatable' );
+
+		$data = 'options-page' === $type
+			? cmb_Meta_Box::get_option( $id, $field_id )
+			: get_metadata( $type, $id, $field_id, ( $single || $repeat ) /* If multicheck this can be multiple values */ );
+
+		return $data;
+	}
+
+	public function escaping_exception() {
+		// These types cannot be escaped
+		return in_array( $this->args( 'type' ), array(
+			'file_list',
+			'multicheck',
+			'text_datetime_timestamp_timezone',
+		) );
+	}
+
+	public function repeatable_exception( $type ) {
+		// These types cannot be escaped
+		return in_array( $type, array(
+			'title',
+			'file', // Use file_list
+			'radio',
+			// @todo Ajax load wp_editor: http://wordpress.stackexchange.com/questions/51776/how-to-load-wp-editor-through-ajax-jquery
+			'wysiwyg',
+			'checkbox',
+			'radio_inline',
+			'taxonomy_radio',
+			'taxonomy_select',
+			'taxonomy_multicheck',
+		) );
+	}
+
+	/**
+	 * Escape the value before output. Defaults to 'esc_attr()'
+	 * @since  1.0.1
+	 * @param  mixed  $meta_value Meta value
+	 * @param  mixed  $func       Escaping function (if not esc_attr())
+	 * @return mixed              Final value
+	 */
+	public function escaped_value( $func = 'esc_attr', $meta_value = '' ) {
+
+		if ( isset( $this->escaped_value ) )
+			return $this->escaped_value;
+
+		$meta_value = $meta_value ? $meta_value : $this->value();
+		// Check if the field has a registered escaping callback
+		$cb = cmb_Meta_Box::maybe_callback( $this->args(), 'escape_cb' );
+		if ( false === $cb || $this->escaping_exception() ) {
+			// If requesting NO escaping, return meta value
+			return $meta_value;
+		} elseif ( $cb ) {
+			// Ok, callback is good, let's run it.
+			return call_user_func( $cb, $meta_value, $this->args(), $this );
+		}
+
+		// Or custom escaping filter can be used
+		$esc = apply_filters( 'cmb_types_esc_'. $this->args( 'type' ), null, $meta_value, $this->args(), $this );
+		if ( null !== $esc ) {
+			return $esc;
+		}
+
+		// escaping function passed in?
+		$func       = $func ? $func : 'esc_attr';
+		$meta_value = ! empty( $meta_value ) ? $meta_value : $this->args( 'default' );
+
+		if ( is_array( $meta_value ) ) {
+			foreach ( $meta_value as $key => $value ) {
+				$meta_value[ $key ] = call_user_func( $func, $value );
+			}
+		} else {
+			$meta_value = call_user_func( $func, $meta_value );
+		}
+
+		$this->escaped_value = $meta_value;
+		return $this->escaped_value;
+	}
+
+	/**
+	 * Fills in empty field parameters with defaults
+	 * @since  1.0.3
+	 * @param  array $field Metabox field config array
+	 */
+	public function set_field_defaults( $args ) {
+
+		// Set up blank or default values for empty ones
+		if ( ! isset( $args['name'] ) ) $args['name'] = '';
+		if ( ! isset( $args['desc'] ) ) $args['desc'] = '';
+		if ( ! isset( $args['before'] ) ) $args['before'] = '';
+		if ( ! isset( $args['after'] ) ) $args['after'] = '';
+		if ( ! isset( $args['protocols'] ) ) $args['protocols'] = null;
+		if ( ! isset( $args['default'] ) ) {
+			// Phase out 'std', and use 'default' instead
+			$args['default'] = isset( $args['std'] ) ? $args['std'] : '';
+		}
+		if ( ! isset( $args['preview_size'] ) ) $args['preview_size'] = array( 50, 50 );
+		// Allow a filter override of the default value
+		$args['default']    = apply_filters( 'cmb_default_filter', $args['default'], $args, $this->object_type, $this->object_type );
+		// 'cmb_std_filter' deprectated, use 'cmb_default_filter' instead
+		$args['default']    = apply_filters( 'cmb_std_filter', $args['default'], $args, $this->object_type, $this->object_type );
+		$args['allow']      = 'file' == $args['type'] && ! isset( $args['allow'] ) ? array( 'url', 'attachment' ) : array();
+		$args['save_id']    = 'file' == $args['type'] && ! isset( $args['save_id'] );
+		$args['multiple']   = isset( $args['multiple'] ) ? $args['multiple'] : ( 'multicheck' == $args['type'] ? true : false );
+		$args['repeatable'] = isset( $args['repeatable'] ) && $args['repeatable'] && ! $this->repeatable_exception( $args['type'] );
+		$args['inline']     = isset( $args['inline'] ) && $args['inline'] || false !== stripos( $args['type'], '_inline' );
+		$args['on_front']   = ! ( isset( $args['on_front'] ) && ! $args['on_front'] );
+		$args['attributes'] = isset( $args['attributes'] ) && is_array( $args['attributes'] ) ? $args['attributes'] : array();
+		$args['options']    = isset( $args['options'] ) && is_array( $args['options'] ) ? $args['options'] : array();
+
+		if ( 'wysiwyg' == $args['type'] ) {
+			$args['id'] = strtolower( str_ireplace( array( '-', '_' ), '', $args['id'] ) ) . 'wpeditor';
+		}
+
+
+		return $args;
+	}
+
+	/**
+	 * Updates attributes array values unless they exist from the field config array
+	 * @since  1.0.3
+	 * @param  array  $attrs Array of attributes to update
+	 */
+	public function maybe_set_attributes( $attrs = array() ) {
+		return wp_parse_args( $attrs, $this->args['attributes'] );
+	}
+
+}

From 39904bea2882f59082f2ace5ff53bb65ac144f21 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Mon, 10 Mar 2014 13:00:18 -0400
Subject: [PATCH 14/71] Restructure main class to use new field object instead
 of passed-in array

---
 init.php | 163 ++++++++++++++++++++-----------------------------------
 1 file changed, 60 insertions(+), 103 deletions(-)

diff --git a/init.php b/init.php
index 9ebba70..7bbaa58 100644
--- a/init.php
+++ b/init.php
@@ -71,6 +71,7 @@ class cmb_Meta_Box {
 	protected static $mb_defaults = array(
 		'id'         => '',
 		'title'      => '',
+		'type'       => '',
 		'pages'      => array(), // Post type
 		'context'    => 'normal',
 		'priority'   => 'high',
@@ -365,77 +366,49 @@ public static function show_form( $meta_box, $object_id = 0, $object_type = '' )
 		// Set/get ID
 		$object_id = self::set_object_id( $object_id ? $object_id : self::get_object_id() );
 
-		// get box types
-		$types = cmb_Meta_Box_types::get();
-
 		// Use nonce for verification
 		echo "\n<!-- Begin CMB Fields -->\n";
 		wp_nonce_field( self::nonce(), 'wp_meta_box_nonce', false, true );
 		do_action( 'cmb_before_table', $meta_box, $object_id, $object_type );
 		echo '<table class="form-table cmb_metabox">';
 
-		foreach ( $meta_box['fields'] as $field ) {
+		foreach ( $meta_box['fields'] as $field_args ) {
 
-			if ( isset( $field['on_front'] ) && $field['on_front'] == false )
-				continue;
+			$field = new cmb_Meta_Box_field( $field_args, $object_id, $object_type );
 
 			self::$field =& $field;
 
-			// Set up blank or default values for empty ones
-			if ( ! isset( $field['name'] ) ) $field['name'] = '';
-			if ( ! isset( $field['desc'] ) ) $field['desc'] = '';
-			if ( ! isset( $field['default'] ) ) {
-				// Phase out 'std', and use 'default' instead
-				$field['default'] = isset( $field['std'] ) ? $field['std'] : '';
-			}
-			// Allow a filter override of the default value
-			$field['default'] = apply_filters( 'cmb_default_filter', $field['default'], $field, $object_id, $object_type );
-			// 'cmb_std_filter' deprectated, use 'cmb_default_filter' instead
-			$field['default'] = apply_filters( 'cmb_std_filter', $field['default'], $field, $object_id, $object_type );
-			$field['allow'] = 'file' == $field['type'] && ! isset( $field['allow'] ) ? array( 'url', 'attachment' ) : array();
-			$field['save_id'] = 'file' == $field['type'] && ! isset( $field['save_id'] );
-			$field['multiple'] = 'multicheck' == $field['type'];
-
-			// Allow an override for the field's value
-			// (assuming no one would want to save 'cmb_no_override_val' as a value)
-			$meta = apply_filters( 'cmb_override_meta_value', 'cmb_no_override_val', $object_id, $field, $object_type );
-
-			// If no override, get our meta
-			if ( $meta === 'cmb_no_override_val' )
-				$meta = self::get_data();
+			if ( ! $field->args( 'on_front' ) )
+				continue;
 
+			$type    = $field->args( 'type' );
 			$classes = '';
-			$field['repeatable'] = isset( $field['repeatable'] ) && $field['repeatable'];
-			$classes .= $field['repeatable'] ? ' cmb-repeat' : '';
+			$classes .= $field->args( 'repeatable' ) ? ' cmb-repeat' : '';
 			// 'inline' flag, or _inline in the field type, set to true
-			$inline = ( isset( $field['inline'] ) && $field['inline'] || false !== stripos( $field['type'], '_inline' ) );
-			$classes .= $inline ? ' cmb-inline' : '';
+			$classes .= $field->args( 'inline' ) ? ' cmb-inline' : '';
 
-			echo '<tr class="cmb-type-'. sanitize_html_class( $field['type'] ) .' cmb_id_'. sanitize_html_class( $field['id'] ) . $classes .'">';
+			echo '<tr class="cmb-type-'. sanitize_html_class( $type ) .' cmb_id_'. sanitize_html_class( $field->args( 'id' ) ) . $classes .'">';
 
-			if ( $field['type'] == "title" ) {
-				echo '<td colspan="2">';
+			if ( $type == "title" ) {
+				echo '<td colspan="2">'."\n";
 			} else {
-				if ( isset( $meta_box['show_names'] ) && $meta_box['show_names'] == true ) {
+				if ( isset( $meta_box['show_names'] ) && $meta_box['show_names'] ) {
 					$style = $object_type == 'post' ? ' style="width:18%"' : '';
-					echo '<th'. $style .'><label for="', $field['id'], '">', $field['name'], '</label></th>';
+					echo '<th'. $style .'><label for="', $field->args( 'id' ), '">', $field->args( 'name' ), '</label></th>';
 				} else {
-					echo '<label style="display:none;" for="', $field['id'], '">', $field['name'], '</label></th>';
+					echo '<label style="display:none;" for="', $field->args( 'id' ), '">', $field->args( 'name' ), '</label></th>';
 				}
-				echo '<td>';
+				echo "<td>\n";
 			}
 
-			echo empty( $field['before'] ) ? '' : $field['before'];
+			echo $field->args( 'before' );
 
-			if ( true == $field['repeatable'] ) {
-				call_user_func( array( $types, 'render_repeatable_field' ), $field, $meta, $object_id, $object_type );
-			} else {
-				call_user_func( array( $types, $field['type'] ), $field, $meta, $object_id, $object_type );
-			}
+			$field_type = new cmb_Meta_Box_types( $field );
+			$field_type->render();
 
-			echo empty( $field['after'] ) ? '' : $field['after'];
+			echo $field->args( 'after' );
 
-			echo '</td>','</tr>';
+			echo "\n</td>\n</tr>";
 		}
 		echo '</table>';
 		do_action( 'cmb_after_table', $meta_box, $object_id, $object_type );
@@ -507,37 +480,25 @@ public static function save_fields( $meta_box, $object_id, $object_type = '' ) {
 		// save field ids of those that are updated
 		$updated = array();
 
-		foreach ( $meta_box['fields'] as $field ) {
+		foreach ( $meta_box['fields'] as $field_args ) {
 
-			self::$field =& $field;
-			$name = $field['id'];
+			$field = new cmb_Meta_Box_field( $field_args, $object_id, $object_type );
 
-			if ( ! isset( $field['multiple'] ) )
-				$field['multiple'] = ( 'multicheck' == $field['type'] ) ? true : false;
+			self::$field =& $field;
+			$name = $field->args( 'id' );
 
 			$old = self::get_data();
-			$new = isset( $_POST[ $field['id'] ] ) ? $_POST[ $field['id'] ] : null;
-
-
-			if ( $object_type == 'post' ) {
+			$new = isset( $_POST[ $name ] ) ? $_POST[ $name ] : null;
 
-				if (
-					isset( $field['taxonomy'] )
-					&& in_array( $field['type'], array( 'taxonomy_select', 'taxonomy_radio', 'taxonomy_multicheck' ) )
-				)
-					$new = wp_set_object_terms( $object_id, $new, $field['taxonomy'] );
-
-			}
-
-			if ( isset( $field['repeatable'] ) && $field['repeatable'] && is_array( $new ) ) {
+			if ( $field->args( 'repeatable' ) && is_array( $new ) ) {
+				// Remove empties
 				$new = array_filter( $new );
 			}
 
 			// Check if this metabox field has a registered validation callback, or perform default sanitization
 			$new = self::sanitization_cb( $new );
 
-			if ( $field['multiple'] ) {
-
+			if ( $field->args( 'multiple' ) && ! $field->args( 'repeatable' ) ) {
 				self::remove_data( $name );
 				if ( ! empty( $new ) ) {
 					foreach ( $new as $add_new ) {
@@ -598,8 +559,7 @@ public static function timezone_string() {
 	 * @return string           Offset time string
 	 */
 	public static function timezone_offset( $tzstring ) {
-		if ( !empty( $tzstring ) ) {
-
+		if ( ! empty( $tzstring ) && is_string( $tzstring ) ) {
 			if ( substr( $tzstring, 0, 3 ) === 'UTC' ) {
 				$tzstring = str_replace( array( ':15',':30',':45' ), array( '.25','.5','.75' ), $tzstring );
 				return intval( floatval( substr( $tzstring, 3 ) ) * HOUR_IN_SECONDS );
@@ -638,12 +598,10 @@ public static function field_timezone( $object_id = 0 ) {
 		if ( ! ( $object_id = self::get_object_id( $object_id ) ) )
 			return $tzstring;
 
-		if ( array_key_exists( 'timezone', self::$field ) && self::$field['timezone'] ) {
-			$tzstring = self::$field['timezone'];
-		} else if ( array_key_exists( 'timezone_meta_key', self::$field ) && self::$field['timezone_meta_key'] ) {
-			$tzstring = self::get_data( self::$field['timezone_meta_key'] );
-
-			return $tzstring;
+		if ( self::$field->args( 'timezone' ) ) {
+			return self::$field->args( 'timezone' );
+		} else if ( self::$field->args( 'timezone_meta_key' ) ) {
+			return self::$field->args( 'timezone_meta_key' );
 		}
 
 		return false;
@@ -830,55 +788,50 @@ public static function image_id_from_url( $img_url ) {
 	 * Checks if field has a registered validation callback
 	 * @since  1.0.1
 	 * @param  mixed $meta_value Meta value
-	 * @param  array $field      Field config array
+	 * @param  null  $field      Field object
 	 * @return mixed             Possibly validated meta value
 	 */
-	public static function sanitization_cb( $meta_value, $field = array() ) {
+	public static function sanitization_cb( $meta_value, $field = null ) {
 		if ( empty( $meta_value ) )
 			return $meta_value;
 
-		$field = $field !== array() ? $field : self::$field;
+		$field = $field !== null ? $field : self::$field;
 
 		// Check if the field has a registered validation callback
-		$cb = self::maybe_callback( $field, 'sanitization_cb' );
+		$cb = self::maybe_callback( $field->args(), 'sanitization_cb' );
 		if ( false === $cb ) {
 			// If requestion NO validation, return meta value
 			return $meta_value;
 		} elseif ( $cb ) {
 			// Ok, callback is good, let's run it.
-			return call_user_func( $cb, $meta_value, $field );
+			return call_user_func( $cb, $meta_value, $field->args() );
 		}
 
+		$clean = new cmb_Meta_Box_Sanitize( $field, $meta_value );
 		// Validation via 'cmb_Meta_Box_Sanitize' (with fallback filter)
-		return call_user_func( array( cmb_Meta_Box_Sanitize::get(), $field['type'] ), $meta_value, $field );
+		return $clean->{$field->args( 'type' )}( $meta_value );
 	}
 
 	/**
 	 * Checks if field has a callback value
 	 * @since  1.0.1
-	 * @param  array   $field Field config array
+	 * @param  array  $field Field config array
 	 * @param  string  $cb    Callback string
 	 * @return mixed          NULL, false for NO validation, or $cb string if it exists.
 	 */
-	public static function maybe_callback( $field, $cb ) {
-		if ( ! isset( $field[ $cb ] ) )
+	public static function maybe_callback( $field_args, $cb ) {
+		if ( ! isset( $field_args[ $cb ] ) )
 			return;
 
 		// Check if metabox is requesting NO validation
-		$cb = false !== $field[ $cb ] && 'false' !== $field[ $cb ] ? $field[ $cb ] : false;
+		$cb = false !== $field_args[ $cb ] && 'false' !== $field_args[ $cb ] ? $field_args[ $cb ] : false;
 
 		// If requestion NO validation, return false
 		if ( ! $cb )
 			return false;
 
-		if (
-			// Standard function
-			( is_string( $cb ) && function_exists( $cb ) )
-			// Or Class method
-			|| ( is_array( $cb ) && is_callable( $cb ) )
-		) {
+		if ( is_callable( $cb ) )
 			return $cb;
-		}
 
 	}
 
@@ -928,11 +881,13 @@ public static function get_data( $field_id = '' ) {
 
 		$type     = self::get_object_type();
 		$id       = self::get_object_id();
-		$field_id = $field_id ? $field_id : self::$field['id'];
+		$field_id = $field_id ? $field_id : self::$field->args( 'id' );
+		$single   = ! self::$field->args( 'multiple' );
+		$repeat   = self::$field->args( 'repeatable' );
 
 		$data = 'options-page' === $type
 			? self::get_option( $id, $field_id )
-			: get_metadata( $type, $id, $field_id, !self::$field['multiple'] /* If multicheck this can be multiple values */ );
+			: get_metadata( $type, $id, $field_id, ( $single || $repeat ) /* If multicheck this can be multiple values */ );
 
 		return $data;
 	}
@@ -947,17 +902,19 @@ public static function get_data( $field_id = '' ) {
 	 */
 	public static function update_data( $value, $field_id = '', $multiple = false ) {
 
+		$repeat   = self::$field->args( 'repeatable' );
 		$type     = self::get_object_type();
 		$id       = self::get_object_id();
-		$field_id = $field_id ? $field_id : self::$field['id'];
+		$field_id = $field_id ? $field_id : self::$field->args( 'id' );
+		$value    = $repeat ? array_values( $value ) : $value;
 
 		if ( 'options-page' === $type ) {
-			self::update_option( $id, $field_id, $value );
+			return self::update_option( $id, $field_id, $value );
 		} else {
 			if ( $multiple ) {
-				add_metadata( $type, $id, $field_id, $value, false );
+				return add_metadata( $type, $id, $field_id, $value, false );
 			} else {
-				update_metadata( $type, $id, $field_id, $value );
+				return update_metadata( $type, $id, $field_id, $value );
 			}
 		}
 	}
@@ -972,7 +929,7 @@ public static function remove_data( $field_id = '', $old = '' ) {
 
 		$type     = self::get_object_type();
 		$id       = self::get_object_id();
-		$field_id = $field_id ? $field_id : self::$field['id'];
+		$field_id = $field_id ? $field_id : self::$field->args( 'id' );
 
 		$data = 'options-page' === $type
 			? self::remove_option( $id, $field_id )
@@ -1021,14 +978,14 @@ public static function get_option( $option_key, $field_id = '' ) {
 	 * @param  string  $option_key Option key
 	 * @param  string  $field_id   Option array field key
 	 * @param  mixed   $value      Value to update data with
-	 * @param  array   $field      Optionally specify a field array
+	 * @param  object  $field      Optionally specify a field object
 	 * @return array               Modified options
 	 */
-	public static function update_option( $option_key, $field_id, $value, $field = array() ) {
+	public static function update_option( $option_key, $field_id, $value, $field = null ) {
 
-		$field = $field !== array() ? $field : self::$field;
+		$field = $field !== null ? $field : self::$field;
 
-		if ( isset( $field['multiple'] ) && $field['multiple'] ) {
+		if ( $field->args( 'multiple' ) ) {
 			// If multiple, add to array
 			self::$options[ $option_key ][ $field_id ][] = $value;
 		} else {

From c1330c92c6bae4202a086281b0cbe8765754850b Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Mon, 10 Mar 2014 13:01:35 -0400
Subject: [PATCH 15/71] Restructure types class to be proper OOP, and pass in
 the field object. Also restructured for repeatable fields to work properly
 across more field types

---
 helpers/cmb_Meta_Box_types.php | 818 ++++++++++++++++++---------------
 1 file changed, 452 insertions(+), 366 deletions(-)

diff --git a/helpers/cmb_Meta_Box_types.php b/helpers/cmb_Meta_Box_types.php
index b611551..01e960f 100644
--- a/helpers/cmb_Meta_Box_types.php
+++ b/helpers/cmb_Meta_Box_types.php
@@ -2,132 +2,167 @@
 
 /**
  * CMB field types
+ *
+ * @todo test taxonomy methods with non-post objects
+ * @todo test all methods with non-post objects
+ *
  * @since  1.0.0
  */
 class cmb_Meta_Box_types {
 
-	/**
-	 * @todo test taxonomy methods with non-post objects
-	 * @todo test all methods with non-post objects
-	 */
-
-	/**
-	 * A single instance of this class.
-	 * @var   cmb_Meta_Box_types object
-	 * @since 1.0.0
-	 */
-	public static $instance = null;
-
 	/**
 	 * An iterator value for repeatable fields
 	 * @var   integer
 	 * @since 1.0.0
 	 */
-	public static $iterator = 0;
+	public $iterator = 0;
 
 	/**
-	 * Holds cmb_valid_img_types
+	 * Current field
 	 * @var   array
 	 * @since 1.0.0
 	 */
-	public static $valid = array();
+	public $field;
 
-	/**
-	 * Current field type
-	 * @var   string
-	 * @since 1.0.0
-	 */
-	public static $type = 'text';
+	public function __construct( $field ) {
+		$this->field = $field;
+	}
+
+	public function render() {
+		if ( $this->field->args( 'repeatable' ) ) {
+			$this->render_repeatable_field();
+		} else {
+			echo $this->{$this->field->args( 'type' )}();
+		}
+	}
 
 	/**
-	 * Current field
-	 * @var   array
-	 * @since 1.0.0
+	 * Checks if we can get a post object, and if so, uses `get_the_terms` which utilizes caching
+	 * @since  1.0.2
+	 * @return mixed Array of terms on success
 	 */
-	public static $field;
+	public function get_object_terms() {
+		$object_id = $this->field->object_id;
+		$taxonomy = $this->field->args( 'taxonomy' );
+
+		if ( ! $post = get_post( $object_id ) ) {
+
+			$cache_key = 'cmb-cache-'. $taxonomy .'-'. $object_id;
+
+			// Check cache
+			$cached = $test = get_transient( $cache_key );
+			if ( $cached )
+				return $cached;
+
+			$cached = wp_get_object_terms( $object_id, $taxonomy );
+			// Do our own (minimal) caching. Long enough for a page-load.
+			$set = set_transient( $cache_key, $cached, 60 );
+			return $cached;
+		}
+
+		// WP caches internally so it's better to use
+		return get_the_terms( $post, $taxonomy );
+
+	}
 
 	/**
-	 * Current field meta value
-	 * @var   mixed
-	 * @since 1.0.0
+	 * Determine a file's extension
+	 * @since  1.0.0
+	 * @param  string       $file File url
+	 * @return string|false       File extension or false
 	 */
-	public static $meta;
+	public function get_file_ext( $file ) {
+		$parsed = @parse_url( $file, PHP_URL_PATH );
+		return $parsed ? strtolower( pathinfo( $parsed, PATHINFO_EXTENSION ) ) : false;
+	}
 
 	/**
-	 * Creates or returns an instance of this class.
+	 * Determines if a file has a valid image extension
 	 * @since  1.0.0
-	 * @return cmb_Meta_Box_types A single instance of this class.
+	 * @param  string $file File url
+	 * @return bool         Whether file has a valid image extension
 	 */
-	public static function get() {
-		if ( self::$instance === null )
-			self::$instance = new self();
+	public function is_valid_img_ext( $file ) {
+		$file_ext = $this->get_file_ext( $file );
+
+		$this->valid = empty( $this->valid )
+			? (array) apply_filters( 'cmb_valid_img_types', array( 'jpg', 'jpeg', 'png', 'gif', 'ico', 'icon' ) )
+			: $this->valid;
 
-		return self::$instance;
+		return ( $file_ext && in_array( $file_ext, $this->valid ) );
 	}
 
 	/**
-	 * Generates a field's description markup
-	 * @since  1.0.0
-	 * @param  string  $desc      Field's description
-	 * @param  boolean $paragraph Paragraph tag or span
-	 * @return strgin             Field's description markup
+	 * Handles parsing and filtering attributes while preserving any passed in via field config.
+	 * @since  1.0.3
+	 * @param  array  $args     Override arguments
+	 * @param  string $element  Element for filter
+	 * @param  array  $defaults Default arguments
+	 * @return array            Parsed and filtered arguments
 	 */
-	private static function desc( $paragraph = false ) {
-		// Prevent description from printing multiple times for repeatable fields
-		if ( self::$iterator > 0 ) {
-			return '';
-		}
+	public function parse_args( $args, $element, $defaults ) {
+		return wp_parse_args( apply_filters( "cmb_{$element}_attributes", $this->field->maybe_set_attributes( $args ), $this->field, $this ), $defaults );
+	}
 
-		$tag = $paragraph ? 'p' : 'span';
-		$desc = cmb_Meta_Box::$field['desc'];
-		return "\n<$tag class=\"cmb_metabox_description\">$desc</$tag>\n";
+	/**
+	 * Combines attributes into a string for a form element
+	 * @since  1.0.3
+	 * @param  array  $attrs        Attributes to concatenate
+	 * @param  array  $attr_exclude Attributes that should NOT be concatenated
+	 * @return string               String of attributes for form element
+	 */
+	public function concat_attributes( $attrs, $attr_exclude = array() ) {
+		$attributes = '';
+		foreach ( $attrs as $attr => $val ) {
+			if ( ! in_array( $attr, (array) $attr_exclude, true ) )
+				$attributes .= sprintf( ' %s="%s"', $attr, $val );
+		}
+		return $attributes;
 	}
 
 	/**
 	 * Generates repeatable fields
 	 * @since  1.0.0
-	 * @param  array   $field Metabox field
-	 * @param  mixed   $meta  Field's meta value
-	 * @param  int     $object_id Object ID
-	 * @param  string  $object_type  Object Type
 	 */
-	public static function render_repeatable_field( $field, $meta, $object_id, $object_type ) {
+	public function render_repeatable_field() {
+		$meta_value = $this->field->escaped_value();
 
 		// check for default content
-		$default = isset( $field['default'] ) ? array( $field['default'] ) : false;
+		$default = $this->field->args( 'default' );
 		// check for saved data
-		if ( !empty( $meta ) ) {
-			$meta = is_array( $meta ) ? array_filter( $meta ) : $meta;
-			$meta = ! empty( $meta ) ? $meta : $default;
+		if ( !empty( $meta_value ) ) {
+			$meta_value = is_array( $meta_value ) ? array_filter( $meta_value ) : $meta_value;
+			$meta_value = ! empty( $meta_value ) ? $meta_value : $default;
 		} else {
-			$meta = $default;
+			$meta_value = $default;
 		}
 
 		$class = 'widefat';
-		self::repeat_table_open();
-
-		if ( !empty( $meta ) ) {
-			foreach ( (array) $meta as $val ) {
-				self::open_repeat_row();
-				self::$iterator = self::$iterator ? self::$iterator + 1 : 1;
-				call_user_func( array( __CLASS__, $field['type'] ), $field, $val, $object_id, $object_type );
-				self::close_repeat_row();
+		$this->repeat_table_open();
+
+		if ( !empty( $meta_value ) ) {
+			foreach ( (array) $meta_value as $val ) {
+				$this->field->escaped_value = $val;
+				$this->open_repeat_row();
+				echo call_user_func( array( $this, $this->field->args( 'type' ) ) );
+				$this->close_repeat_row();
+				$this->iterator++;
 			}
 		} else {
-			self::open_repeat_row();
-			self::$iterator = 1;
-			call_user_func( array( __CLASS__, $field['type'] ), $field, $meta, $object_id, $object_type );
-			self::close_repeat_row();
+			$this->open_repeat_row();
+			echo call_user_func( array( $this, $this->field->args( 'type' ) ) );
+			$this->close_repeat_row();
 		}
 
-		self::open_empty_row();
-		self::$iterator = self::$iterator ? self::$iterator + 1 : 1;
-		call_user_func( array( __CLASS__, $field['type'] ), $field, null, $object_id, $object_type );
-		self::close_repeat_row();
+		$this->open_empty_row();
+		$this->field->escaped_value = '';
+		$this->iterator = $this->iterator ? $this->iterator : 1;
+		echo call_user_func( array( $this, $this->field->args( 'type' ) ) );
+		$this->close_repeat_row();
 
-		self::repeat_table_close();
+		$this->repeat_table_close();
 		// reset iterator
-		self::$iterator = 0;
+		$this->iterator = 0;
 	}
 
 	/**
@@ -135,393 +170,439 @@ public static function render_repeatable_field( $field, $meta, $object_id, $obje
 	 * @since  1.0.0
 	 * @param  string $class Field's class attribute
 	 */
-	private static function repeat_table_open( $class = '' ) {
-		echo self::desc(), '<table id="', cmb_Meta_Box::$field['id'], '_repeat" class="cmb-repeat-table ', $class ,'"><tbody>';
+	protected function repeat_table_open( $class = '' ) {
+		echo $this->_desc(), '<table id="', $this->field->args( 'id' ), '_repeat" class="cmb-repeat-table ', $class ,'"><tbody>';
 	}
 
 	/**
-	 * Generates repeatable feild closing table markup for repeatable fields
+	 * Generates repeatable field closing table markup for repeatable fields
 	 * @since 1.0.0
 	 */
-	private static function repeat_table_close() {
-		echo '</tbody></table><p class="add-row"><a data-selector="', cmb_Meta_Box::$field['id'] ,'_repeat" class="add-row-button button" href="#">'. __( 'Add Row', 'cmb' ) .'</a></p>';
+	protected function repeat_table_close() {
+		echo '</tbody></table><p class="add-row"><a data-selector="', $this->field->args( 'id' ) ,'_repeat" class="add-row-button button" href="#">'. __( 'Add Row', 'cmb' ) .'</a></p>';
 	}
 
-	private static function open_repeat_row() {
+	protected function open_repeat_row() {
 		echo '<tr class="repeat-row">';
 		echo '<td>';
 	}
 
-	private static function open_empty_row() {
+	protected function open_empty_row() {
 		echo '<tr class="empty-row">';
 		echo '<td>';
 	}
 
-	private static function close_repeat_row() {
+	protected function close_repeat_row() {
 		echo '</td><td class="remove-row"><a class="button remove-row-button" href="#">'. __( 'Remove', 'cmb' ) .'</a></td>';
 		echo '</tr>';
 	}
 
 	/**
-	 * Determine a file's extension
+	 * Generates description markup
 	 * @since  1.0.0
-	 * @param  string       $file File url
-	 * @return string|false       File extension or false
+	 * @param  boolean $paragraph Paragraph tag or span
+	 * @return string             Field's description markup
 	 */
-	public static function get_file_ext( $file ) {
-		$parsed = @parse_url( $file, PHP_URL_PATH );
-		return $parsed ? strtolower( pathinfo( $parsed, PATHINFO_EXTENSION ) ) : false;
+	public function _desc( $paragraph = false ) {
+		// Prevent description from printing multiple times for repeatable fields
+		if ( $this->field->args( 'repeatable' ) || $this->iterator > 0 ) {
+			return '';
+		}
+		$tag = $paragraph ? 'p' : 'span';
+		return "\n<$tag class=\"cmb_metabox_description\">{$this->field->args( 'description' )}</$tag>\n";
 	}
 
-	/**
-	 * Determines if a file has a valid image extension
-	 * @since  1.0.0
-	 * @param  string $file File url
-	 * @return bool         Whether file has a valid image extension
-	 */
-	public static function is_valid_img_ext( $file ) {
-		$file_ext = self::get_file_ext( $file );
-
-		self::$valid = empty( self::$valid ) ? (array) apply_filters( 'cmb_valid_img_types', array( 'jpg', 'jpeg', 'png', 'gif', 'ico', 'icon' ) ) : self::$valid;
+	public function _name( $suffix = '' ) {
+		return $this->field->args( 'id' ) . ( $this->field->args( 'repeatable' ) ? '['. $this->iterator .']' : '' ) . $suffix;
+	}
 
-		return ( $file_ext && in_array( $file_ext, self::$valid ) );
+	public function _id( $suffix = '' ) {
+		return $this->field->args( 'id' ) . $suffix . ( $this->field->args( 'repeatable' ) ? '_'. $this->iterator .'" data-iterator="'. $this->iterator : '' );
 	}
 
 	/**
-	 * Checks if we can get a post object, and if so, uses `get_the_terms` which utilizes caching
-	 * @since  1.0.2
-	 * @param  integer $object_id Object ID
-	 * @param  string  $taxonomy  Taxonomy terms to return
-	 * @return mixed              Array of terms on success
+	 * Handles outputting an 'input' element
+	 * @since  1.0.3
+	 * @param  array  $args Override arguments
+	 * @return string       Form input element
 	 */
-	public static function get_object_terms( $object_id, $taxonomy ) {
-
-		if ( ! $post = get_post( $object_id ) ) {
-
-			$cache_key = 'cmb-cache-'. $taxonomy .'-'. $object_id;
-
-			// Check cache
-			$cached = $test = get_transient( $cache_key );
-			if ( $cached )
-				return $cached;
-
-			$cached = wp_get_object_terms( $object_id, $taxonomy );
-			// Do our own (minimal) caching. Long enough for a page-load.
-			$set = set_transient( $cache_key, $cached, 60 );
-			return $cached;
-		}
-
-		// WP caches internally so it's better to use
-		return get_the_terms( $post, $taxonomy );
+	public function input( $args = array() ) {
+		$args = $this->parse_args( $args, 'input', array(
+			'type'  => 'text',
+			'class' => 'regular-text',
+			'name'  => $this->_name(),
+			'id'    => $this->_id(),
+			'value' => $this->field->escaped_value(),
+			'desc'  => $this->_desc( true ),
+		) );
 
+		return sprintf( '<input%s/>%s', $this->concat_attributes( $args, 'desc' ), $args['desc'] );
 	}
 
 	/**
-	 * Escape the value before output. Defaults to 'esc_attr()'
-	 * @since  1.0.1
-	 * @param  mixed  $meta_value Meta value
-	 * @param  mixed  $func       Escaping function (if not esc_attr())
-	 * @return mixed              Final value
+	 * Handles outputting an 'textarea' element
+	 * @since  1.0.3
+	 * @param  array  $args Override arguments
+	 * @return string       Form textarea element
 	 */
-	public static function esc( $meta_value, $func = '' ) {
-		$field = cmb_Meta_Box::$field;
-
-		// Check if the field has a registered escaping callback
-		$cb = cmb_Meta_Box::maybe_callback( $field, 'escape_cb' );
-		if ( false === $cb ) {
-			// If requesting NO escaping, return meta value
-			return $meta_value;
-		} elseif ( $cb ) {
-			// Ok, callback is good, let's run it.
-			return call_user_func( $cb, $meta_value, $field );
-		}
-
-		// Or custom escaping filter can be used
-		$esc = apply_filters( 'cmb_types_esc_'. $field['type'], null, $meta_value, $field );
-		if ( null !== $esc ) {
-			return $esc;
-		}
-
-		// escaping function passed in?
-		$func       = is_string( $func ) && ! empty( $func ) ? $func : 'esc_attr';
-		$meta_value = ! empty( $meta_value ) ? $meta_value : $field['default'];
-
-		if ( is_array( $meta_value ) ) {
-			foreach ( $meta_value as $key => $value ) {
-				$meta_value[ $key ] = call_user_func( $func, $value );
-			}
-		} else {
-			$meta_value = call_user_func( $func, $meta_value );
-		}
-
-		return $meta_value;
-	}
-
-	public static function _name( $suffix ) {
-		return cmb_Meta_Box::$field['id'] . $suffix . ( cmb_Meta_Box::$field['repeatable'] ? '[]' : '' );
-	}
-
-	public static function _id( $suffix = '' ) {
-		return cmb_Meta_Box::$field['id'] . $suffix . ( cmb_Meta_Box::$field['repeatable'] ? '_'. self::$iterator .'" data-iterator="'. self::$iterator : '' );
-	}
-
-	public static function _input( $meta, $args = array() ) {
-		$args = wp_parse_args( $args, array(
-			'classes' => 'regular-text',
-			'type' => 'text',
+	public function textarea( $args = array() ) {
+		$args = $this->parse_args( $args, 'textarea', array(
+			'class' => 'cmb_textarea',
+			'name'  => $this->_name(),
+			'id'    => $this->_id(),
+			'cols'  => 60,
+			'rows'  => 10,
+			'value' => $this->field->escaped_value( 'esc_textarea' ),
+			'desc'  => $this->_desc( true ),
 		) );
-		return '<input type="'. $args['type'] .'" class="'. $args['classes'] .'" name="'. self::_name() .'" id="'. self::_id(). '" value="'. self::esc( $meta ). '" />' . self::desc( true );
+		return sprintf( '<textarea%s>%s</textarea>%s', $this->concat_attributes( $args, array( 'desc', 'value' ) ), $args['value'], $args['desc'] );
 	}
 
 	/**
 	 * Begin Field Types
 	 */
 
-	public static function text( $field, $meta ) {
-		echo '<input type="text" class="regular-text" name="', self::_name(), '" id="', self::_id(), '" value="', self::esc( $meta ), '" />', self::desc( true );
+	public function text() {
+		return $this->input();
 	}
 
-	public static function text_small( $field, $meta ) {
-		echo '<input class="cmb_text_small" type="text" name="', self::_name(), '" id="', self::_id(), '" value="', self::esc( $meta ), '" />', self::desc();
+	public function text_small() {
+		return $this->input( array( 'class' => 'cmb_text_small', 'desc' => $this->_desc() ) );
 	}
 
-	public static function text_medium( $field, $meta ) {
-		echo '<input class="cmb_text_medium" type="text" name="', self::_name(), '" id="', self::_id(), '" value="', self::esc( $meta ), '" />', self::desc();
+	public function text_medium() {
+		return $this->input( array( 'class' => 'cmb_text_medium', 'desc' => $this->_desc() ) );
 	}
 
-	public static function text_email( $field, $meta ) {
-		echo '<input class="cmb_text_email cmb_text_medium" type="email" name="', self::_name(), '" id="', self::_id(), '" value="', self::esc( $meta ), '" />', self::desc( true );
+	public function text_email() {
+		return $this->input( array( 'class' => 'cmb_text_email cmb_text_medium', 'type' => 'email' ) );
 	}
 
-	public static function text_url( $field, $meta ) {
-		echo '<input class="cmb_text_url cmb_text_medium regular-text" type="text" name="', self::_name(), '" id="', self::_id(), '" value="', self::esc( $meta, 'esc_url' ), '" />', self::desc( true );
+	public function text_url() {
+		return $this->input( array( 'class' => 'cmb_text_url cmb_text_medium regular-text', 'value' => $this->field->escaped_value( 'esc_url' ) ) );
 	}
 
-	public static function text_date( $field, $meta ) {
-		echo '<input class="cmb_text_small cmb_datepicker" type="text" name="', self::_name(), '" id="', self::_id(), '" value="', self::esc( $meta ), '" />', self::desc();
+	public function text_date() {
+		return $this->input( array( 'class' => 'cmb_text_small cmb_datepicker', 'desc' => $this->_desc() ) );
 	}
 
-	public static function text_date_timestamp( $field, $meta ) {
-		echo '<input class="cmb_text_small cmb_datepicker" type="text" name="', self::_name(), '" id="', self::_id(), '" value="', ! empty( $meta ) ? date( 'm\/d\/Y', $meta ) : $field['default'], '" />', self::desc();
+	public function text_time() {
+		return $this->input( array( 'class' => 'cmb_timepicker text_time', 'desc' => $this->_desc() ) );
 	}
 
-	public static function text_datetime_timestamp( $field, $meta, $object_id ) {
-		// This will be used if there is a select_timezone set for this field
-		$tz_offset = cmb_Meta_Box::field_timezone_offset( $object_id );
-		if ( ! empty( $tz_offset ) ) {
-			$meta -= $tz_offset;
-		}
-
-		echo '<input class="cmb_text_small cmb_datepicker" type="text" name="', self::_name( '[date]' ), '" id="', self::_id( '_date' ) ,'" value="', ! empty( $meta ) ? date( 'm\/d\/Y', $meta ) : $field['default'], '" />';
-		echo '<input class="cmb_timepicker text_time" type="text" name="', self::_name( '[time]' ), '" id="', self::_id( '_time' ) ,'" value="', ! empty( $meta ) ? date( 'h:i A', $meta ) : $field['default'], '" />', self::desc();
+	public function text_date_timestamp() {
+		$meta_value = $this->field->escaped_value();
+		$value = ! empty( $meta_value ) ? date( 'm\/d\/Y', $meta_value ) : '';
+		return $this->input( array( 'class' => 'cmb_text_small cmb_datepicker', 'value' => $value ) );
 	}
 
-	public static function text_datetime_timestamp_timezone( $field, $meta ) {
-		$datetime = unserialize( $meta );
-		$meta = $tzstring = false;
+	public function text_datetime_timestamp( $meta_value = '' ) {
+		$desc = '';
+		if ( ! $meta_value ) {
+			$meta_value = $this->field->escaped_value();
+			// This will be used if there is a select_timezone set for this field
+			$tz_offset = cmb_Meta_Box::field_timezone_offset( $this->field->object_id );
+			if ( ! empty( $tz_offset ) ) {
+				$meta_value -= $tz_offset;
+			}
+			$desc = $this->_desc();
+		}
 
-		if ( $datetime && $datetime instanceof DateTime ) {
-			$tz = $datetime->getTimezone();
-			$tzstring = $tz->getName();
+		$inputs = array(
+			$this->input( array(
+				'class' => 'cmb_text_small cmb_datepicker',
+				'name'  => $this->_name( '[date]' ),
+				'id'    => $this->_id( '_date' ),
+				'value' => ! empty( $meta_value ) ? date( 'm\/d\/Y', $meta_value ) : '',
+				'desc'  => '',
+			) ),
+			$this->input( array(
+				'class' => 'cmb_timepicker text_time',
+				'name'  => $this->_name( '[time]' ),
+				'id'    => $this->_id( '_time' ),
+				'value' => ! empty( $meta_value ) ? date( 'h:i A', $meta_value ) : '',
+				'desc'  => $desc,
+			) )
+		);
+
+		return implode( "\n", $inputs );
+	}
+
+	public function text_datetime_timestamp_timezone() {
+		$meta_value = $this->field->escaped_value();
+		$datetime   = unserialize( $meta_value );
+		$meta_value = $tzstring = false;
 
-			$meta = $datetime->getTimestamp() + $tz->getOffset( new DateTime('NOW') );
+		if ( $datetime && $datetime instanceof DateTime ) {
+			$tz         = $datetime->getTimezone();
+			$tzstring   = $tz->getName();
+			$meta_value = $datetime->getTimestamp() + $tz->getOffset( new DateTime( 'NOW' ) );
 		}
 
-		echo '<input class="cmb_text_small cmb_datepicker" type="text" name="', self::_name( '[date]' ), '" id="', self::_id( '_date' ) ,'" value="', ! empty( $meta ) ? date( 'm\/d\/Y', $meta ) : $field['default'], '" />';
-		echo '<input class="cmb_timepicker text_time" type="text" name="', self::_name( '[time]' ), '" id="', self::_id( '_time' ) ,'" value="', ! empty( $meta ) ? date( 'h:i A', $meta ) : $field['default'], '" />';
+		$inputs = $this->text_datetime_timestamp( $meta_value );
+		$inputs .= '<select name="'. $this->_name( '[timezone]' ) .'" id="'. $this->_id( '_timezone' ) .'">';
+		$inputs .= wp_timezone_choice( $tzstring );
+		$inputs .= '</select>'. $this->_desc();
 
-		echo '<select name="', self::_name( '[timezone]' ), '" id="', self::_id( '_timezone' ) ,'">';
-		echo wp_timezone_choice( $tzstring );
-		echo '</select>', self::desc();
+		return $inputs;
 	}
 
-	public static function text_time( $field, $meta ) {
-		echo '<input class="cmb_timepicker text_time" type="text" name="', self::_name(), '" id="', self::_id(), '" value="', self::esc( $meta ), '" />', self::desc();
-	}
+	public function select_timezone() {
+		$this->field->args['default'] = $this->field->args( 'default' )
+			? $this->field->args( 'default' )
+			: cmb_Meta_Box::timezone_string();
 
-	public static function select_timezone( $field, $meta ) {
-		$meta = self::esc( $meta );
-		if ( '' === $meta )
-			$meta = cmb_Meta_Box::timezone_string();
+		$meta_value = $this->field->escaped_value();
 
-		echo '<select name="', self::_name(), '" id="', self::_id(), '">';
-		echo wp_timezone_choice( $meta );
-		echo '</select>';
+		return '<select name="'. $this->_name() .'" id="'. $this->_id() .'">'. wp_timezone_choice( $meta_value ) .'</select>';
 	}
 
-	public static function text_money( $field, $meta ) {
-		echo ! empty( $field['before'] ) ? '' : '$', ' <input class="cmb_text_money" type="text" name="', self::_name(), '" id="', self::_id(), '" value="', self::esc( $meta ), '" />', self::desc();
+	public function text_money() {
+		return ( ! $this->field->args( 'before' ) ? '$ ' : ' ' ) . $this->input( array( 'class' => 'cmb_text_money', 'desc' => $this->_desc() ) );
 	}
 
-	public static function colorpicker( $field, $meta ) {
-		$meta = self::esc( $meta );
+	public function colorpicker() {
+		$meta_value = $this->field->escaped_value();
 		$hex_color = '(([a-fA-F0-9]){3}){1,2}$';
-		if ( preg_match( '/^' . $hex_color . '/i', $meta ) ) // Value is just 123abc, so prepend #.
-			$meta = '#' . $meta;
-		elseif ( ! preg_match( '/^#' . $hex_color . '/i', $meta ) ) // Value doesn't match #123abc, so sanitize to just #.
-			$meta = "#";
-		echo '<input class="cmb_colorpicker cmb_text_small" type="text" name="', self::_name(), '" id="', self::_id(), '" value="', $meta, '" />', self::desc();
-	}
+		if ( preg_match( '/^' . $hex_color . '/i', $meta_value ) ) // Value is just 123abc, so prepend #.
+			$meta_value = '#' . $meta_value;
+		elseif ( ! preg_match( '/^#' . $hex_color . '/i', $meta_value ) ) // Value doesn't match #123abc, so sanitize to just #.
+			$meta_value = "#";
 
-	public static function textarea( $field, $meta ) {
-		echo '<textarea name="', self::_name(), '" id="', self::_id(), '" cols="60" rows="10">', self::esc( $meta, 'esc_textarea' ), '</textarea>', self::desc( true );
+		return $this->input( array( 'class' => 'cmb_colorpicker cmb_text_small', 'value' => $meta_value ) );
 	}
 
-	public static function textarea_small( $field, $meta ) {
-		echo '<textarea name="', self::_name(), '" id="', self::_id(), '" cols="60" rows="4">', self::esc( $meta, 'esc_textarea' ), '</textarea>', self::desc( true );
+	public function textarea_small() {
+		return $this->textarea( array( 'class' => 'cmb_textarea_small', 'rows' => 4 ) );
 	}
 
-	public static function textarea_code( $field, $meta ) {
-		echo '<pre><textarea name="', self::_name(), '" id="', self::_id(), '" cols="60" rows="10" class="cmb_textarea_code">', ! empty( $meta ) ? $meta : $field['default'], '</textarea></pre>', self::desc( true );
+	public function textarea_code() {
+		return sprintf( '<pre>%s</pre>', $this->textarea( array( 'class' => 'cmb_textarea_code' )  ) );
 	}
 
-	public static function select( $field, $meta ) {
-		$meta = self::esc( $meta );
-		echo '<select name="', self::_name(), '" id="', self::_id(), '">';
-		foreach ( $field['options'] as $option_key => $option ) {
+	public function title() {
+		$args = $this->parse_args( array(), 'title', array(
+			'class' => 'cmb_metabox_title',
+			'tag'   => $this->field->object_type == 'post' ? 'h5' : 'h3',
+			'desc'  => $this->_desc( true ),
+		) );
 
-			// Check for the "old" way
-			$label = isset( $option['name'] ) ? $option['name'] : $option;
-			$value = isset( $option['value'] ) ? $option['value'] : $option_key;
+		$attrs = $this->concat_attributes( $args, array( 'desc', 'tag' ) );
+		return sprintf( '<%1$s%2s">%3$s</%1$s>%4$s', $args['tag'], $attrs, $this->field->args( 'name' ), $args['desc'] );
+	}
 
-			echo '<option value="', $value, '" ', selected( $meta, $value ) ,'>', $label, '</option>';
+	public function wysiwyg() {
+		$saved_value = stripslashes( html_entity_decode( $this->field->escaped_value( 'esc_html' ) ) );
+		// $id = strtolower( str_ireplace( array( '-', '_' ), '', $this->_id() ) ) . 'wpeditor';
+		wp_editor( $saved_value, $this->_id(), $this->field->args( 'options' ) );
+		echo $this->_desc( true );
+	}
 
-		}
-		echo '</select>', self::desc( true );
+	public function option( $opt_label, $opt_value, $selected ) {
+		return sprintf( "\t".'<option value="%s" %s>%s</option>', $opt_value, selected( $selected, true, false ), $opt_label )."\n";
 	}
 
-	public static function radio( $field, $meta ) {
-		$meta = self::esc( $meta );
-		echo '<ul>';
-		$i = 1;
-		foreach ( $field['options'] as $option_key => $option ) {
+	public function concat_options( $args = array(), $method = 'list_input' ) {
+
+		$options     = (array) $this->field->args( 'options' );
+		$saved_value = $this->field->escaped_value();
+		$value       = $saved_value ? $saved_value : $this->field->args( 'default' );
+
+		$_options = ''; $i = 1;
+		foreach ( $options as $option_key => $option ) {
 
 			// Check for the "old" way
-			$label = isset( $option['name'] ) ? $option['name'] : $option;
-			$value = isset( $option['value'] ) ? $option['value'] : $option_key;
+			$opt_label = isset( $option['name'] ) ? $option['name'] : $option;
+			$opt_value = isset( $option['value'] ) ? $option['value'] : $option_key;
+			$selected  = $value == $opt_value;
+
+			if ( ! empty( $args ) ) {
+				$args['value'] = $opt_value;
+				$args['label'] = $opt_label;
+				if ( $selected )
+					$args['selected'] = 'selected';
+
+				$_options .= $this->$method( $args, $i );
+			} else {
+				$_options .= $this->option( $opt_label, $opt_value, $selected );
+			}
+			// $_options .= $args
+			// 	? $this->list_input( $args, $opt_label, $opt_value, $selected, $i )
+			// 	: $this->option( $opt_label, $opt_value, $selected );
 
-			echo '<li class="cmb_option"><input type="radio" name="', self::_name() ,'" id="', self::_id( $i ) ,'" value="', $value, '" ', checked( $meta, $value ), ' /> <label for="', self::_id( $i ) ,'">', $label ,'</label></li>';
 			$i++;
 		}
-		echo '</ul>', self::desc( true );
+		return $_options;
 	}
 
-	public static function radio_inline( $field, $meta ) {
-		self::radio( $field, $meta );
-	}
+	public function select( $args = array() ) {
+		$args = $this->parse_args( $args, 'select', array(
+			'class'   => 'cmb_select',
+			'name'    => $this->_name(),
+			'id'      => $this->_id(),
+			'desc'    => $this->_desc( true ),
+			'options' => $this->concat_options(),
+		) );
 
-	public static function checkbox( $field, $meta ) {
-		echo '<input class="cmb_option" type="checkbox" name="', self::_name(), '" id="', self::_id(), '" ', checked( ! empty( $meta ) ), ' value="on"/> <label for="', $field['id'], '">', self::desc() ,'</label>';
+		$attrs = $this->concat_attributes( $args, array( 'desc', 'options' ) );
+		return sprintf( '<select%s>%s</select>%s', $attrs, $args['options'], $args['desc'] );
 	}
 
-	public static function multicheck( $field, $meta ) {
-		echo '<ul>';
-		$i = 1;
-		foreach ( $field['options'] as $value => $name ) {
-			echo '<li><input class="cmb_option" type="checkbox" name="', self::_name(), '[]" id="', self::_id( $i ) ,'" value="', $value, '" ', checked( is_array( $meta ) && in_array( $value, $meta ) ), '  /> <label for="', self::_id( $i ) ,'">', $name, '</label></li>';
-			$i++;
+	public function taxonomy_select() {
+
+		$names      = $this->get_object_terms();
+		$saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->args( 'default' ) : $names[0]->slug;
+		$terms      = get_terms( $this->field->args( 'taxonomy' ), 'hide_empty=0' );
+		$options    = '';
+
+		foreach ( $terms as $term ) {
+			$selected = $saved_term == $term->slug;
+			$options .= $this->option( $term->name, $term->slug, $selected );
 		}
-		echo '</ul>', self::desc();
+
+		return $this->select( array( 'options' => $options ) );
+	}
+
+	public function list_input( $args = array(), $i ) {
+		$args = $this->parse_args( $args, 'list_input', array(
+			'type'  => 'radio',
+			'class' => 'cmb_option',
+			'name'  => $this->_name(),
+			'id'    => $this->_id( $i ),
+			'value' => $this->field->escaped_value(),
+			'label' => '',
+		) );
+
+		return sprintf( "\t".'<li><input%s/> <label for="%s">%s</label></li>'."\n", $this->concat_attributes( $args, 'label' ), $this->_id( $i ), $args['label'] );
 	}
 
-	public static function multicheck_inline( $field, $meta ) {
-		self::multicheck( $field, $meta );
+	public function list_input_checkbox( $args, $i ) {
+		unset( $args['selected'] );
+		$saved_value = $this->field->escaped_value();
+		if ( is_array( $saved_value ) && in_array( $args['value'], $saved_value ) ) {
+			$args['checked'] = 'checked';
+		}
+		return $this->list_input( $args, $i );
 	}
 
-	public static function title( $field, $meta, $object_id, $object_type ) {
-		$tag = $object_type == 'post' ? 'h5' : 'h3';
-		echo '<'. $tag .' class="cmb_metabox_title">', $field['name'], '</'. $tag .'>', self::desc( true );
+	public function radio( $args = array(), $type = 'radio' ) {
+		$args = $this->parse_args( $args, $type, array(
+			'class'   => 'cmb_radio_list',
+			'desc'    => $this->_desc( true ),
+			'options' => $this->concat_options( array( 'label' => 'test' ) ),
+		) );
+
+		$attrs = $this->concat_attributes( $args, array( 'desc', 'options' ) );
+		return sprintf( '<ul%s>%s</ul>%s', $attrs, $args['options'], $args['desc'] );
 	}
 
-	public static function wysiwyg( $field, $meta ) {
-		wp_editor( stripslashes( html_entity_decode( self::esc( $meta, 'esc_html' ) ) ), $field['id'], isset( $field['options'] ) ? $field['options'] : array() );
-		echo self::desc( true );
+	public function radio_inline() {
+		return $this->radio( array(), 'radio_inline' );
 	}
 
-	public static function taxonomy_select( $field, $meta, $object_id ) {
+	public function multicheck( $type = 'checkbox' ) {
+		return $this->radio( array( 'class' => 'cmb_checkbox_list', 'options' => $this->concat_options( array( 'type' => 'checkbox', 'name' => $this->_name() .'[]' ), 'list_input_checkbox' ) ), $type );
+	}
 
-		echo '<select name="', self::_name(), '" id="', self::_id(), '">';
-		$names    = self::get_object_terms( $object_id, $field['taxonomy'] );
-		$terms    = get_terms( $field['taxonomy'], 'hide_empty=0' );
-		$has_term = false;
+	public function multicheck_inline() {
+		$this->multicheck( 'multicheck_inline' );
+	}
 
-		foreach ( $terms as $term ) {
-			if ( !is_wp_error( $names ) && !empty( $names ) && ! strcmp( $term->slug, $names[0]->slug ) ) {
-				echo '<option value="' . $term->slug . '" selected>' . $term->name . '</option>';
-				$has_term = true;
-			}
-			else if ( ! $has_term == false && $term->slug == $field['default'] ) {
-				echo '<option value="' . $term->slug . '" selected>' . $term->name . '</option>';
-			} else {
-				echo '<option value="' . $term->slug . '  ' , $meta == $term->slug ? $meta : ' ' ,'  ">' . $term->name . '</option>';
-			}
+	public function checkbox() {
+		$meta_value = $this->field->escaped_value();
+		$args = array( 'type' => 'checkbox', 'class' => 'cmb_option', 'value' => 'on', 'desc' => '' );
+		if ( ! empty( $meta_value ) ) {
+			$args['checked'] = 'checked';
 		}
-		echo '</select>', self::desc( true );
+		return sprintf( '%s <label for="%s">%s</label>', $this->input( $args ), $this->_id(), $this->_desc() );
 	}
 
-	public static function taxonomy_radio( $field, $meta, $object_id ) {
-		$names = self::get_object_terms( $object_id, $field['taxonomy'] );
-		$terms = get_terms( $field['taxonomy'], 'hide_empty=0' );
+	public function taxonomy_radio() {
+		$names      = $this->get_object_terms();
+		$saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->args( 'default' ) : $names[0]->slug;
+		$terms      = get_terms( $this->field->args( 'taxonomy' ), 'hide_empty=0' );
+		$options    = ''; $i = 1;
 
-		echo '<ul>';
-		$i = 1;
-		foreach ( $terms as $term ) {
-			$checked = ( !is_wp_error( $names ) && !empty( $names ) && !strcmp( $term->slug, $names[0]->slug ) );
+		if ( ! $terms ) {
+			$options .= '<li><label>'. __( 'No terms', 'cmb' ) .'</label></li>';
+		} else {
+			foreach ( $terms as $term ) {
+				$args = array(
+					'value' => $term->slug,
+					'label' => $term->name,
+				);
 
-			echo '<li class="cmb_option"><input type="radio" name="', self::_name(), '" id="', self::_id( $i ) ,'" value="'. $term->slug . '" ', checked( $checked ), ' /> <label for="', self::_id( $i ) , '">' . $term->name . '</label></li>';
-			$i++;
+				if ( $saved_term == $term->slug ) {
+					$args['checked'] = 'checked';
+				}
+				$options .= $this->list_input( $args, $i );
+				$i++;
+			}
 		}
-		echo '</ul>', self::desc( true );
+
+		return $this->radio( array( 'options' => $options ), 'taxonomy_radio' );
+
 	}
 
-	public static function taxonomy_radio_inline( $field, $meta ) {
-		self::taxonomy_radio( $field, $meta );
+	public function taxonomy_radio_inline() {
+		$this->taxonomy_radio();
 	}
 
-	public static function taxonomy_multicheck( $field, $meta, $object_id ) {
-		$names = self::get_object_terms( $object_id, $field['taxonomy'] );
-		echo '<ul>';
-		$terms = get_terms( $field['taxonomy'], 'hide_empty=0' );
-		$i = 1;
-		if ( $names ) {
+	public function taxonomy_multicheck() {
+
+		$names   = $this->get_object_terms();
+		$saved_terms   = is_wp_error( $names ) || empty( $names )
+			? $this->field->args( 'default' )
+			: wp_list_pluck( $names, 'slug' );
+		$terms   = get_terms( $this->field->args( 'taxonomy' ), 'hide_empty=0' );
+		$name    = $this->_name() .'[]';
+		$options = ''; $i = 1;
+
+		if ( ! $terms ) {
+			$options .= '<li><label>'. __( 'No terms', 'cmb' ) .'</label></li>';
+		} else {
 
 			foreach ( $terms as $term ) {
-				echo '<li><input class="cmb_option" type="checkbox" name="', self::_name(), '[]" id="', self::_id( $i )  ,'" value="'. $term->slug . '" ';
-				foreach ($names as $name) {
-					checked( $term->slug == $name->slug );
+				$args = array(
+					'value' => $term->slug,
+					'label' => $term->name,
+					'type' => 'checkbox',
+					'name' => $name,
+				);
+
+				if ( in_array( $term->slug, $saved_terms ) ) {
+					$args['checked'] = 'checked';
 				}
-
-				echo ' /> <label for="', self::_id( $i )  ,'">' . $term->name . '</label></li>';
+				$options .= $this->list_input( $args, $i );
 				$i++;
 			}
-		} else {
-			echo '<li><label>'. __( 'No terms', 'cmb' ) .'</label></li>';
-
 		}
-		echo '</ul>', self::desc();
+
+		return $this->radio( array( 'class' => 'cmb_checkbox_list', 'options' => $options ), 'taxonomy_multicheck' );
 	}
 
-	public static function taxonomy_multicheck_inline( $field, $meta ) {
-		self::taxonomy_multicheck( $field, $meta );
+	public function taxonomy_multicheck_inline() {
+		$this->taxonomy_multicheck();
 	}
 
-	public static function file_list( $field, $meta, $object_id ) {
-		echo '<input class="cmb_upload_file cmb_upload_list" type="hidden" size="45" id="', self::_id(), '" name="', self::_name() ,'" value="" />';
-		echo '<input class="cmb_upload_button button cmb_upload_list" type="button" value="'. __( 'Add or Upload File', 'cmb' ) .'" />', self::desc( true );
+	public function file_list() {
+		$meta_value = $this->field->escaped_value();
 
-		echo '<ul id="', self::_id( '_status' ) ,'" class="cmb_media_status attach_list">';
+		$name = $this->_name();
+		echo '<input class="cmb_upload_file cmb_upload_list" type="hidden" size="45" id="', $this->_id(), '" name="', $name ,'" value="" />';
+		echo '<input class="cmb_upload_button button cmb_upload_list" type="button" value="'. __( 'Add or Upload File', 'cmb' ) .'" />', $this->_desc( true );
 
-		if ( $meta && is_array( $meta ) ) {
+		echo '<ul id="', $this->_id( '_status' ) ,'" class="cmb_media_status attach_list">';
 
-			$preview_size = empty( $field['preview_size'] ) ? array( 50, 50 ) : $field['preview_size'];
+		if ( $meta_value && is_array( $meta_value ) ) {
 
-			foreach ( $meta as $id => $fullurl ) {
-				if ( self::is_valid_img_ext( $fullurl ) ) {
+			foreach ( $meta_value as $id => $fullurl ) {
+				if ( $this->is_valid_img_ext( $fullurl ) ) {
 					echo
 					'<li class="img_status">',
-						wp_get_attachment_image( $id, $preview_size ),
-						'<p><a href="#" class="cmb_remove_file_button">'. __( 'Remove Image', 'cmb' ) .'</a></p>
-						<input type="hidden" id="filelist-', $id ,'" name="', $field['id'] ,'[', $id ,']" value="', $fullurl ,'" />
+						wp_get_attachment_image( $id, $this->field->args( 'preview_size' ) ),
+						'<p class="cmb_remove_wrapper"><a href="#" class="cmb_remove_file_button">'. __( 'Remove Image', 'cmb' ) .'</a></p>
+						<input type="hidden" id="filelist-', $id ,'" name="', $name ,'[', $id ,']" value="', $fullurl ,'" />
 					</li>';
 
 				} else {
@@ -532,7 +613,7 @@ public static function file_list( $field, $meta, $object_id ) {
 					echo
 					'<li>',
 						__( 'File:', 'cmb' ), ' <strong>', $title, '</strong>&nbsp;&nbsp;&nbsp; (<a href="', $fullurl, '" target="_blank" rel="external">'. __( 'Download', 'cmb' ) .'</a> / <a href="#" class="cmb_remove_file_button">'. __( 'Remove', 'cmb' ) .'</a>)
-						<input type="hidden" id="filelist-', $id ,'" name="', $field['id'] ,'[', $id ,']" value="', $fullurl ,'" />
+						<input type="hidden" id="filelist-', $id ,'" name="', $name ,'[', $id ,']" value="', $fullurl ,'" />
 					</li>';
 				}
 			}
@@ -541,64 +622,70 @@ public static function file_list( $field, $meta, $object_id ) {
 		echo '</ul>';
 	}
 
-	public static function file( $field, $meta, $object_id, $object_type ) {
-		$input_type_url = 'hidden';
-		if ( 'url' == $field['allow'] || ( is_array( $field['allow'] ) && in_array( 'url', $field['allow'] ) ) )
-			$input_type_url = 'text';
-		echo '<input class="cmb_upload_file" type="' . $input_type_url . '" size="45" id="', self::_id(), '" name="', self::_name(), '" value="', $meta, '" />';
+	public function file() {
+		$meta_value = $this->field->escaped_value();
+		$allow      = $this->field->args( 'allow' );
+		$input_type = ( 'url' == $allow || ( is_array( $allow ) && in_array( 'url', $allow ) ) )
+			? 'text' : 'hidden';
+
+		echo '<input class="cmb_upload_file" type="' . $input_type . '" size="45" id="', $this->_id(), '" name="', $this->_name(), '" value="', $meta_value, '" />';
 		echo '<input class="cmb_upload_button button" type="button" value="'. __( 'Add or Upload File', 'cmb' ) .'" />';
 
-		$_id_name = $field['id'];
-		if ( $field['repeatable'] ) {
-			$_id_name .= '_' . self::$iterator;
-		}
+		$_id_id = $_id_name = $this->field->args( 'id' );
 		$_id_name .= '_id';
+		if ( $this->field->args( 'repeatable' ) ) {
+			$_id_id .= '_' . $this->iterator;
+			$_id_name .= '['. $this->iterator .']';
+		}
+		$_id_id .= '_id';
 
-		$_id_meta = cmb_Meta_Box::get_data( $_id_name );
+		$_id_meta = cmb_Meta_Box::get_data( $_id_id );
 
 		// If there is no ID saved yet, try to get it from the url
-		if ( $meta && ! $_id_meta ) {
-			$_id_meta = cmb_Meta_Box::image_id_from_url( esc_url_raw( $meta ) );
+		if ( $meta_value && ! $_id_meta ) {
+			$_id_meta = cmb_Meta_Box::image_id_from_url( esc_url_raw( $meta_value ) );
 		}
 
-		echo '<input class="cmb_upload_file_id" type="hidden" id="', $_id_name, '" name="', $_id_name, '" value="', $_id_meta, '" />',
-		self::desc( true ),
-		'<div id="', self::_id( '_status' ) ,'" class="cmb_media_status">';
-			if ( ! empty( $meta ) ) {
+		echo '<input class="cmb_upload_file_id" type="hidden" id="', $_id_id, '" name="', $_id_name, '" value="', $_id_meta, '" />',
+		$this->_desc( true ),
+		'<div id="', $this->_id( '_status' ) ,'" class="cmb_media_status">';
+			if ( ! empty( $meta_value ) ) {
 
-				if ( self::is_valid_img_ext( $meta ) ) {
+				if ( $this->is_valid_img_ext( $meta_value ) ) {
 					echo '<div class="img_status">';
-					echo '<img style="max-width: 350px; width: 100%; height: auto;" src="', $meta, '" alt="" />';
-					echo '<p><a href="#" class="cmb_remove_file_button" rel="', $field['id'], '">'. __( 'Remove Image', 'cmb' ) .'</a></p>';
+					echo '<img style="max-width: 350px; width: 100%; height: auto;" src="', $meta_value, '" alt="" />';
+					echo '<p class="cmb_remove_wrapper"><a href="#" class="cmb_remove_file_button" rel="', $this->field->args( 'id' ), '">'. __( 'Remove Image', 'cmb' ) .'</a></p>';
 					echo '</div>';
 				} else {
-					// $file_ext = self::get_file_ext( $meta );
-					$parts = explode( '/', $meta );
+					// $file_ext = $this->get_file_ext( $meta_value );
+					$parts = explode( '/', $meta_value );
 					for ( $i = 0; $i < count( $parts ); ++$i ) {
 						$title = $parts[$i];
 					}
-					echo __( 'File:', 'cmb' ), ' <strong>', $title, '</strong>&nbsp;&nbsp;&nbsp; (<a href="', $meta, '" target="_blank" rel="external">'. __( 'Download', 'cmb' ) .'</a> / <a href="#" class="cmb_remove_file_button" rel="', $field['id'], '">'. __( 'Remove', 'cmb' ) .'</a>)';
+					echo __( 'File:', 'cmb' ), ' <strong>', $title, '</strong>&nbsp;&nbsp;&nbsp; (<a href="', $meta_value, '" target="_blank" rel="external">'. __( 'Download', 'cmb' ) .'</a> / <a href="#" class="cmb_remove_file_button" rel="', $this->field->args( 'id' ), '">'. __( 'Remove', 'cmb' ) .'</a>)';
 				}
 			}
 		echo '</div>';
 	}
 
-	public static function oembed( $field, $meta, $object_id, $object_type ) {
-		echo '<input class="cmb_oembed regular-text" type="text" name="', self::_name(), '" id="', self::_id(), '" value="', self::esc( $meta ), '" data-objectid="', $object_id ,'" data-objecttype="', $object_type ,'" />', self::desc( true );
+	public function oembed() {
+		$meta_value = $this->field->escaped_value();
+
+		echo '<input class="cmb_oembed regular-text" type="text" name="', $this->_name(), '" id="', $this->_id(), '" value="', $meta_value, '" data-objectid="', $this->field->object_id ,'" data-objecttype="', $this->field->object_type ,'" />', $this->_desc( true );
 		echo '<p class="cmb-spinner spinner" style="display:none;"><img src="'. admin_url( '/images/wpspin_light.gif' ) .'" alt="spinner"/></p>';
-		echo '<div id="',self::_id( '_status' ) ,'" class="cmb_media_status ui-helper-clearfix embed_wrap">';
+		echo '<div id="',$this->_id( '_status' ) ,'" class="cmb_media_status ui-helper-clearfix embed_wrap">';
 
-			if ( $meta != '' )
-				echo cmb_Meta_Box_ajax::get_oembed( $meta, $object_id, array(
-					'object_type' => $object_type,
+			if ( $meta_value ) {
+				echo cmb_Meta_Box_ajax::get_oembed( $meta_value, $this->field->object_id, array(
+					'object_type' => $this->field->object_type,
 					'oembed_args' => array( 'width' => '640' ),
-					'field_id'    => self::_id(),
+					'field_id'    => $this->_id(),
 				) );
+			}
 
 		echo '</div>';
 	}
 
-
 	/**
 	 * Default fallback. Allows rendering fields via "cmb_render_$name" hook
 	 * @since  1.0.0
@@ -606,9 +693,8 @@ public static function oembed( $field, $meta, $object_id, $object_type ) {
 	 * @param  array  $arguments All arguments passed to the method
 	 */
 	public function __call( $name, $arguments ) {
-		list( $field, $meta, $object_id, $object_type ) = $arguments;
 		// When a non-registered field is called, send it through an action.
-		do_action( "cmb_render_$name", $field, $meta, $object_id, $object_type );
+		do_action( "cmb_render_$name", $this->field->args(), $this->field->escaped_value(), $this->field->object_id, $this->field->object_type, $this );
 	}
 
 }

From 76dd21543d72bd5732ffebb4b1985cd4c986fe3c Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Mon, 10 Mar 2014 13:04:45 -0400
Subject: [PATCH 16/71] Restructure sanitize class to be proper (non-singleton)
 OOP, and takes a passed-in field object as well as the  value. Also
 restructured to properly santize repeatable fields array values

---
 helpers/cmb_Meta_Box_Sanitize.php | 251 +++++++++++++++++-------------
 1 file changed, 140 insertions(+), 111 deletions(-)

diff --git a/helpers/cmb_Meta_Box_Sanitize.php b/helpers/cmb_Meta_Box_Sanitize.php
index 5bedb9b..2010d39 100644
--- a/helpers/cmb_Meta_Box_Sanitize.php
+++ b/helpers/cmb_Meta_Box_Sanitize.php
@@ -7,158 +7,167 @@
 class cmb_Meta_Box_Sanitize {
 
 	/**
-	 * A single instance of this class.
-	 * @var   cmb_Meta_Box_Sanitize object
-	 * @since 1.0.0
+	 * A CMB field object
+	 * @var cmb_Meta_Box_field object
 	 */
-	public static $instance = null;
+	public $field;
 
 	/**
-	 * Creates or returns an instance of this class.
-	 * @since  1.0.0
-	 * @return cmb_Meta_Box_Sanitize A single instance of this class.
+	 * Field's $_POST value
+	 * @var mixed
 	 */
-	public static function get() {
-		if ( self::$instance === null )
-			self::$instance = new self();
-
-		return self::$instance;
-	}
+	public $value;
 
 	/**
-	 * Sample field validation
-	 * @since  0.0.4
+	 * Setup our class vars
+	 * @since 1.0.3
+	 * @param object $field A CMB field object
+	 * @param mixed  $value Field value
 	 */
-	public static function check_text( $text ) {
-		return $text === 'hello' ? true : false;
+	public function __construct( $field, $value ) {
+		$this->field = $field;
+		$this->value = $value;
 	}
 
 	/**
 	 * Simple checkbox validation
 	 * @since  1.0.1
-	 * @param  mixed  $text 'on' or false
-	 * @return mixex        'on' or false
+	 * @param  mixed  $val 'on' or false
+	 * @return mixed         'on' or false
 	 */
-	public static function checkbox( $text ) {
-		return $text === 'on' ? 'on' : false;
+	public function checkbox( $value ) {
+		return $value === 'on' ? 'on' : false;
 	}
 
 	/**
 	 * Validate url in a meta value
 	 * @since  1.0.1
-	 * @param  string $meta  Meta value
-	 * @param  array  $field Field config array
+	 * @param  string $value  Meta value
 	 * @return string        Empty string or escaped url
 	 */
-	public static function text_url( $meta, $field ) {
+	public function text_url( $value ) {
 
-		$protocols = isset( $field['protocols'] ) ? (array) $field['protocols'] : null;
-		if ( is_array( $meta ) ) {
-			foreach ( $meta as $key => $value ) {
-				$meta[ $key ] = $value ? esc_url_raw( $value, $protocols ) : $field['default'];
+		$protocols = $this->field->args( 'protocols' );
+		// for repeatable
+		if ( is_array( $value ) ) {
+			foreach ( $value as $key => $val ) {
+				$value[ $key ] = $val ? esc_url_raw( $val, $protocols ) : $this->field->args( 'default' );
 			}
 		} else {
-			$meta = $meta ? esc_url_raw( $meta, $protocols ) : $field['default'];
+			$value = $value ? esc_url_raw( $value, $protocols ) : $this->field->args( 'default' );
 		}
 
-		return $meta;
+		return $value;
 	}
 
-	/**
-	 * Because we don't want oembed data passed through the cmb_validate_ filter
-	 * @since  1.0.1
-	 * @param  string  $meta oembed cached data
-	 * @return string        oembed cached data
-	 */
-	public static function oembed( $meta ) {
-		return $meta;
+	public function colorpicker( $value ) {
+		// for repeatable
+		if ( is_array( $value ) ) {
+			$check = $value;
+			$value = array();
+			foreach ( $check as $key => $val ) {
+				if ( $val && '#' != $val ) {
+					$value[ $key ] = esc_attr( $val );
+				}
+			}
+		} else {
+			$value = ! $value || '#' == $value ? '' : esc_attr( $value );
+		}
+		return $value;
 	}
 
 	/**
 	 * Validate email in a meta value
 	 * @since  1.0.1
-	 * @param  string $meta Meta value
+	 * @param  string $value Meta value
 	 * @return string       Empty string or validated email
 	 */
-	public static function text_email( $meta ) {
-
-		if ( is_array( $meta ) ) {
-			foreach ( $meta as $key => $value ) {
-				$value = trim( $value );
-				$meta[ $key ] = is_email( $value ) ? $value : '';
+	public function text_email( $value ) {
+		// for repeatable
+		if ( is_array( $value ) ) {
+			foreach ( $value as $key => $val ) {
+				$val = trim( $val );
+				$value[ $key ] = is_email( $val ) ? $val : '';
 			}
 		} else {
-			$meta = trim( $meta );
-			$meta = is_email( $meta ) ? $meta : '';
+			$value = trim( $value );
+			$value = is_email( $value ) ? $value : '';
 		}
 
-		return $meta;
+		return $value;
 	}
 
 	/**
 	 * Validate money in a meta value
 	 * @since  1.0.1
-	 * @param  string $meta Meta value
+	 * @param  string $value Meta value
 	 * @return string       Empty string or validated money value
 	 */
-	public static function text_money( $meta ) {
-		if ( is_array( $meta ) ) {
-			foreach ( $meta as $key => $value ) {
-				$meta[ $key ] = number_format( (float) str_ireplace( ',', '', $value ), 2, '.', ',');
+	public function text_money( $value ) {
+		// for repeatable
+		if ( is_array( $value ) ) {
+			foreach ( $value as $key => $val ) {
+				$value[ $key ] = number_format( (float) str_ireplace( ',', '', $val ), 2, '.', ',');
 			}
 		} else {
-			$meta = number_format( (float) str_ireplace( ',', '', $meta ), 2, '.', ',');
+			$value = number_format( (float) str_ireplace( ',', '', $value ), 2, '.', ',');
 		}
 
-		return $meta;
+		return $value;
 	}
 
 	/**
 	 * Converts text date to timestamp
 	 * @since  1.0.2
-	 * @param  string $meta Meta value
+	 * @param  string $value Meta value
 	 * @return string       Timestring
 	 */
-	public static function text_date_timestamp( $meta ) {
-		return strtotime( $meta );;
+	public function text_date_timestamp( $value ) {
+		return is_array( $value ) ? array_map( 'strtotime', $value ) : strtotime( $value );
 	}
 
 	/**
 	 * Datetime to timestamp
 	 * @since  1.0.1
-	 * @param  string $meta Meta value
+	 * @param  string $value Meta value
 	 * @return string       Timestring
 	 */
-	public static function text_datetime_timestamp( $meta ) {
+	public function text_datetime_timestamp( $value, $repeat = false ) {
 
-		$test = is_array( $meta ) ? array_filter( $meta ) : '';
+		$test = is_array( $value ) ? array_filter( $value ) : '';
 		if ( empty( $test ) )
 			return '';
 
-		$meta = strtotime( $meta['date'] .' '. $meta['time'] );
+		if ( $repeat_value = $this->_check_repeat( $value, __FUNCTION__, $repeat ) )
+			return $repeat_value;
+
+		$value = strtotime( $value['date'] .' '. $value['time'] );
 
 		if ( $tz_offset = cmb_Meta_Box::field_timezone_offset() )
-			$meta += $tz_offset;
+			$value += $tz_offset;
 
-		return $meta;
+		return $value;
 	}
 
 	/**
 	 * Datetime to imestamp with timezone
 	 * @since  1.0.1
-	 * @param  string $meta Meta value
+	 * @param  string $value Meta value
 	 * @return string       Timestring
 	 */
-	public static function text_datetime_timestamp_timezone( $meta ) {
+	public function text_datetime_timestamp_timezone( $value, $repeat = false ) {
 
-		$test = is_array( $meta ) ? array_filter( $meta ) : '';
+		$test = is_array( $value ) ? array_filter( $value ) : '';
 		if ( empty( $test ) )
 			return '';
 
+		if ( $repeat_value = $this->_check_repeat( $value, __FUNCTION__, $repeat ) )
+			return $repeat_value;
+
 		$tzstring = null;
 
-		if ( is_array( $meta ) && array_key_exists( 'timezone', $meta ) )
-			$tzstring = $meta['timezone'];
+		if ( is_array( $value ) && array_key_exists( 'timezone', $value ) )
+			$tzstring = $value['timezone'];
 
 		if ( empty( $tzstring ) )
 			$tzstring = cmb_Meta_Box::timezone_string();
@@ -168,67 +177,69 @@ public static function text_datetime_timestamp_timezone( $meta ) {
 		if ( substr( $tzstring, 0, 3 ) === 'UTC' )
 			$tzstring = timezone_name_from_abbr( '', $offset, 0 );
 
-		$meta = new DateTime( $meta['date'] .' '. $meta['time'], new DateTimeZone( $tzstring ) );
-		$meta = serialize( $meta );
+		$value = new DateTime( $value['date'] .' '. $value['time'], new DateTimeZone( $tzstring ) );
+		$value = serialize( $value );
 
-		return $meta;
+		return $value;
 	}
 
 	/**
 	 * Sanitize textareas and wysiwyg fields
 	 * @since  1.0.1
-	 * @param  string $meta Meta value
+	 * @param  string $value Meta value
 	 * @return string       Sanitized data
 	 */
-	public static function textarea( $meta ) {
-		return wp_kses_post( $meta );
+	public function textarea( $value ) {
+		return is_array( $value ) ? array_map( 'wp_kses_post', $value ) : wp_kses_post( $value );
 	}
 
 	/**
 	 * Sanitize code textareas
 	 * @since  1.0.2
-	 * @param  string $meta Meta value
+	 * @param  string $value Meta value
 	 * @return string       Sanitized data
 	 */
-	public static function textarea_code( $meta ) {
-		return htmlspecialchars_decode( stripslashes( $meta ) );
+	public function textarea_code( $value, $repeat = false ) {
+		if ( $repeat_value = $this->_check_repeat( $value, __FUNCTION__, $repeat ) )
+			return $repeat_value;
+
+		return htmlspecialchars_decode( stripslashes( $value ) );
 	}
 
 	/**
 	 * Sanitize code textareas
 	 * @since  1.0.2
-	 * @param  string $meta  Meta value
-	 * @param  array  $field Field config array
+	 * @param  string $value  Meta value
 	 * @return string        Sanitized data
 	 */
-	public static function file( $meta, $field ) {
-		$_id_name = $field['id'] .'_id';
+	public function file( $value ) {
+		$args = $this->field->args();
+		$id = $this->field->args( 'id' );
+		$_id_name = $id .'_id';
 		// get _id old value
 		$_id_old = cmb_Meta_Box::get_data( $_id_name );
 
 		// If specified NOT to save the file ID
-		if ( isset( $field['save_id'] ) && ! $field['save_id'] ) {
+		if ( isset( $args['save_id'] ) && ! $args['save_id'] ) {
 			$_new_id = '';
 		} else {
 			// otherwise get the file ID
 			$_new_id = isset( $_POST[ $_id_name ] ) ? $_POST[ $_id_name ] : null;
 
 			// If there is no ID saved yet, try to get it from the url
-			if ( isset( $_POST[ $field['id'] ] ) && $_POST[ $field['id'] ] && ! $_new_id ) {
-				$_new_id = cmb_Meta_Box::image_id_from_url( esc_url_raw( $_POST[ $field['id'] ] ) );
+			if ( isset( $_POST[ $id ] ) && $_POST[ $id ] && ! $_new_id ) {
+				$_new_id = cmb_Meta_Box::image_id_from_url( esc_url_raw( $_POST[ $id ] ) );
 			}
 
 		}
 
 		if ( $_new_id && $_new_id != $_id_old ) {
-			$updated[] = $_id_name;
-			cmb_Meta_Box::update_data( $_new_id, $_id_name );
+			$updated = cmb_Meta_Box::update_data( $_new_id, $_id_name );
 		} elseif ( '' == $_new_id && $_id_old ) {
-			$updated[] = $_id_name;
 			cmb_Meta_Box::remove_data( $_id_name, $old );
 		}
 
-		return self::default_sanitization( $meta, $field );
+		return $this->default_sanitization( $value );
 
 	}
 
@@ -239,51 +250,69 @@ public static function file( $meta, $field ) {
 	 * @param  array  $arguments All arguments passed to the method
 	 */
 	public function __call( $name, $arguments ) {
-		list( $meta_value, $field ) = $arguments;
-		return self::default_sanitization( $meta_value, $field );
+		list( $value ) = $arguments;
+		return $this->default_sanitization( $value );
 	}
 
 	/**
 	 * Default fallback sanitization method. Applies filters.
 	 * @since  1.0.2
-	 * @param  mixed $meta_value Meta value
-	 * @param  array $field      Field config array
+	 * @param  mixed $value Meta value
 	 */
-	public static function default_sanitization( $meta_value, $field ) {
+	public function default_sanitization( $value ) {
 
 		$object_type = cmb_Meta_Box::get_object_type();
 		$object_id   = cmb_Meta_Box::get_object_id();
-
 		// Allow field type validation via filter
-		$updated     = apply_filters( 'cmb_validate_'. $field['type'], null, $meta_value, $object_id, $field, $object_type );
+		$updated     = apply_filters( 'cmb_validate_'. $this->field->args( 'type' ), null, $value, $object_id, $this->field->args(), $object_type, $this->field );
 
 		if ( null != $updated ) {
 			return $updated;
 		}
 
+		$pre = $value;
+
 		// we'll fallback to 'sanitize_text_field', or 'wp_kses_post`
-		switch ( $field['type'] ) {
+		switch ( $this->field->args( 'type' ) ) {
 			case 'wysiwyg':
-				// $cb = 'wp_kses';
+				// $value = wp_kses( $value );
 				// break;
 			case 'textarea_small':
-				$cb = array( 'cmb_Meta_Box_Sanitize', 'textarea' );
-				break;
+				return $this->textarea( $value );
+			case 'taxonomy_select':
+			case 'taxonomy_radio':
+			case 'taxonomy_multicheck':
+				if ( $this->field->args( 'taxonomy' ) ) {
+					return wp_set_object_terms( $object_id, $value, $this->field->args( 'taxonomy' ) );
+				}
+			case 'multicheck':
+			case 'file_list':
+			case 'oembed':
+				// no filtering
+				return $value;
 			default:
-				$cb = 'sanitize_text_field';
-				break;
+				// Handle repeatable fields array
+				return is_array( $value ) ? array_map( 'sanitize_text_field', $value ) : call_user_func( 'sanitize_text_field', $value );
 		}
 
-		// Handle repeatable fields array
-		if ( is_array( $meta_value ) ) {
-			foreach ( $meta_value as $key => $value ) {
-				$meta_value[ $key ] = call_user_func( $cb, $value );
-			}
-		} else {
-			$meta_value = call_user_func( $cb, $meta_value );
-		}
+	}
 
-		return $meta_value;
+	/**
+	 * If repeating, loop through and re-apply sanitization method
+	 * @since  1.0.3
+	 * @param  mixed  $value  Meta value
+	 * @param  string $method Class method
+	 * @param  bool   $repeat Whether repeating or not
+	 * @return mixed          Sanitized value
+	 */
+	public function _check_repeat( $value, $method, $repeat ) {
+		if ( $repeat || ! $this->field->args( 'repeatable' ) )
+			return;
+		$new_value = array();
+		foreach ( $value as $iterator => $val ) {
+			$new_value[] = $this->$method( $val, true );
+		}
+		return $new_value;
 	}
 
 }

From c848e403db4236606976cc7d0bef0d78e9416f55 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Mon, 10 Mar 2014 14:13:33 -0400
Subject: [PATCH 17/71] Restucture JS to work with new repeatable fields
 methodology, and clean up. Now time/date/color pickers all work properly with
 repeatable, etc

---
 js/cmb.js     | 774 +++++++++++++++++++++++++++-----------------------
 js/cmb.min.js |  71 ++---
 2 files changed, 456 insertions(+), 389 deletions(-)

diff --git a/js/cmb.js b/js/cmb.js
index 3b119f8..71bc7ae 100644
--- a/js/cmb.js
+++ b/js/cmb.js
@@ -14,407 +14,469 @@
 /**
  * Custom jQuery for Custom Metaboxes and Fields
  */
-(function(window, document, $, undefined){
+window.CMB = (function(window, document, $, undefined){
 	'use strict';
 
-	// Move CMB functionality to an object
-	window.CMB = {
+	// localization strings
+	var l10n = window.cmb_l10;
+
+	// CMB functionality object
+	var cmb = {
 		formfield : '',
 		idNumber  : false,
 		file_frames: {},
+	}
 
-		init: function() {
-			CMB.log( window.cmb_l10 );
+	cmb.metabox = function() {
+		if ( cmb.$metabox ) {
+			return cmb.$metabox;
+		}
+		cmb.$metabox = $('table.cmb_metabox');
+		return cmb.$metabox;
+	}
 
-			// hide our spinner gif if we're on a MP6 dashboard
-			if ( window.cmb_l10.new_admin_style ) {
-				$('.cmb-spinner img').hide();
-			}
+	cmb.init = function() {
+		cmb.log( l10n );
 
-			/**
-			 * Initialize time/date/color pickers
-			 */
-			CMB.initPickers();
+		var $metabox = cmb.metabox();
 
-			// Wrap date picker in class to narrow the scope of jQuery UI CSS and prevent conflicts
-			$("#ui-datepicker-div").wrap('<div class="cmb_element" />');
+		// hide our spinner gif if we're on a MP6 dashboard
+		if ( l10n.new_admin_style ) {
+			$metabox.find('.cmb-spinner img').hide();
+		}
 
+		/**
+		 * Initialize time/date/color pickers
+		 */
+		cmb.initPickers( $metabox.find('input:text.cmb_timepicker'), $metabox.find('input:text.cmb_datepicker'), $metabox.find('input:text.cmb_colorpicker') );
 
-			/**
-			 * File and image upload handling
-			 */
-			$('.cmb_metabox')
+		// Wrap date picker in class to narrow the scope of jQuery UI CSS and prevent conflicts
+		$("#ui-datepicker-div").wrap('<div class="cmb_element" />');
+
+
+		$('.cmb_metabox')
 			.on( 'change', '.cmb_upload_file', function() {
-				CMB.formfield = $(this).attr('id');
-				$('#' + CMB.formfield + '_id').val("");
+				cmb.formfield = $(this).attr('id');
+				$('#' + cmb.formfield + '_id').val('');
 			})
-			.on( 'click', '.cmb_upload_button', function(event) {
-
-				event.preventDefault();
+			// Media/file management
+			.on( 'click', '.cmb_upload_button', cmb.handleMedia )
+			.on( 'click', '.cmb_remove_file_button', cmb.handleRemoveMedia )
+			// Repeatable content
+			.on( 'click', '.add-row-button', cmb.addAjaxRow )
+			.on( 'click', '.remove-row-button', cmb.removeAjaxRow )
+			// Ajax oEmbed display
+			.on( 'keyup paste focusout', '.cmb_oembed', cmb.maybeOembed );
+
+		// on pageload
+		setTimeout( cmb.resizeoEmbeds, 500);
+		// and on window resize
+		$(window).on( 'resize', cmb.resizeoEmbeds );
+
+	}
+
+	cmb.handleMedia = function(event) {
+
+		event.preventDefault();
+
+		var $metabox     = cmb.metabox();
+		var $self        = $(this);
+		cmb.formfield    = $self.prev('input').attr('id');
+		var $formfield   = $('#'+cmb.formfield);
+		var formName     = $formfield.attr('name');
+		var uploadStatus = true;
+		var attachment   = true;
+		var isList       = $self.hasClass( 'cmb_upload_list' );
+
+		// If this field's media frame already exists, reopen it.
+		if ( cmb.formfield in cmb.file_frames ) {
+			cmb.file_frames[cmb.formfield].open();
+			return;
+		}
 
-				var $self = $(this);
-				CMB.formfield = $self.prev('input').attr('id');
-				var $formfield = $('#'+CMB.formfield);
-				var uploadStatus = true;
-				var attachment = true;
-				var isList = $self.hasClass( 'cmb_upload_list' );
+		// Create the media frame.
+		cmb.file_frames[cmb.formfield] = wp.media.frames.file_frame = wp.media({
+			title: $metabox.find('label[for=' + cmb.formfield + ']').text(),
+			button: {
+				text: l10n.upload_file
+			},
+			multiple: isList ? true : false
+		});
+
+		var handlers = {
+			list : function( selection ) {
+				// Get all of our selected files
+				attachment = selection.toJSON();
+
+				$formfield.val(attachment.url);
+				$('#'+ cmb.formfield +'_id').val(attachment.id);
+
+				// Setup our fileGroup array
+				var fileGroup = [];
+
+				// Loop through each attachment
+				$( attachment ).each( function() {
+					if ( this.type && this.type === 'image' ) {
+						// image preview
+						uploadStatus = '<li class="img_status">'+
+							'<img width="50" height="50" src="' + this.url + '" class="attachment-50x50" alt="'+ this.filename +'">'+
+							'<p><a href="#" class="cmb_remove_file_button" rel="'+ cmb.formfield +'['+ this.id +']">'+ l10n.remove_image +'</a></p>'+
+							'<input type="hidden" id="filelist-'+ this.id +'" name="'+ formName +'['+ this.id +']" value="' + this.url + '">'+
+						'</li>';
 
+					} else {
+						// Standard generic output if it's not an image.
+						uploadStatus = '<li>'+ l10n.file +' <strong>'+ this.filename +'</strong>&nbsp;&nbsp;&nbsp; (<a href="' + this.url + '" target="_blank" rel="external">'+ l10n.download +'</a> / <a href="#" class="cmb_remove_file_button" rel="'+ cmb.formfield +'['+ this.id +']">'+ l10n.remove_file +'</a>)'+
+							'<input type="hidden" id="filelist-'+ this.id +'" name="'+ formName +'['+ this.id +']" value="' + this.url + '">'+
+						'</li>';
 
-				// If this field's media frame already exists, reopen it.
-				if ( CMB.formfield in CMB.file_frames ) {
-					CMB.file_frames[CMB.formfield].open();
-					return;
-				}
+					}
 
-				// Create the media frame.
-				CMB.file_frames[CMB.formfield] = wp.media.frames.file_frame = wp.media({
-					title: $('label[for=' + CMB.formfield + ']').text(),
-					button: {
-						text: window.cmb_l10.upload_file
-					},
-					multiple: isList ? true : false
+					// Add our file to our fileGroup array
+					fileGroup.push( uploadStatus );
 				});
 
-				// When an file is selected, run a callback.
-				CMB.file_frames[CMB.formfield].on( 'select', function() {
-
-
-					if ( isList ) {
-
-						// Get all of our selected files
-						attachment = CMB.file_frames[CMB.formfield].state().get('selection').toJSON();
-
-						$formfield.val(attachment.url);
-						$('#'+ CMB.formfield +'_id').val(attachment.id);
-
-						// Setup our fileGroup array
-						var fileGroup = [];
-
-						// Loop through each attachment
-						$( attachment ).each( function() {
-							if ( this.type && this.type === 'image' ) {
-								// image preview
-								uploadStatus = '<li class="img_status">'+
-									'<img width="50" height="50" src="' + this.url + '" class="attachment-50x50" alt="'+ this.filename +'">'+
-									'<p><a href="#" class="cmb_remove_file_button" rel="'+ CMB.formfield +'['+ this.id +']">'+ cmb_l10.remove_image +'</a></p>'+
-									'<input type="hidden" id="filelist-'+ this.id +'" name="'+ CMB.formfield +'['+ this.id +']" value="' + this.url + '">'+
-								'</li>';
-
-							} else {
-								// Standard generic output if it's not an image.
-								uploadStatus = '<li>'+ cmb_l10.file +' <strong>'+ this.filename +'</strong>&nbsp;&nbsp;&nbsp; (<a href="' + this.url + '" target="_blank" rel="external">'+ cmb_l10.download +'</a> / <a href="#" class="cmb_remove_file_button" rel="'+ CMB.formfield +'['+ this.id +']">'+ cmb_l10.remove_file +'</a>)'+
-									'<input type="hidden" id="filelist-'+ this.id +'" name="'+ CMB.formfield +'['+ this.id +']" value="' + this.url + '">'+
-								'</li>';
-
-							}
-
-							// Add our file to our fileGroup array
-							fileGroup.push( uploadStatus );
-						});
+				// Append each item from our fileGroup array to .cmb_media_status
+				$( fileGroup ).each( function() {
+					$formfield.siblings('.cmb_media_status').slideDown().append(this);
+				});
+			},
+			single : function( selection ) {
+				// Only get one file from the uploader
+				attachment = selection.first().toJSON();
 
-						// Append each item from our fileGroup array to .cmb_media_status
-						$( fileGroup ).each( function() {
-							$formfield.siblings('.cmb_media_status').slideDown().append(this);
-						});
+				$formfield.val(attachment.url);
+				$('#'+ cmb.formfield +'_id').val(attachment.id);
 
-					} else {
+				if ( attachment.type && attachment.type === 'image' ) {
+					// image preview
+					uploadStatus = '<div class="img_status"><img style="max-width: 350px; width: 100%; height: auto;" src="' + attachment.url + '" alt="'+ attachment.filename +'" title="'+ attachment.filename +'" /><p><a href="#" class="cmb_remove_file_button" rel="' + cmb.formfield + '">'+ l10n.remove_image +'</a></p></div>';
+				} else {
+					// Standard generic output if it's not an image.
+					uploadStatus = l10n.file +' <strong>'+ attachment.filename +'</strong>&nbsp;&nbsp;&nbsp; (<a href="'+ attachment.url +'" target="_blank" rel="external">'+ l10n.download +'</a> / <a href="#" class="cmb_remove_file_button" rel="'+ cmb.formfield +'">'+ l10n.remove_file +'</a>)';
+				}
 
-						// Only get one file from the uploader
-						attachment = CMB.file_frames[CMB.formfield].state().get('selection').first().toJSON();
+				// add/display our output
+				$formfield.siblings('.cmb_media_status').slideDown().html(uploadStatus);
+			}
+		}
 
-						$formfield.val(attachment.url);
-						$('#'+ CMB.formfield +'_id').val(attachment.id);
+		// When an file is selected, run a callback.
+		cmb.file_frames[cmb.formfield].on( 'select', function() {
+			var selection = cmb.file_frames[cmb.formfield].state().get('selection');
+			var type = isList ? 'list' : 'single';
+			handlers[type]( selection );
+		});
+
+		// Finally, open the modal
+		cmb.file_frames[cmb.formfield].open();
+	}
+
+	cmb.handleRemoveMedia = function( event ) {
+		var $self = $(this);
+		if ( $self.is( '.attach_list .cmb_remove_file_button' ) ){
+			$self.parents('li').remove();
+			return false;
+		}
+		cmb.formfield    = $self.attr('rel');
+		var $container   = $self.parents('.img_status');
+
+		$metabox.find('input#' + cmb.formfield).val('');
+		$metabox.find('input#' + cmb.formfield + '_id').val('');
+		if ( ! $container.length ) {
+			$self.parents('.cmb_media_status').html('');
+		} else {
+			$container.html('');
+		}
+		return false;
+	}
+
+	cmb.addAjaxRow = function( event ) {
+
+		event.preventDefault();
+
+		var $self         = $(this);
+		var tableselector = '#'+ $self.data('selector');
+		var inputselector = tableselector.slice(1,tableselector.lastIndexOf('repeat'));
+		var $table        = $(tableselector).data('numberels', cmb.idNumber );
+		var $emptyrow     = $table.find('.empty-row');
+		cmb.idNumber      = parseInt( $emptyrow.find('[data-iterator]').data('iterator') ) + 1;
+		var $row          = $emptyrow.clone();
+		var prevNum       = cmb.idNumber - 1;
+		var $colorPicker  = $row.find( '.wp-picker-container' );
+		var $list         = $row.find( '.cmb_media_status' );
+		var $newInput, $focusInput;
+
+		// Need to clean-up colorpicker before appending
+		if ( $colorPicker.length ) {
+			var $td = $row.find( 'td:first-child' );
+			$td.html( $td.find( 'input:text.cmb_colorpicker' ) );
+		}
 
-						if ( attachment.type && attachment.type === 'image' ) {
-							// image preview
-							uploadStatus = '<div class="img_status"><img style="max-width: 350px; width: 100%; height: auto;" src="' + attachment.url + '" alt="'+ attachment.filename +'" title="'+ attachment.filename +'" /><p><a href="#" class="cmb_remove_file_button" rel="' + CMB.formfield + '">'+ cmb_l10.remove_image +'</a></p></div>';
-						} else {
-							// Standard generic output if it's not an image.
-							uploadStatus = cmb_l10.file +' <strong>'+ attachment.filename +'</strong>&nbsp;&nbsp;&nbsp; (<a href="'+ attachment.url +'" target="_blank" rel="external">'+ cmb_l10.download +'</a> / <a href="#" class="cmb_remove_file_button" rel="'+ CMB.formfield +'">'+ cmb_l10.remove_file +'</a>)';
-						}
+		// Need to clean-up colorpicker before appending
+		if ( $list.length ) {
+			$list.empty();
+		}
 
-						// add/display our output
-						$formfield.siblings('.cmb_media_status').slideDown().html(uploadStatus);
-					}
+		var cleanRow = function() {
+
+			$newInput = $(this);
+			$focusInput = $focusInput ? $focusInput : $newInput;
+
+			var oldName = $newInput.attr( 'name' );
+			var newName = oldName ? oldName.replace( prevNum, cmb.idNumber ) : '';
+			var oldID = $newInput.attr( 'id' );
+			var newID = oldID ? oldID.replace( '_'+ prevNum, '_'+ cmb.idNumber ) : '';
+			var $next = $newInput.next();
+
+			cmb.log( $newInput.prop('tagName'), oldName, newName, prevNum, cmb.idNumber );
+			$newInput
+				.val('')
+				.removeAttr( 'checked' )
+				.removeAttr( 'selected' )
+				.removeClass( 'hasDatepicker' )
+				.attr({
+				  id: newID,
+				  name: newName,
+				  'data-iterator': cmb.idNumber,
 				});
+			if ( $next.is('label') ) {
+				$next.attr( 'for', newID );
+			}
+		}
 
-				// Finally, open the modal
-				CMB.file_frames[CMB.formfield].open();
-			})
-			.on( 'click', '.cmb_remove_file_button', function(event) {
-				var $self        = $(this);
-				if ( $self.is( '.attach_list .cmb_remove_file_button' ) ){
-					$self.parents('li').remove();
-					return false;
-				}
-				CMB.formfield    = $self.attr('rel');
-				var $container   = $self.parents('.img_status');
-
-				$('input#' + CMB.formfield).val('');
-				$('input#' + CMB.formfield + '_id').val('');
-				if ( ! $container.length ) {
-					$self.parents('.cmb_media_status').html('');
-				} else {
-					$container.html('');
-				}
-				return false;
-			})
-			.on( 'click', '.add-row-button', function(e) {
+		// cmb.log( $newInput.attr('id'), $newInput.data('iterator'));
+		$row.find('input:not([type="button"]),select,textarea').each( cleanRow );
 
-				e.preventDefault();
+		$emptyrow.removeClass('empty-row').addClass('repeat-row');
+		$emptyrow.after( $row );
+		if ( $focusInput ) {
+			$focusInput.focus();
+		}
 
-				var $self         = $(this);
-				var tableselector = '#'+ $self.data('selector');
-				var inputselector = tableselector.slice(1,tableselector.lastIndexOf('repeat'));
-				var $table        = $(tableselector).data('numberels', CMB.idNumber );
-				var $emptyrow     = $table.find('.empty-row');
-				CMB.idNumber      = parseInt( $emptyrow.find('input').data('iterator') ) + 1;
-				var $row          = $emptyrow.clone();
-				var $newInput     = $row.find('input');
+		// Init pickers from new row
+		cmb.initPickers( $row.find('input:text.cmb_timepicker'), $row.find('input:text.cmb_datepicker'), $row.find('input:text.cmb_colorpicker') );
 
-				CMB.log( $newInput.attr('id'), $newInput.data('iterator'));
+	}
 
-				$newInput.val('').attr( 'id', inputselector + (CMB.idNumber) ).attr('data-iterator', CMB.idNumber ).data('iterator', CMB.idNumber );
-				$emptyrow.removeClass('empty-row').addClass('repeat-row');
-				$emptyrow.after( $row );
+	cmb.removeAjaxRow = function( event ) {
+		event.preventDefault();
+		var $self   = $(this);
+		var $parent = $self.parents('tr');
+		var $table  = $self.parents('.cmb-repeat-table');
 
-				// Init new timepicker and datepicker entries
-				CMB.initPickers();
+		// cmb.log( 'number of tbodys', $table.length );
+		// cmb.log( 'number of trs', $('tr', $table).length );
+		if ( $table.find('tr').length > 1 ) {
+			if ( $parent.hasClass('empty-row') ) {
+				$parent.prev().addClass( 'empty-row' ).removeClass('repeat-row');
+			}
+			$self.parents('.cmb-repeat-table tr').remove();
+		}
+	}
+
+	/**
+	 * @todo make work, always
+	 */
+	cmb.initPickers = function( $timePickers, $datePickers, $colorPickers ) {
+		// Initialize timepicker
+		cmb.initTimePickers( $timePickers );
+
+		// Initialize jQuery UI datepicker
+		cmb.initDatePickers( $datePickers );
+
+		// Initialize color picker
+		cmb.initColorPickers( $colorPickers );
+	}
+
+	cmb.initTimePickers = function( $selector ) {
+		if ( ! $selector.length )
+			return;
+
+		$selector.timePicker({
+			startTime: "00:00",
+			endTime: "23:59",
+			show24Hours: false,
+			separator: ':',
+			step: 30
+		});
+	}
+
+	cmb.initDatePickers = function( $selector ) {
+		if ( ! $selector.length )
+			return;
+
+		$selector.datepicker( "destroy" );
+		$selector.datepicker();
+	}
+
+	cmb.initColorPickers = function( $selector ) {
+		if ( ! $selector.length )
+			return;
+		if (typeof jQuery.wp === 'object' && typeof jQuery.wp.wpColorPicker === 'function') {
+
+			$selector.wpColorPicker();
+
+		} else {
+			$selector.each( function(i) {
+				$(this).after('<div id="picker-' + i + '" style="z-index: 1000; background: #EEE; border: 1px solid #CCC; position: absolute; display: block;"></div>');
+				$('#picker-' + i).hide().farbtastic($(this));
 			})
-			.on( 'click', '.remove-row-button', function(e) {
-				e.preventDefault();
-				var $self   = $(this);
-				var $parent = $self.parents('tr');
-				var $table  = $self.parents('.cmb-repeat-table');
-
-				CMB.log( 'number of tbodys', $table.length );
-				CMB.log( 'number of trs', $('tr', $table).length );
-				if ( $('tr', $table).length > 1 ) {
-					if ( $parent.hasClass('empty-row') ) {
-						$parent.prev().addClass( 'empty-row' ).removeClass('repeat-row');
-					}
-					$self.parents('.cmb-repeat-table tr').remove();
-				}
+			.focus( function() {
+				$(this).next().show();
 			})
-
-			/**
-			 * Ajax oEmbed display
-			 */
-
-			// ajax when typing
-			.on( 'keyup', '.cmb_oembed', function(event) {
-				// fire our ajax function
-				CMB.doAjax($(this), event);
+			.blur( function() {
+				$(this).next().hide();
 			});
+		}
+	}
 
-			// ajax on paste
-			$('.cmb_oembed').bind( 'paste', function(e) {
-				var pasteitem = $(this);
-				// paste event is fired before the value is filled, so wait a bit
-				setTimeout( function() {
-					// fire our ajax function
-					CMB.doAjax(pasteitem, 'paste');
-				}, 100);
-			}).blur( function() {
-				// when leaving the input
+	cmb.maybeOembed = function( evt ) {
+		var $self = $(this);
+		var type = evt.type;
+
+		var m = {
+			focusout : function() {
 				setTimeout( function() {
 					// if it's been 2 seconds, hide our spinner
-					CMB.spinner( '.postbox table.cmb_metabox', true );
+					cmb.spinner( '.postbox table.cmb_metabox', true );
 				}, 2000);
+			},
+			keyup : function() {
+				var betw = function( min, max ) { return evt.which <= max && evt.which >= min; }
+				// Only Ajax on normal keystrokes
+				if ( betw( 48, 90 ) || betw( 96, 111 ) || betw( 8, 9 ) || evt.which == 187 || evt.which == 190 ) {
+					// fire our ajax function
+					cmb.doAjax( $self, evt);
+				}
+			},
+			paste : function() {
+				// paste event is fired before the value is filled, so wait a bit
+				setTimeout( function() { cmb.doAjax( $self ); }, 100);
+			}
+		}
+		m[type]();
+
+	}
+
+	/**
+	 * Resize oEmbed videos to fit in their respective metaboxes
+	 */
+	cmb.resizeoEmbeds = function() {
+		cmb.metabox().each( function() {
+			var $self      = $(this);
+			var $tableWrap = $self.parents('.inside');
+			if ( ! $tableWrap.length )
+				return true; // continue
+
+			// Calculate new width
+			var newWidth = Math.round(($tableWrap.width() * 0.82)*0.97) - 30;
+			if ( newWidth > 639 )
+				return true; // continue
+
+			var $embeds   = $self.find('.cmb-type-oembed .embed_status');
+			var $children = $embeds.children().not('.cmb_remove_wrapper');
+			if ( ! $children.length )
+				return true; // continue
+
+			$children.each( function() {
+				var $self     = $(this);
+				var iwidth    = $self.width();
+				var iheight   = $self.height();
+				var _newWidth = newWidth;
+				if ( $self.parents( '.repeat-row' ).length ) {
+					// Make room for our repeatable "remove" button column
+					_newWidth = newWidth - 91;
+				}
+				// Calc new height
+				var newHeight = Math.round((_newWidth * iheight)/iwidth);
+				$self.width(_newWidth).height(newHeight);
 			});
 
-			// on pageload
-			setTimeout( CMB.resizeoEmbeds, 500);
-			// and on window resize
-			$(window).on( 'resize', CMB.resizeoEmbeds );
-
-		},
-
-		/**
-		 * @todo make work, always
-		 */
-		initPickers: function() {
-			// Initialize timepicker
-			CMB.initTimePickers();
-
-			// Initialize jQuery UI datepicker
-			CMB.initDatePickers();
-
-			// Initialize color picker
-			CMB.initColorPickers();
-		},
-
-		initTimePickers: function() {
-			$('input:text.cmb_timepicker').each( function() {
-				var $clone = $(this);
-				// var $picker = $('#' + $(this).attr('id'));
-				// var $clone = $picker.clone();
-				// $picker.after( $clone );
-				// $picker.remove();
-				CMB.initTimePicker( $clone );
-			});
-		},
-
-		initTimePicker: function($target) {
-			$('#' + $target.attr('id')).timePicker({
-				startTime: "00:00",
-				endTime: "23:59",
-				show24Hours: false,
-				separator: ':',
-				step: 30
-			});
-		},
-
-		initDatePickers: function() {
-			$('.cmb_datepicker').each( function() {
-				// var $picker = $('#' + $(this).attr('id'));
-				CMB.initDatePicker($(this));
-			});
-		},
-
-		initDatePicker: function($target) {
-			$target.datepicker( "destroy" );
-			$target.datepicker();
-			// $('#' + jQuery(this).attr('id')).datepicker({ dateFormat: 'yy-mm-dd' });
-			// For more options see http://jqueryui.com/demos/datepicker/#option-dateFormat
-		},
-
-		initColorPickers: function() {
-			if (typeof jQuery.wp === 'object' && typeof jQuery.wp.wpColorPicker === 'function') {
-
-				$('input:text.cmb_colorpicker').each( function() {
-					var $picker = $(this);
-					var $clone = $picker.clone();
-					$picker.after( $clone );
-					$picker.remove();
-					$clone.wpColorPicker();
-				});
+		});
+	}
 
-			} else {
-				$('input:text.cmb_colorpicker').each( function(i) {
-					$(this).after('<div id="picker-' + i + '" style="z-index: 1000; background: #EEE; border: 1px solid #CCC; position: absolute; display: block;"></div>');
-					$('#picker-' + i).hide().farbtastic($(this));
-				})
-				.focus( function() {
-					$(this).next().show();
-				})
-				.blur( function() {
-					$(this).next().hide();
+	/**
+	 * Safely log things if query var is set
+	 * @since  1.0.0
+	 */
+	cmb.log = function() {
+		if ( l10n.script_debug && console && typeof console.log === 'function' ) {
+			console.log.apply(console, arguments);
+		}
+	}
+
+	cmb.spinner = function( $context, hide ) {
+		if ( hide )
+			$('.cmb-spinner', $context ).hide();
+		else
+			$('.cmb-spinner', $context ).show();
+	}
+
+	// function for running our ajax
+	cmb.doAjax = function($obj, e) {
+		// get typed value
+		var oembed_url = $obj.val();
+		// only proceed if the field contains more than 6 characters
+		if (oembed_url.length < 6)
+			return;
+
+		// only proceed if the user has pasted, pressed a number, letter, or whitelisted characters
+
+			// get field id
+			var field_id = $obj.attr('id');
+			// get our inputs $context for pinpointing
+			var $context = $obj.parents('.cmb-repeat-table  tr td');
+			$context = $context.length ? $context : $obj.parents('.cmb_metabox tr td');
+
+			var embed_container = $('.embed_status', $context);
+			var oembed_width = $obj.width();
+			var child_el = $(':first-child', embed_container);
+
+			// http://www.youtube.com/watch?v=dGG7aru2S6U
+			cmb.log( 'oembed_url', oembed_url, field_id );
+			oembed_width = ( embed_container.length && child_el.length ) ? child_el.width() : $obj.width();
+
+			// show our spinner
+			cmb.spinner( $context );
+			// clear out previous results
+			$('.embed_wrap', $context).html('');
+			// and run our ajax function
+			setTimeout( function() {
+				// if they haven't typed in 500 ms
+				if ($('.cmb_oembed:focus').val() != oembed_url)
+					return;
+				$.ajax({
+					type : 'post',
+					dataType : 'json',
+					url : l10n.ajaxurl,
+					data : {
+						'action': 'cmb_oembed_handler',
+						'oembed_url': oembed_url,
+						'oembed_width': oembed_width > 300 ? oembed_width : 300,
+						'field_id': field_id,
+						'object_id': $obj.data('objectid'),
+						'object_type': $obj.data('objecttype'),
+						'cmb_ajax_nonce': l10n.ajax_nonce
+					},
+					success: function(response) {
+						cmb.log( response );
+						// Make sure we have a response id
+						if (typeof response.id === 'undefined')
+							return;
+
+						// hide our spinner
+						cmb.spinner( $context, true );
+						// and populate our results from ajax response
+						$('.embed_wrap', $context).html(response.result);
+					}
 				});
-			}
-		},
 
-		initColorPicker: function($target) {
-			$target.datepicker( "destroy" );
-			$target.datepicker();
-			// $('#' + jQuery(this).attr('id')).datepicker({ dateFormat: 'yy-mm-dd' });
-			// For more options see http://jqueryui.com/demos/datepicker/#option-dateFormat
-		},
-
-		/**
-		 * Safely log things if query var is set
-		 * @since  1.0.0
-		 */
-		log: function() {
-			if ( window.cmb_l10.script_debug && console && typeof console.log === 'function' ) {
-				console.log.apply(console, arguments);
-			}
-		},
-
-		spinner: function( context, hide ) {
-			if ( hide )
-				$('.cmb-spinner', context).hide();
-			else
-				$('.cmb-spinner', context).show();
-		},
-
-		// function for running our ajax
-		doAjax: function(obj, e) {
-			// get typed value
-			var oembed_url = obj.val();
-			// only proceed if the field contains more than 6 characters
-			if (oembed_url.length < 6)
-				return;
-
-			// only proceed if the user has pasted, pressed a number, letter, or whitelisted characters
-			if (e === 'paste' || e.which <= 90 && e.which >= 48 || e.which >= 96 && e.which <= 111 || e.which == 8 || e.which == 9 || e.which == 187 || e.which == 190) {
-
-				// get field id
-				var field_id = obj.attr('id');
-				// get our inputs context for pinpointing
-				var context = obj.parents('.cmb_metabox tr td');
-
-				var embed_container = $('.embed_status', context);
-				var oembed_width = obj.width();
-				var child_el = $(':first-child', embed_container);
-
-				oembed_width = ( embed_container.length && child_el.length ) ? child_el.width() : obj.width();
-
-				// show our spinner
-				CMB.spinner( context );
-				// clear out previous results
-				$('.embed_wrap', context).html('');
-				// and run our ajax function
-				setTimeout( function() {
-					// if they haven't typed in 500 ms
-					if ($('.cmb_oembed:focus').val() != oembed_url)
-						return;
-					$.ajax({
-						type : 'post',
-						dataType : 'json',
-						url : window.cmb_l10.ajaxurl,
-						data : {
-							'action': 'cmb_oembed_handler',
-							'oembed_url': oembed_url,
-							'oembed_width': oembed_width > 300 ? oembed_width : 300,
-							'field_id': field_id,
-							'object_id': obj.data('objectid'),
-							'object_type': obj.data('objecttype'),
-							'cmb_ajax_nonce': window.cmb_l10.ajax_nonce
-						},
-						success: function(response) {
-							CMB.log( response );
-							// Make sure we have a response id
-							if (typeof response.id === 'undefined')
-								return;
-
-							// hide our spinner
-							CMB.spinner( context, true );
-							// and populate our results from ajax response
-							$('.embed_wrap', context).html(response.result);
-						}
-					});
-
-				}, 500);
-			}
-		},
-
-		/**
-		 * Resize oEmbed videos to fit in their respective metaboxes
-		 */
-		resizeoEmbeds: function() {
-			$('table.cmb_metabox').each( function( index ) {
-				var self = $(this);
-				var parents = self.parents('.inside');
-				if ( ! parents.length )
-					return true; // continue
-
-				var tWidth = parents.width();
-				var newWidth = Math.round((tWidth * 0.82)*0.97) - 30;
-				if ( newWidth > 639 )
-					return true; // continue
-
-				var child_el = $('.cmb-type-oembed .embed_status', self).children().first();
-				var iwidth = child_el.width();
-				var iheight = child_el.height();
-				var newHeight = Math.round((newWidth * iheight)/iwidth);
-				child_el.width(newWidth).height(newHeight);
-
-			});
-		}
+			}, 500);
+	}
 
-	};
+	$(document).ready(cmb.init);
 
-	$(document).ready(CMB.init);
+	return cmb;
 
 })(window, document, jQuery);
diff --git a/js/cmb.min.js b/js/cmb.min.js
index f3ac04f..aa7b112 100644
--- a/js/cmb.min.js
+++ b/js/cmb.min.js
@@ -1,33 +1,38 @@
-(function(b,a,c,d){b.CMB={formfield:"",idNumber:false,file_frames:{},init:function(){CMB.log(b.cmb_l10);if(b.cmb_l10.new_admin_style){c(".cmb-spinner img").hide();
-}CMB.initPickers();c("#ui-datepicker-div").wrap('<div class="cmb_element" />');c(".cmb_metabox").on("change",".cmb_upload_file",function(){CMB.formfield=c(this).attr("id");
-c("#"+CMB.formfield+"_id").val("");}).on("click",".cmb_upload_button",function(f){f.preventDefault();var j=c(this);CMB.formfield=j.prev("input").attr("id");
-var i=c("#"+CMB.formfield);var e=true;var h=true;var g=j.hasClass("cmb_upload_list");if(CMB.formfield in CMB.file_frames){CMB.file_frames[CMB.formfield].open();
-return;}CMB.file_frames[CMB.formfield]=wp.media.frames.file_frame=wp.media({title:c("label[for="+CMB.formfield+"]").text(),button:{text:b.cmb_l10.upload_file},multiple:g?true:false});
-CMB.file_frames[CMB.formfield].on("select",function(){if(g){h=CMB.file_frames[CMB.formfield].state().get("selection").toJSON();i.val(h.url);c("#"+CMB.formfield+"_id").val(h.id);
-var k=[];c(h).each(function(){if(this.type&&this.type==="image"){e='<li class="img_status"><img width="50" height="50" src="'+this.url+'" class="attachment-50x50" alt="'+this.filename+'"><p><a href="#" class="cmb_remove_file_button" rel="'+CMB.formfield+"["+this.id+']">'+cmb_l10.remove_image+'</a></p><input type="hidden" id="filelist-'+this.id+'" name="'+CMB.formfield+"["+this.id+']" value="'+this.url+'"></li>';
-}else{e="<li>"+cmb_l10.file+" <strong>"+this.filename+'</strong>&nbsp;&nbsp;&nbsp; (<a href="'+this.url+'" target="_blank" rel="external">'+cmb_l10.download+'</a> / <a href="#" class="cmb_remove_file_button" rel="'+CMB.formfield+"["+this.id+']">'+cmb_l10.remove_file+'</a>)<input type="hidden" id="filelist-'+this.id+'" name="'+CMB.formfield+"["+this.id+']" value="'+this.url+'"></li>';
-}k.push(e);});c(k).each(function(){i.siblings(".cmb_media_status").slideDown().append(this);});}else{h=CMB.file_frames[CMB.formfield].state().get("selection").first().toJSON();
-i.val(h.url);c("#"+CMB.formfield+"_id").val(h.id);if(h.type&&h.type==="image"){e='<div class="img_status"><img style="max-width: 350px; width: 100%; height: auto;" src="'+h.url+'" alt="'+h.filename+'" title="'+h.filename+'" /><p><a href="#" class="cmb_remove_file_button" rel="'+CMB.formfield+'">'+cmb_l10.remove_image+"</a></p></div>";
-}else{e=cmb_l10.file+" <strong>"+h.filename+'</strong>&nbsp;&nbsp;&nbsp; (<a href="'+h.url+'" target="_blank" rel="external">'+cmb_l10.download+'</a> / <a href="#" class="cmb_remove_file_button" rel="'+CMB.formfield+'">'+cmb_l10.remove_file+"</a>)";
-}i.siblings(".cmb_media_status").slideDown().html(e);}});CMB.file_frames[CMB.formfield].open();}).on("click",".cmb_remove_file_button",function(e){var g=c(this);
-if(g.is(".attach_list .cmb_remove_file_button")){g.parents("li").remove();return false;}CMB.formfield=g.attr("rel");var f=g.parents(".img_status");c("input#"+CMB.formfield).val("");
-c("input#"+CMB.formfield+"_id").val("");if(!f.length){g.parents(".cmb_media_status").html("");}else{f.html("");}return false;}).on("click",".add-row-button",function(l){l.preventDefault();
-var m=c(this);var j="#"+m.data("selector");var k=j.slice(1,j.lastIndexOf("repeat"));var h=c(j).data("numberels",CMB.idNumber);var i=h.find(".empty-row");
-CMB.idNumber=parseInt(i.find("input").data("iterator"))+1;var f=i.clone();var g=f.find("input");CMB.log(g.attr("id"),g.data("iterator"));g.val("").attr("id",k+(CMB.idNumber)).attr("data-iterator",CMB.idNumber).data("iterator",CMB.idNumber);
-i.removeClass("empty-row").addClass("repeat-row");i.after(f);CMB.initPickers();}).on("click",".remove-row-button",function(h){h.preventDefault();var i=c(this);
-var g=i.parents("tr");var f=i.parents(".cmb-repeat-table");CMB.log("number of tbodys",f.length);CMB.log("number of trs",c("tr",f).length);if(c("tr",f).length>1){if(g.hasClass("empty-row")){g.prev().addClass("empty-row").removeClass("repeat-row");
-}i.parents(".cmb-repeat-table tr").remove();}}).on("keyup",".cmb_oembed",function(e){CMB.doAjax(c(this),e);});c(".cmb_oembed").bind("paste",function(g){var f=c(this);
-setTimeout(function(){CMB.doAjax(f,"paste");},100);}).blur(function(){setTimeout(function(){CMB.spinner(".postbox table.cmb_metabox",true);},2000);});setTimeout(CMB.resizeoEmbeds,500);
-c(b).on("resize",CMB.resizeoEmbeds);},initPickers:function(){CMB.initTimePickers();CMB.initDatePickers();CMB.initColorPickers();},initTimePickers:function(){c("input:text.cmb_timepicker").each(function(){var e=c(this);
-CMB.initTimePicker(e);});},initTimePicker:function(e){c("#"+e.attr("id")).timePicker({startTime:"00:00",endTime:"23:59",show24Hours:false,separator:":",step:30});
-},initDatePickers:function(){c(".cmb_datepicker").each(function(){CMB.initDatePicker(c(this));});},initDatePicker:function(e){e.datepicker("destroy");e.datepicker();
-},initColorPickers:function(){if(typeof jQuery.wp==="object"&&typeof jQuery.wp.wpColorPicker==="function"){c("input:text.cmb_colorpicker").each(function(){var e=c(this);
-var f=e.clone();e.after(f);e.remove();f.wpColorPicker();});}else{c("input:text.cmb_colorpicker").each(function(e){c(this).after('<div id="picker-'+e+'" style="z-index: 1000; background: #EEE; border: 1px solid #CCC; position: absolute; display: block;"></div>');
-c("#picker-"+e).hide().farbtastic(c(this));}).focus(function(){c(this).next().show();}).blur(function(){c(this).next().hide();});}},initColorPicker:function(e){e.datepicker("destroy");
-e.datepicker();},log:function(){if(b.cmb_l10.script_debug&&console&&typeof console.log==="function"){console.log.apply(console,arguments);}},spinner:function(f,e){if(e){c(".cmb-spinner",f).hide();
-}else{c(".cmb-spinner",f).show();}},doAjax:function(m,l){var h=m.val();if(h.length<6){return;}if(l==="paste"||l.which<=90&&l.which>=48||l.which>=96&&l.which<=111||l.which==8||l.which==9||l.which==187||l.which==190){var j=m.attr("id");
-var g=m.parents(".cmb_metabox tr td");var k=c(".embed_status",g);var f=m.width();var i=c(":first-child",k);f=(k.length&&i.length)?i.width():m.width();CMB.spinner(g);
-c(".embed_wrap",g).html("");setTimeout(function(){if(c(".cmb_oembed:focus").val()!=h){return;}c.ajax({type:"post",dataType:"json",url:b.cmb_l10.ajaxurl,data:{action:"cmb_oembed_handler",oembed_url:h,oembed_width:f>300?f:300,field_id:j,object_id:m.data("objectid"),object_type:m.data("objecttype"),cmb_ajax_nonce:b.cmb_l10.ajax_nonce},success:function(e){CMB.log(e);
-if(typeof e.id==="undefined"){return;}CMB.spinner(g,true);c(".embed_wrap",g).html(e.result);}});},500);}},resizeoEmbeds:function(){c("table.cmb_metabox").each(function(j){var m=c(this);
-var l=m.parents(".inside");if(!l.length){return true;}var i=l.width();var h=Math.round((i*0.82)*0.97)-30;if(h>639){return true;}var f=c(".cmb-type-oembed .embed_status",m).children().first();
-var g=f.width();var k=f.height();var e=Math.round((h*k)/g);f.width(h).height(e);});}};c(a).ready(CMB.init);})(window,document,jQuery);
\ No newline at end of file
+window.CMB=(function(c,a,d,f){var b=c.cmb_l10;var e={formfield:"",idNumber:false,file_frames:{},};e.metabox=function(){if(e.$metabox){return e.$metabox;
+}e.$metabox=d("table.cmb_metabox");return e.$metabox;};e.init=function(){e.log(b);var g=e.metabox();if(b.new_admin_style){g.find(".cmb-spinner img").hide();
+}e.initPickers(g.find("input:text.cmb_timepicker"),g.find("input:text.cmb_datepicker"),g.find("input:text.cmb_colorpicker"));d("#ui-datepicker-div").wrap('<div class="cmb_element" />');
+d(".cmb_metabox").on("change",".cmb_upload_file",function(){e.formfield=d(this).attr("id");d("#"+e.formfield+"_id").val("");}).on("click",".cmb_upload_button",e.handleMedia).on("click",".cmb_remove_file_button",e.handleRemoveMedia).on("click",".add-row-button",e.addAjaxRow).on("click",".remove-row-button",e.removeAjaxRow).on("keyup paste focusout",".cmb_oembed",e.maybeOembed);
+setTimeout(e.resizeoEmbeds,500);d(c).on("resize",e.resizeoEmbeds);};e.handleMedia=function(h){h.preventDefault();var m=e.metabox();var n=d(this);e.formfield=n.prev("input").attr("id");
+var g=d("#"+e.formfield);var o=g.attr("name");var i=true;var l=true;var j=n.hasClass("cmb_upload_list");if(e.formfield in e.file_frames){e.file_frames[e.formfield].open();
+return;}e.file_frames[e.formfield]=wp.media.frames.file_frame=wp.media({title:m.find("label[for="+e.formfield+"]").text(),button:{text:b.upload_file},multiple:j?true:false});
+var k={list:function(q){l=q.toJSON();g.val(l.url);d("#"+e.formfield+"_id").val(l.id);var p=[];d(l).each(function(){if(this.type&&this.type==="image"){i='<li class="img_status"><img width="50" height="50" src="'+this.url+'" class="attachment-50x50" alt="'+this.filename+'"><p><a href="#" class="cmb_remove_file_button" rel="'+e.formfield+"["+this.id+']">'+b.remove_image+'</a></p><input type="hidden" id="filelist-'+this.id+'" name="'+o+"["+this.id+']" value="'+this.url+'"></li>';
+}else{i="<li>"+b.file+" <strong>"+this.filename+'</strong>&nbsp;&nbsp;&nbsp; (<a href="'+this.url+'" target="_blank" rel="external">'+b.download+'</a> / <a href="#" class="cmb_remove_file_button" rel="'+e.formfield+"["+this.id+']">'+b.remove_file+'</a>)<input type="hidden" id="filelist-'+this.id+'" name="'+o+"["+this.id+']" value="'+this.url+'"></li>';
+}p.push(i);});d(p).each(function(){g.siblings(".cmb_media_status").slideDown().append(this);});},single:function(p){l=p.first().toJSON();g.val(l.url);d("#"+e.formfield+"_id").val(l.id);
+if(l.type&&l.type==="image"){i='<div class="img_status"><img style="max-width: 350px; width: 100%; height: auto;" src="'+l.url+'" alt="'+l.filename+'" title="'+l.filename+'" /><p><a href="#" class="cmb_remove_file_button" rel="'+e.formfield+'">'+b.remove_image+"</a></p></div>";
+}else{i=b.file+" <strong>"+l.filename+'</strong>&nbsp;&nbsp;&nbsp; (<a href="'+l.url+'" target="_blank" rel="external">'+b.download+'</a> / <a href="#" class="cmb_remove_file_button" rel="'+e.formfield+'">'+b.remove_file+"</a>)";
+}g.siblings(".cmb_media_status").slideDown().html(i);}};e.file_frames[e.formfield].on("select",function(){var q=e.file_frames[e.formfield].state().get("selection");
+var p=j?"list":"single";k[p](q);});e.file_frames[e.formfield].open();};e.handleRemoveMedia=function(g){var i=d(this);if(i.is(".attach_list .cmb_remove_file_button")){i.parents("li").remove();
+return false;}e.formfield=i.attr("rel");var h=i.parents(".img_status");$metabox.find("input#"+e.formfield).val("");$metabox.find("input#"+e.formfield+"_id").val("");
+if(!h.length){i.parents(".cmb_media_status").html("");}else{h.html("");}return false;};e.addAjaxRow=function(i){i.preventDefault();var q=d(this);var s="#"+q.data("selector");
+var g=s.slice(1,s.lastIndexOf("repeat"));var t=d(s).data("numberels",e.idNumber);var k=t.find(".empty-row");e.idNumber=parseInt(k.find("[data-iterator]").data("iterator"))+1;
+var n=k.clone();var m=e.idNumber-1;var r=n.find(".wp-picker-container");var l=n.find(".cmb_media_status");var p,h;if(r.length){var j=n.find("td:first-child");
+j.html(j.find("input:text.cmb_colorpicker"));}if(l.length){l.empty();}var o=function(){p=d(this);h=h?h:p;var x=p.attr("name");var v=x?x.replace(m,e.idNumber):"";
+var y=p.attr("id");var w=y?y.replace("_"+m,"_"+e.idNumber):"";var u=p.next();e.log(p.prop("tagName"),x,v,m,e.idNumber);p.val("").removeAttr("checked").removeAttr("selected").removeClass("hasDatepicker").attr({id:w,name:v,"data-iterator":e.idNumber,});
+if(u.is("label")){u.attr("for",w);}};n.find('input:not([type="button"]),select,textarea').each(o);k.removeClass("empty-row").addClass("repeat-row");k.after(n);
+if(h){h.focus();}e.initPickers(n.find("input:text.cmb_timepicker"),n.find("input:text.cmb_datepicker"),n.find("input:text.cmb_colorpicker"));};e.removeAjaxRow=function(h){h.preventDefault();
+var j=d(this);var i=j.parents("tr");var g=j.parents(".cmb-repeat-table");if(g.find("tr").length>1){if(i.hasClass("empty-row")){i.prev().addClass("empty-row").removeClass("repeat-row");
+}j.parents(".cmb-repeat-table tr").remove();}};e.initPickers=function(h,i,g){e.initTimePickers(h);e.initDatePickers(i);e.initColorPickers(g);};e.initTimePickers=function(g){if(!g.length){return;
+}g.timePicker({startTime:"00:00",endTime:"23:59",show24Hours:false,separator:":",step:30});};e.initDatePickers=function(g){if(!g.length){return;}g.datepicker("destroy");
+g.datepicker();};e.initColorPickers=function(g){if(!g.length){return;}if(typeof jQuery.wp==="object"&&typeof jQuery.wp.wpColorPicker==="function"){g.wpColorPicker();
+}else{g.each(function(h){d(this).after('<div id="picker-'+h+'" style="z-index: 1000; background: #EEE; border: 1px solid #CCC; position: absolute; display: block;"></div>');
+d("#picker-"+h).hide().farbtastic(d(this));}).focus(function(){d(this).next().show();}).blur(function(){d(this).next().hide();});}};e.maybeOembed=function(h){var j=d(this);
+var i=h.type;var g={focusout:function(){setTimeout(function(){e.spinner(".postbox table.cmb_metabox",true);},2000);},keyup:function(){var k=function(m,l){return h.which<=l&&h.which>=m;
+};if(k(48,90)||k(96,111)||k(8,9)||h.which==187||h.which==190){e.doAjax(j,h);}},paste:function(){setTimeout(function(){e.doAjax(j);},100);}};g[i]();};e.resizeoEmbeds=function(){e.metabox().each(function(){var i=d(this);
+var k=i.parents(".inside");if(!k.length){return true;}var h=Math.round((k.width()*0.82)*0.97)-30;if(h>639){return true;}var j=i.find(".cmb-type-oembed .embed_status");
+var g=j.children().not(".cmb_remove_wrapper");if(!g.length){return true;}g.each(function(){var o=d(this);var m=o.width();var p=o.height();var n=h;if(o.parents(".repeat-row").length){n=h-91;
+}var l=Math.round((n*p)/m);o.width(n).height(l);});});};e.log=function(){if(b.script_debug&&console&&typeof console.log==="function"){console.log.apply(console,arguments);
+}};e.spinner=function(g,h){if(h){d(".cmb-spinner",g).hide();}else{d(".cmb-spinner",g).show();}};e.doAjax=function(n,m){var i=n.val();if(i.length<6){return;
+}var k=n.attr("id");var g=n.parents(".cmb-repeat-table  tr td");g=g.length?g:n.parents(".cmb_metabox tr td");var l=d(".embed_status",g);var h=n.width();
+var j=d(":first-child",l);e.log("oembed_url",i,k);h=(l.length&&j.length)?j.width():n.width();e.spinner(g);d(".embed_wrap",g).html("");setTimeout(function(){if(d(".cmb_oembed:focus").val()!=i){return;
+}d.ajax({type:"post",dataType:"json",url:b.ajaxurl,data:{action:"cmb_oembed_handler",oembed_url:i,oembed_width:h>300?h:300,field_id:k,object_id:n.data("objectid"),object_type:n.data("objecttype"),cmb_ajax_nonce:b.ajax_nonce},success:function(o){e.log(o);
+if(typeof o.id==="undefined"){return;}e.spinner(g,true);d(".embed_wrap",g).html(o.result);}});},500);};d(a).ready(e.init);return e;})(window,document,jQuery);

From a0f982ad13c5356793839cba9808db9436ab41d2 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Fri, 7 Feb 2014 10:01:28 -0500
Subject: [PATCH 18/71] revamp types to work with more repeatable field types

---
 helpers/cmb_Meta_Box_Sanitize.php |  251 ++--
 helpers/cmb_Meta_Box_ajax.php     |    4 +-
 helpers/cmb_Meta_Box_field.php    |  215 +++
 init.php                          |  172 +--
 js/cmb.js                         |  721 +++++-----
 js/cmb.min.js                     |   67 +-
 js/jquery.datePicker.min.js       | 2038 +++++++++++++++++++++++++++++
 7 files changed, 2912 insertions(+), 556 deletions(-)
 create mode 100644 helpers/cmb_Meta_Box_field.php
 create mode 100644 js/jquery.datePicker.min.js

diff --git a/helpers/cmb_Meta_Box_Sanitize.php b/helpers/cmb_Meta_Box_Sanitize.php
index ead4f77..2010d39 100644
--- a/helpers/cmb_Meta_Box_Sanitize.php
+++ b/helpers/cmb_Meta_Box_Sanitize.php
@@ -7,158 +7,167 @@
 class cmb_Meta_Box_Sanitize {
 
 	/**
-	 * A single instance of this class.
-	 * @var   cmb_Meta_Box_types object
-	 * @since 1.0.0
+	 * A CMB field object
+	 * @var cmb_Meta_Box_field object
 	 */
-	public static $instance = null;
+	public $field;
 
 	/**
-	 * Creates or returns an instance of this class.
-	 * @since  1.0.0
-	 * @return cmb_Meta_Box_Sanitize A single instance of this class.
+	 * Field's $_POST value
+	 * @var mixed
 	 */
-	public static function get() {
-		if ( self::$instance === null )
-			self::$instance = new self();
-
-		return self::$instance;
-	}
+	public $value;
 
 	/**
-	 * Sample field validation
-	 * @since  0.0.4
+	 * Setup our class vars
+	 * @since 1.0.3
+	 * @param object $field A CMB field object
+	 * @param mixed  $value Field value
 	 */
-	public static function check_text( $text ) {
-		return $text === 'hello' ? true : false;
+	public function __construct( $field, $value ) {
+		$this->field = $field;
+		$this->value = $value;
 	}
 
 	/**
 	 * Simple checkbox validation
 	 * @since  1.0.1
-	 * @param  mixed  $text 'on' or false
-	 * @return mixex        'on' or false
+	 * @param  mixed  $val 'on' or false
+	 * @return mixed         'on' or false
 	 */
-	public static function checkbox( $text ) {
-		return $text === 'on' ? 'on' : false;
+	public function checkbox( $value ) {
+		return $value === 'on' ? 'on' : false;
 	}
 
 	/**
 	 * Validate url in a meta value
 	 * @since  1.0.1
-	 * @param  string $meta  Meta value
-	 * @param  array  $field Field config array
+	 * @param  string $value  Meta value
 	 * @return string        Empty string or escaped url
 	 */
-	public static function text_url( $meta, $field ) {
+	public function text_url( $value ) {
 
-		$protocols = isset( $field['protocols'] ) ? (array) $field['protocols'] : null;
-		if ( is_array( $meta ) ) {
-			foreach ( $meta as $key => $value ) {
-				$meta[ $key ] = $value ? esc_url_raw( $value, $protocols ) : $field['default'];
+		$protocols = $this->field->args( 'protocols' );
+		// for repeatable
+		if ( is_array( $value ) ) {
+			foreach ( $value as $key => $val ) {
+				$value[ $key ] = $val ? esc_url_raw( $val, $protocols ) : $this->field->args( 'default' );
 			}
 		} else {
-			$meta = $meta ? esc_url_raw( $meta, $protocols ) : $field['default'];
+			$value = $value ? esc_url_raw( $value, $protocols ) : $this->field->args( 'default' );
 		}
 
-		return $meta;
+		return $value;
 	}
 
-	/**
-	 * Because we don't want oembed data passed through the cmb_validate_ filter
-	 * @since  1.0.1
-	 * @param  string  $meta oembed cached data
-	 * @return string        oembed cached data
-	 */
-	public static function oembed( $meta ) {
-		return $meta;
+	public function colorpicker( $value ) {
+		// for repeatable
+		if ( is_array( $value ) ) {
+			$check = $value;
+			$value = array();
+			foreach ( $check as $key => $val ) {
+				if ( $val && '#' != $val ) {
+					$value[ $key ] = esc_attr( $val );
+				}
+			}
+		} else {
+			$value = ! $value || '#' == $value ? '' : esc_attr( $value );
+		}
+		return $value;
 	}
 
 	/**
 	 * Validate email in a meta value
 	 * @since  1.0.1
-	 * @param  string $meta Meta value
+	 * @param  string $value Meta value
 	 * @return string       Empty string or validated email
 	 */
-	public static function text_email( $meta ) {
-
-		if ( is_array( $meta ) ) {
-			foreach ( $meta as $key => $value ) {
-				$value = trim( $value );
-				$meta[ $key ] = is_email( $value ) ? $value : '';
+	public function text_email( $value ) {
+		// for repeatable
+		if ( is_array( $value ) ) {
+			foreach ( $value as $key => $val ) {
+				$val = trim( $val );
+				$value[ $key ] = is_email( $val ) ? $val : '';
 			}
 		} else {
-			$meta = trim( $meta );
-			$meta = is_email( $meta ) ? $meta : '';
+			$value = trim( $value );
+			$value = is_email( $value ) ? $value : '';
 		}
 
-		return $meta;
+		return $value;
 	}
 
 	/**
 	 * Validate money in a meta value
 	 * @since  1.0.1
-	 * @param  string $meta Meta value
+	 * @param  string $value Meta value
 	 * @return string       Empty string or validated money value
 	 */
-	public static function text_money( $meta ) {
-		if ( is_array( $meta ) ) {
-			foreach ( $meta as $key => $value ) {
-				$meta[ $key ] = number_format( (float) str_ireplace( ',', '', $value ), 2, '.', ',');
+	public function text_money( $value ) {
+		// for repeatable
+		if ( is_array( $value ) ) {
+			foreach ( $value as $key => $val ) {
+				$value[ $key ] = number_format( (float) str_ireplace( ',', '', $val ), 2, '.', ',');
 			}
 		} else {
-			$meta = number_format( (float) str_ireplace( ',', '', $meta ), 2, '.', ',');
+			$value = number_format( (float) str_ireplace( ',', '', $value ), 2, '.', ',');
 		}
 
-		return $meta;
+		return $value;
 	}
 
 	/**
 	 * Converts text date to timestamp
 	 * @since  1.0.2
-	 * @param  string $meta Meta value
+	 * @param  string $value Meta value
 	 * @return string       Timestring
 	 */
-	public static function text_date_timestamp( $meta ) {
-		return strtotime( $meta );;
+	public function text_date_timestamp( $value ) {
+		return is_array( $value ) ? array_map( 'strtotime', $value ) : strtotime( $value );
 	}
 
 	/**
 	 * Datetime to timestamp
 	 * @since  1.0.1
-	 * @param  string $meta Meta value
+	 * @param  string $value Meta value
 	 * @return string       Timestring
 	 */
-	public static function text_datetime_timestamp( $meta ) {
+	public function text_datetime_timestamp( $value, $repeat = false ) {
 
-		$test = is_array( $meta ) ? array_filter( $meta ) : '';
+		$test = is_array( $value ) ? array_filter( $value ) : '';
 		if ( empty( $test ) )
 			return '';
 
-		$meta = strtotime( $meta['date'] .' '. $meta['time'] );
+		if ( $repeat_value = $this->_check_repeat( $value, __FUNCTION__, $repeat ) )
+			return $repeat_value;
+
+		$value = strtotime( $value['date'] .' '. $value['time'] );
 
 		if ( $tz_offset = cmb_Meta_Box::field_timezone_offset() )
-			$meta += $tz_offset;
+			$value += $tz_offset;
 
-		return $meta;
+		return $value;
 	}
 
 	/**
 	 * Datetime to imestamp with timezone
 	 * @since  1.0.1
-	 * @param  string $meta Meta value
+	 * @param  string $value Meta value
 	 * @return string       Timestring
 	 */
-	public static function text_datetime_timestamp_timezone( $meta ) {
+	public function text_datetime_timestamp_timezone( $value, $repeat = false ) {
 
-		$test = is_array( $meta ) ? array_filter( $meta ) : '';
+		$test = is_array( $value ) ? array_filter( $value ) : '';
 		if ( empty( $test ) )
 			return '';
 
+		if ( $repeat_value = $this->_check_repeat( $value, __FUNCTION__, $repeat ) )
+			return $repeat_value;
+
 		$tzstring = null;
 
-		if ( is_array( $meta ) && array_key_exists( 'timezone', $meta ) )
-			$tzstring = $meta['timezone'];
+		if ( is_array( $value ) && array_key_exists( 'timezone', $value ) )
+			$tzstring = $value['timezone'];
 
 		if ( empty( $tzstring ) )
 			$tzstring = cmb_Meta_Box::timezone_string();
@@ -168,67 +177,69 @@ public static function text_datetime_timestamp_timezone( $meta ) {
 		if ( substr( $tzstring, 0, 3 ) === 'UTC' )
 			$tzstring = timezone_name_from_abbr( '', $offset, 0 );
 
-		$meta = new DateTime( $meta['date'] .' '. $meta['time'], new DateTimeZone( $tzstring ) );
-		$meta = serialize( $meta );
+		$value = new DateTime( $value['date'] .' '. $value['time'], new DateTimeZone( $tzstring ) );
+		$value = serialize( $value );
 
-		return $meta;
+		return $value;
 	}
 
 	/**
 	 * Sanitize textareas and wysiwyg fields
 	 * @since  1.0.1
-	 * @param  string $meta Meta value
+	 * @param  string $value Meta value
 	 * @return string       Sanitized data
 	 */
-	public static function textarea( $meta ) {
-		return wp_kses_post( $meta );
+	public function textarea( $value ) {
+		return is_array( $value ) ? array_map( 'wp_kses_post', $value ) : wp_kses_post( $value );
 	}
 
 	/**
 	 * Sanitize code textareas
 	 * @since  1.0.2
-	 * @param  string $meta Meta value
+	 * @param  string $value Meta value
 	 * @return string       Sanitized data
 	 */
-	public static function textarea_code( $meta ) {
-		return htmlspecialchars_decode( stripslashes( $meta ) );
+	public function textarea_code( $value, $repeat = false ) {
+		if ( $repeat_value = $this->_check_repeat( $value, __FUNCTION__, $repeat ) )
+			return $repeat_value;
+
+		return htmlspecialchars_decode( stripslashes( $value ) );
 	}
 
 	/**
 	 * Sanitize code textareas
 	 * @since  1.0.2
-	 * @param  string $meta  Meta value
-	 * @param  array  $field Field config array
+	 * @param  string $value  Meta value
 	 * @return string        Sanitized data
 	 */
-	public static function file( $meta, $field ) {
-		$_id_name = $field['id'] .'_id';
+	public function file( $value ) {
+		$args = $this->field->args();
+		$id = $this->field->args( 'id' );
+		$_id_name = $id .'_id';
 		// get _id old value
 		$_id_old = cmb_Meta_Box::get_data( $_id_name );
 
 		// If specified NOT to save the file ID
-		if ( isset( $field['save_id'] ) && ! $field['save_id'] ) {
+		if ( isset( $args['save_id'] ) && ! $args['save_id'] ) {
 			$_new_id = '';
 		} else {
 			// otherwise get the file ID
 			$_new_id = isset( $_POST[ $_id_name ] ) ? $_POST[ $_id_name ] : null;
 
 			// If there is no ID saved yet, try to get it from the url
-			if ( isset( $_POST[ $field['id'] ] ) && $_POST[ $field['id'] ] && ! $_new_id ) {
-				$_new_id = cmb_Meta_Box::image_id_from_url( esc_url_raw( $_POST[ $field['id'] ] ) );
+			if ( isset( $_POST[ $id ] ) && $_POST[ $id ] && ! $_new_id ) {
+				$_new_id = cmb_Meta_Box::image_id_from_url( esc_url_raw( $_POST[ $id ] ) );
 			}
 
 		}
 
 		if ( $_new_id && $_new_id != $_id_old ) {
-			$updated[] = $_id_name;
-			cmb_Meta_Box::update_data( $_new_id, $_id_name );
+			$updated = cmb_Meta_Box::update_data( $_new_id, $_id_name );
 		} elseif ( '' == $_new_id && $_id_old ) {
-			$updated[] = $_id_name;
 			cmb_Meta_Box::remove_data( $_id_name, $old );
 		}
 
-		return self::default_sanitization( $meta, $field );
+		return $this->default_sanitization( $value );
 
 	}
 
@@ -239,51 +250,69 @@ public static function file( $meta, $field ) {
 	 * @param  array  $arguments All arguments passed to the method
 	 */
 	public function __call( $name, $arguments ) {
-		list( $meta_value, $field ) = $arguments;
-		return self::default_sanitization( $meta_value, $field );
+		list( $value ) = $arguments;
+		return $this->default_sanitization( $value );
 	}
 
 	/**
 	 * Default fallback sanitization method. Applies filters.
 	 * @since  1.0.2
-	 * @param  mixed $meta_value Meta value
-	 * @param  array $field      Field config array
+	 * @param  mixed $value Meta value
 	 */
-	public static function default_sanitization( $meta_value, $field ) {
+	public function default_sanitization( $value ) {
 
 		$object_type = cmb_Meta_Box::get_object_type();
 		$object_id   = cmb_Meta_Box::get_object_id();
-
 		// Allow field type validation via filter
-		$updated     = apply_filters( 'cmb_validate_'. $field['type'], null, $meta_value, $object_id, $field, $object_type );
+		$updated     = apply_filters( 'cmb_validate_'. $this->field->args( 'type' ), null, $value, $object_id, $this->field->args(), $object_type, $this->field );
 
 		if ( null != $updated ) {
 			return $updated;
 		}
 
+		$pre = $value;
+
 		// we'll fallback to 'sanitize_text_field', or 'wp_kses_post`
-		switch ( $field['type'] ) {
+		switch ( $this->field->args( 'type' ) ) {
 			case 'wysiwyg':
-				// $cb = 'wp_kses';
+				// $value = wp_kses( $value );
 				// break;
 			case 'textarea_small':
-				$cb = array( 'cmb_Meta_Box_Sanitize', 'textarea' );
-				break;
+				return $this->textarea( $value );
+			case 'taxonomy_select':
+			case 'taxonomy_radio':
+			case 'taxonomy_multicheck':
+				if ( $this->field->args( 'taxonomy' ) ) {
+					return wp_set_object_terms( $object_id, $value, $this->field->args( 'taxonomy' ) );
+				}
+			case 'multicheck':
+			case 'file_list':
+			case 'oembed':
+				// no filtering
+				return $value;
 			default:
-				$cb = 'sanitize_text_field';
-				break;
+				// Handle repeatable fields array
+				return is_array( $value ) ? array_map( 'sanitize_text_field', $value ) : call_user_func( 'sanitize_text_field', $value );
 		}
 
-		// Handle repeatable fields array
-		if ( is_array( $meta_value ) ) {
-			foreach ( $meta_value as $key => $value ) {
-				$meta_value[ $key ] = call_user_func( $cb, $value );
-			}
-		} else {
-			$meta_value = call_user_func( $cb, $meta_value );
-		}
+	}
 
-		return $meta_value;
+	/**
+	 * If repeating, loop through and re-apply sanitization method
+	 * @since  1.0.3
+	 * @param  mixed  $value  Meta value
+	 * @param  string $method Class method
+	 * @param  bool   $repeat Whether repeating or not
+	 * @return mixed          Sanitized value
+	 */
+	public function _check_repeat( $value, $method, $repeat ) {
+		if ( $repeat || ! $this->field->args( 'repeatable' ) )
+			return;
+		$new_value = array();
+		foreach ( $value as $iterator => $val ) {
+			$new_value[] = $this->$method( $val, true );
+		}
+		return $new_value;
 	}
 
 }
diff --git a/helpers/cmb_Meta_Box_ajax.php b/helpers/cmb_Meta_Box_ajax.php
index c76a99b..0667f5e 100644
--- a/helpers/cmb_Meta_Box_ajax.php
+++ b/helpers/cmb_Meta_Box_ajax.php
@@ -19,7 +19,7 @@ class cmb_Meta_Box_ajax {
 	/**
 	 * Creates or returns an instance of this class.
 	 * @since  0.1.0
-	 * @return cmb_Meta_Box_types A single instance of this class.
+	 * @return cmb_Meta_Box_ajax A single instance of this class.
 	 */
 	public static function get() {
 		if ( self::$instance === null )
@@ -128,7 +128,7 @@ public static function get_oembed( $url, $object_id, $args = array() ) {
 
 		// Send back our embed
 		if ( $check_embed && $check_embed != $fallback )
-			return '<div class="embed_status">'. $check_embed .'<p><a href="#" class="cmb_remove_file_button" rel="'. $args['field_id'] .'">'. __( 'Remove Embed', 'cmb' ) .'</a></p></div>';
+			return '<div class="embed_status">'. $check_embed .'<p class="cmb_remove_wrapper"><a href="#" class="cmb_remove_file_button" rel="'. $args['field_id'] .'">'. __( 'Remove Embed', 'cmb' ) .'</a></p></div>';
 
 		// Otherwise, send back error info that no oEmbeds were found
 		return '<p class="ui-state-error-text">'. sprintf( __( 'No oEmbed Results Found for %s. View more info at', 'cmb' ), $fallback ) .' <a href="http://codex.wordpress.org/Embeds" target="_blank">codex.wordpress.org/Embeds</a>.</p>';
diff --git a/helpers/cmb_Meta_Box_field.php b/helpers/cmb_Meta_Box_field.php
new file mode 100644
index 0000000..4661fea
--- /dev/null
+++ b/helpers/cmb_Meta_Box_field.php
@@ -0,0 +1,215 @@
+<?php
+
+/**
+ * CMB field class
+ * @since  1.0.3
+ */
+class cmb_Meta_Box_field {
+
+	/**
+	 * Metabox object id
+	 * @var   mixed
+	 * @since 1.0.0
+	 */
+	public $object_id;
+
+	/**
+	 * Metabox object type
+	 * @var   mixed
+	 * @since 1.0.0
+	 */
+	public $object_type;
+
+	/**
+	 * Field arguments
+	 * @var   mixed
+	 * @since 1.0.0
+	 */
+	public $args;
+
+	/**
+	 * Field meta value
+	 * @var   mixed
+	 * @since 1.0.0
+	 */
+	public $meta;
+
+	/**
+	 * An iterator value for repeatable fields
+	 * @var   integer
+	 * @since 1.0.0
+	 */
+	public $iterator = 0;
+
+
+	public function __construct( $field_args, $object_id, $object_type ) {
+		$this->object_id   = $object_id;
+		$this->object_type = $object_type;
+		$this->args        = $this->set_field_defaults( $field_args );
+
+		// Allow an override for the field's value
+		// (assuming no one would want to save 'cmb_no_override_val' as a value)
+		$this->value = apply_filters( 'cmb_override_meta_value', 'cmb_no_override_val', $object_id, $this->args(), $object_type, $this );
+
+		// If no override, get our meta
+		$this->value = 'cmb_no_override_val' === $this->value
+			? $this->get_data()
+			: $this->value;
+	}
+
+	public function args( $key = '' ) {
+		return $this->_data( 'args', $key );
+	}
+
+	public function value( $key = '' ) {
+		return $this->_data( 'value', $key );
+	}
+
+	public function _data( $var, $key = '' ) {
+		$vars = $this->$var;
+		if ( $key ) {
+			return isset( $vars[ $key ] ) ? $vars[ $key ] : false;
+		}
+		return $vars;
+	}
+
+	/**
+	 * Retrieves metadata/option data
+	 * @since  1.0.1
+	 * @param  string  $field_id Meta key/Option array key
+	 * @return mixed             Meta/Option value
+	 */
+	public function get_data() {
+
+		$type     = $this->object_type;
+		$id       = $this->object_id;
+		$field_id = $this->args( 'id' );
+		$single   = ! $this->args( 'multiple' );
+		$repeat   = $this->args( 'repeatable' );
+
+		$data = 'options-page' === $type
+			? cmb_Meta_Box::get_option( $id, $field_id )
+			: get_metadata( $type, $id, $field_id, ( $single || $repeat ) /* If multicheck this can be multiple values */ );
+
+		return $data;
+	}
+
+	public function escaping_exception() {
+		// These types cannot be escaped
+		return in_array( $this->args( 'type' ), array(
+			'file_list',
+			'multicheck',
+			'text_datetime_timestamp_timezone',
+		) );
+	}
+
+	public function repeatable_exception( $type ) {
+		// These types cannot be escaped
+		return in_array( $type, array(
+			'title',
+			'file', // Use file_list
+			'radio',
+			// @todo Ajax load wp_editor: http://wordpress.stackexchange.com/questions/51776/how-to-load-wp-editor-through-ajax-jquery
+			'wysiwyg',
+			'checkbox',
+			'radio_inline',
+			'taxonomy_radio',
+			'taxonomy_select',
+			'taxonomy_multicheck',
+		) );
+	}
+
+	/**
+	 * Escape the value before output. Defaults to 'esc_attr()'
+	 * @since  1.0.1
+	 * @param  mixed  $meta_value Meta value
+	 * @param  mixed  $func       Escaping function (if not esc_attr())
+	 * @return mixed              Final value
+	 */
+	public function escaped_value( $func = 'esc_attr', $meta_value = '' ) {
+
+		if ( isset( $this->escaped_value ) )
+			return $this->escaped_value;
+
+		$meta_value = $meta_value ? $meta_value : $this->value();
+		// Check if the field has a registered escaping callback
+		$cb = cmb_Meta_Box::maybe_callback( $this->args(), 'escape_cb' );
+		if ( false === $cb || $this->escaping_exception() ) {
+			// If requesting NO escaping, return meta value
+			return $meta_value;
+		} elseif ( $cb ) {
+			// Ok, callback is good, let's run it.
+			return call_user_func( $cb, $meta_value, $this->args(), $this );
+		}
+
+		// Or custom escaping filter can be used
+		$esc = apply_filters( 'cmb_types_esc_'. $this->args( 'type' ), null, $meta_value, $this->args(), $this );
+		if ( null !== $esc ) {
+			return $esc;
+		}
+
+		// escaping function passed in?
+		$func       = $func ? $func : 'esc_attr';
+		$meta_value = ! empty( $meta_value ) ? $meta_value : $this->args( 'default' );
+
+		if ( is_array( $meta_value ) ) {
+			foreach ( $meta_value as $key => $value ) {
+				$meta_value[ $key ] = call_user_func( $func, $value );
+			}
+		} else {
+			$meta_value = call_user_func( $func, $meta_value );
+		}
+
+		$this->escaped_value = $meta_value;
+		return $this->escaped_value;
+	}
+
+	/**
+	 * Fills in empty field parameters with defaults
+	 * @since  1.0.3
+	 * @param  array $field Metabox field config array
+	 */
+	public function set_field_defaults( $args ) {
+
+		// Set up blank or default values for empty ones
+		if ( ! isset( $args['name'] ) ) $args['name'] = '';
+		if ( ! isset( $args['desc'] ) ) $args['desc'] = '';
+		if ( ! isset( $args['before'] ) ) $args['before'] = '';
+		if ( ! isset( $args['after'] ) ) $args['after'] = '';
+		if ( ! isset( $args['protocols'] ) ) $args['protocols'] = null;
+		if ( ! isset( $args['default'] ) ) {
+			// Phase out 'std', and use 'default' instead
+			$args['default'] = isset( $args['std'] ) ? $args['std'] : '';
+		}
+		if ( ! isset( $args['preview_size'] ) ) $args['preview_size'] = array( 50, 50 );
+		// Allow a filter override of the default value
+		$args['default']    = apply_filters( 'cmb_default_filter', $args['default'], $args, $this->object_type, $this->object_type );
+		// 'cmb_std_filter' deprectated, use 'cmb_default_filter' instead
+		$args['default']    = apply_filters( 'cmb_std_filter', $args['default'], $args, $this->object_type, $this->object_type );
+		$args['allow']      = 'file' == $args['type'] && ! isset( $args['allow'] ) ? array( 'url', 'attachment' ) : array();
+		$args['save_id']    = 'file' == $args['type'] && ! isset( $args['save_id'] );
+		$args['multiple']   = isset( $args['multiple'] ) ? $args['multiple'] : ( 'multicheck' == $args['type'] ? true : false );
+		$args['repeatable'] = isset( $args['repeatable'] ) && $args['repeatable'] && ! $this->repeatable_exception( $args['type'] );
+		$args['inline']     = isset( $args['inline'] ) && $args['inline'] || false !== stripos( $args['type'], '_inline' );
+		$args['on_front']   = ! ( isset( $args['on_front'] ) && ! $args['on_front'] );
+		$args['attributes'] = isset( $args['attributes'] ) && is_array( $args['attributes'] ) ? $args['attributes'] : array();
+		$args['options']    = isset( $args['options'] ) && is_array( $args['options'] ) ? $args['options'] : array();
+
+		if ( 'wysiwyg' == $args['type'] ) {
+			$args['id'] = strtolower( str_ireplace( array( '-', '_' ), '', $args['id'] ) ) . 'wpeditor';
+		}
+
+
+		return $args;
+	}
+
+	/**
+	 * Updates attributes array values unless they exist from the field config array
+	 * @since  1.0.3
+	 * @param  array  $attrs Array of attributes to update
+	 */
+	public function maybe_set_attributes( $attrs = array() ) {
+		return wp_parse_args( $attrs, $this->args['attributes'] );
+	}
+
+}
diff --git a/init.php b/init.php
index d11ed30..7bbaa58 100644
--- a/init.php
+++ b/init.php
@@ -71,6 +71,7 @@ class cmb_Meta_Box {
 	protected static $mb_defaults = array(
 		'id'         => '',
 		'title'      => '',
+		'type'       => '',
 		'pages'      => array(), // Post type
 		'context'    => 'normal',
 		'priority'   => 'high',
@@ -227,7 +228,7 @@ public function register_scripts() {
 		$min = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
 		// scripts required for cmb
-		$scripts = array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', /*'media-upload', */'cmb-timepicker' );
+		$scripts = array( 'jquery', 'jquery-ui-core', 'cmb-datepicker', /*'media-upload', */'cmb-timepicker' );
 		// styles required for cmb
 		$styles = array();
 
@@ -251,6 +252,7 @@ public function register_scripts() {
 			$scripts[] = 'farbtastic';
 			$styles[] = 'farbtastic';
 		}
+		wp_register_script( 'cmb-datepicker', CMB_META_BOX_URL . 'js/jquery.datePicker.min.js' );
 		wp_register_script( 'cmb-timepicker', CMB_META_BOX_URL . 'js/jquery.timePicker.min.js' );
 		wp_register_script( 'cmb-scripts', CMB_META_BOX_URL .'js/cmb'. $min .'.js', $scripts, self::CMB_VERSION );
 
@@ -364,56 +366,49 @@ public static function show_form( $meta_box, $object_id = 0, $object_type = '' )
 		// Set/get ID
 		$object_id = self::set_object_id( $object_id ? $object_id : self::get_object_id() );
 
-		// get box types
-		$types = cmb_Meta_Box_types::get();
-
 		// Use nonce for verification
 		echo "\n<!-- Begin CMB Fields -->\n";
 		wp_nonce_field( self::nonce(), 'wp_meta_box_nonce', false, true );
 		do_action( 'cmb_before_table', $meta_box, $object_id, $object_type );
 		echo '<table class="form-table cmb_metabox">';
 
-		foreach ( $meta_box['fields'] as $field ) {
-
-			if ( isset( $field['on_front'] ) && $field['on_front'] == false )
-				continue;
+		foreach ( $meta_box['fields'] as $field_args ) {
 
-			$field = self::set_field_defaults( $field );
+			$field = new cmb_Meta_Box_field( $field_args, $object_id, $object_type );
 
-			// Allow an override for the field's value
-			// (assuming no one would want to save 'cmb_no_override_val' as a value)
-			$meta = apply_filters( 'cmb_override_meta_value', 'cmb_no_override_val', $object_id, $field, $object_type );
+			self::$field =& $field;
 
-			// If no override, get our meta
-			if ( $meta === 'cmb_no_override_val' )
-				$meta = self::get_data();
+			if ( ! $field->args( 'on_front' ) )
+				continue;
 
+			$type    = $field->args( 'type' );
 			$classes = '';
-			$classes .= $field['repeatable'] ? ' cmb-repeat' : '';
+			$classes .= $field->args( 'repeatable' ) ? ' cmb-repeat' : '';
 			// 'inline' flag, or _inline in the field type, set to true
-			$classes .= $field['inline'] ? ' cmb-inline' : '';
+			$classes .= $field->args( 'inline' ) ? ' cmb-inline' : '';
 
-			echo '<tr class="cmb-type-'. sanitize_html_class( $field['type'] ) .' cmb_id_'. sanitize_html_class( $field['id'] ) . $classes .'">';
+			echo '<tr class="cmb-type-'. sanitize_html_class( $type ) .' cmb_id_'. sanitize_html_class( $field->args( 'id' ) ) . $classes .'">';
 
-			if ( $field['type'] == "title" ) {
+			if ( $type == "title" ) {
 				echo '<td colspan="2">'."\n";
 			} else {
-				if ( isset( $meta_box['show_names'] ) && $meta_box['show_names'] == true ) {
+				if ( isset( $meta_box['show_names'] ) && $meta_box['show_names'] ) {
 					$style = $object_type == 'post' ? ' style="width:18%"' : '';
-					echo '<th'. $style .'><label for="', $field['id'], '">', $field['name'], '</label></th>';
+					echo '<th'. $style .'><label for="', $field->args( 'id' ), '">', $field->args( 'name' ), '</label></th>';
 				} else {
-					echo '<label style="display:none;" for="', $field['id'], '">', $field['name'], '</label></th>';
+					echo '<label style="display:none;" for="', $field->args( 'id' ), '">', $field->args( 'name' ), '</label></th>';
 				}
 				echo "<td>\n";
 			}
 
-			echo $field['before'];
+			echo $field->args( 'before' );
 
-			call_user_func( array( $types, $field['type'] ), $field, $meta, $object_id, $object_type );
+			$field_type = new cmb_Meta_Box_types( $field );
+			$field_type->render();
 
-			echo $field['after'];
+			echo $field->args( 'after' );
 
-			echo "\n<</td>\n</tr>";
+			echo "\n</td>\n</tr>";
 		}
 		echo '</table>';
 		do_action( 'cmb_after_table', $meta_box, $object_id, $object_type );
@@ -485,37 +480,25 @@ public static function save_fields( $meta_box, $object_id, $object_type = '' ) {
 		// save field ids of those that are updated
 		$updated = array();
 
-		foreach ( $meta_box['fields'] as $field ) {
+		foreach ( $meta_box['fields'] as $field_args ) {
 
-			self::$field =& $field;
-			$name = $field['id'];
+			$field = new cmb_Meta_Box_field( $field_args, $object_id, $object_type );
 
-			if ( ! isset( $field['multiple'] ) )
-				$field['multiple'] = ( 'multicheck' == $field['type'] ) ? true : false;
+			self::$field =& $field;
+			$name = $field->args( 'id' );
 
 			$old = self::get_data();
-			$new = isset( $_POST[ $field['id'] ] ) ? $_POST[ $field['id'] ] : null;
-
-
-			if ( $object_type == 'post' ) {
-
-				if (
-					isset( $field['taxonomy'] )
-					&& in_array( $field['type'], array( 'taxonomy_select', 'taxonomy_radio', 'taxonomy_multicheck' ) )
-				)
-					$new = wp_set_object_terms( $object_id, $new, $field['taxonomy'] );
-
-			}
+			$new = isset( $_POST[ $name ] ) ? $_POST[ $name ] : null;
 
-			if ( isset( $field['repeatable'] ) && $field['repeatable'] && is_array( $new ) ) {
+			if ( $field->args( 'repeatable' ) && is_array( $new ) ) {
+				// Remove empties
 				$new = array_filter( $new );
 			}
 
 			// Check if this metabox field has a registered validation callback, or perform default sanitization
 			$new = self::sanitization_cb( $new );
 
-			if ( $field['multiple'] ) {
-
+			if ( $field->args( 'multiple' ) && ! $field->args( 'repeatable' ) ) {
 				self::remove_data( $name );
 				if ( ! empty( $new ) ) {
 					foreach ( $new as $add_new ) {
@@ -576,8 +559,7 @@ public static function timezone_string() {
 	 * @return string           Offset time string
 	 */
 	public static function timezone_offset( $tzstring ) {
-		if ( !empty( $tzstring ) ) {
-
+		if ( ! empty( $tzstring ) && is_string( $tzstring ) ) {
 			if ( substr( $tzstring, 0, 3 ) === 'UTC' ) {
 				$tzstring = str_replace( array( ':15',':30',':45' ), array( '.25','.5','.75' ), $tzstring );
 				return intval( floatval( substr( $tzstring, 3 ) ) * HOUR_IN_SECONDS );
@@ -616,12 +598,10 @@ public static function field_timezone( $object_id = 0 ) {
 		if ( ! ( $object_id = self::get_object_id( $object_id ) ) )
 			return $tzstring;
 
-		if ( array_key_exists( 'timezone', self::$field ) && self::$field['timezone'] ) {
-			$tzstring = self::$field['timezone'];
-		} else if ( array_key_exists( 'timezone_meta_key', self::$field ) && self::$field['timezone_meta_key'] ) {
-			$tzstring = self::get_data( self::$field['timezone_meta_key'] );
-
-			return $tzstring;
+		if ( self::$field->args( 'timezone' ) ) {
+			return self::$field->args( 'timezone' );
+		} else if ( self::$field->args( 'timezone_meta_key' ) ) {
+			return self::$field->args( 'timezone_meta_key' );
 		}
 
 		return false;
@@ -808,55 +788,50 @@ public static function image_id_from_url( $img_url ) {
 	 * Checks if field has a registered validation callback
 	 * @since  1.0.1
 	 * @param  mixed $meta_value Meta value
-	 * @param  array $field      Field config array
+	 * @param  null  $field      Field object
 	 * @return mixed             Possibly validated meta value
 	 */
-	public static function sanitization_cb( $meta_value, $field = array() ) {
+	public static function sanitization_cb( $meta_value, $field = null ) {
 		if ( empty( $meta_value ) )
 			return $meta_value;
 
-		$field = $field !== array() ? $field : self::$field;
+		$field = $field !== null ? $field : self::$field;
 
 		// Check if the field has a registered validation callback
-		$cb = self::maybe_callback( $field, 'sanitization_cb' );
+		$cb = self::maybe_callback( $field->args(), 'sanitization_cb' );
 		if ( false === $cb ) {
 			// If requestion NO validation, return meta value
 			return $meta_value;
 		} elseif ( $cb ) {
 			// Ok, callback is good, let's run it.
-			return call_user_func( $cb, $meta_value, $field );
+			return call_user_func( $cb, $meta_value, $field->args() );
 		}
 
+		$clean = new cmb_Meta_Box_Sanitize( $field, $meta_value );
 		// Validation via 'cmb_Meta_Box_Sanitize' (with fallback filter)
-		return call_user_func( array( cmb_Meta_Box_Sanitize::get(), $field['type'] ), $meta_value, $field );
+		return $clean->{$field->args( 'type' )}( $meta_value );
 	}
 
 	/**
 	 * Checks if field has a callback value
 	 * @since  1.0.1
-	 * @param  array   $field Field config array
+	 * @param  array  $field Field config array
 	 * @param  string  $cb    Callback string
 	 * @return mixed          NULL, false for NO validation, or $cb string if it exists.
 	 */
-	public static function maybe_callback( $field, $cb ) {
-		if ( ! isset( $field[ $cb ] ) )
+	public static function maybe_callback( $field_args, $cb ) {
+		if ( ! isset( $field_args[ $cb ] ) )
 			return;
 
 		// Check if metabox is requesting NO validation
-		$cb = false !== $field[ $cb ] && 'false' !== $field[ $cb ] ? $field[ $cb ] : false;
+		$cb = false !== $field_args[ $cb ] && 'false' !== $field_args[ $cb ] ? $field_args[ $cb ] : false;
 
 		// If requestion NO validation, return false
 		if ( ! $cb )
 			return false;
 
-		if (
-			// Standard function
-			( is_string( $cb ) && function_exists( $cb ) )
-			// Or Class method
-			|| ( is_array( $cb ) && is_callable( $cb ) )
-		) {
+		if ( is_callable( $cb ) )
 			return $cb;
-		}
 
 	}
 
@@ -886,35 +861,6 @@ public static function get_meta_box_url() {
 		return trailingslashit( apply_filters('cmb_meta_box_url', $cmb_url ) );
 	}
 
-	/**
-	 * Fills in empty field parameters with defaults
-	 * @since  1.0.3
-	 * @param  array $field Metabox field config array
-	 */
-	public static function set_field_defaults( $field ) {
-		self::$field =& $field;
-
-		// Set up blank or default values for empty ones
-		if ( ! isset( $field['name'] ) ) $field['name'] = '';
-		if ( ! isset( $field['desc'] ) ) $field['desc'] = '';
-		if ( ! isset( $field['before'] ) ) $field['before'] = '';
-		if ( ! isset( $field['after'] ) ) $field['after'] = '';
-		if ( ! isset( $field['default'] ) ) {
-			// Phase out 'std', and use 'default' instead
-			$field['default'] = isset( $field['std'] ) ? $field['std'] : '';
-		}
-		if ( ! isset( $field['preview_size'] ) ) $field['preview_size'] = array( 50, 50 );
-		// Allow a filter override of the default value
-		$field['default']    = apply_filters( 'cmb_default_filter', $field['default'], $field, $object_id, $object_type );
-		// 'cmb_std_filter' deprectated, use 'cmb_default_filter' instead
-		$field['default']    = apply_filters( 'cmb_std_filter', $field['default'], $field, $object_id, $object_type );
-		$field['allow']      = 'file' == $field['type'] && ! isset( $field['allow'] ) ? array( 'url', 'attachment' ) : array();
-		$field['save_id']    = 'file' == $field['type'] && ! isset( $field['save_id'] );
-		$field['multiple']   = 'multicheck' == $field['type'];
-		$field['repeatable'] = isset( $field['repeatable'] ) && $field['repeatable'];
-		$field['inline']     = isset( $field['inline'] ) && $field['inline'] || false !== stripos( $field['type'], '_inline' );
-	}
-
 	/**
 	 * Fills in empty metabox parameters with defaults
 	 * @since  1.0.1
@@ -935,11 +881,13 @@ public static function get_data( $field_id = '' ) {
 
 		$type     = self::get_object_type();
 		$id       = self::get_object_id();
-		$field_id = $field_id ? $field_id : self::$field['id'];
+		$field_id = $field_id ? $field_id : self::$field->args( 'id' );
+		$single   = ! self::$field->args( 'multiple' );
+		$repeat   = self::$field->args( 'repeatable' );
 
 		$data = 'options-page' === $type
 			? self::get_option( $id, $field_id )
-			: get_metadata( $type, $id, $field_id, !self::$field['multiple'] /* If multicheck this can be multiple values */ );
+			: get_metadata( $type, $id, $field_id, ( $single || $repeat ) /* If multicheck this can be multiple values */ );
 
 		return $data;
 	}
@@ -954,17 +902,19 @@ public static function get_data( $field_id = '' ) {
 	 */
 	public static function update_data( $value, $field_id = '', $multiple = false ) {
 
+		$repeat   = self::$field->args( 'repeatable' );
 		$type     = self::get_object_type();
 		$id       = self::get_object_id();
-		$field_id = $field_id ? $field_id : self::$field['id'];
+		$field_id = $field_id ? $field_id : self::$field->args( 'id' );
+		$value    = $repeat ? array_values( $value ) : $value;
 
 		if ( 'options-page' === $type ) {
-			self::update_option( $id, $field_id, $value );
+			return self::update_option( $id, $field_id, $value );
 		} else {
 			if ( $multiple ) {
-				add_metadata( $type, $id, $field_id, $value, false );
+				return add_metadata( $type, $id, $field_id, $value, false );
 			} else {
-				update_metadata( $type, $id, $field_id, $value );
+				return update_metadata( $type, $id, $field_id, $value );
 			}
 		}
 	}
@@ -979,7 +929,7 @@ public static function remove_data( $field_id = '', $old = '' ) {
 
 		$type     = self::get_object_type();
 		$id       = self::get_object_id();
-		$field_id = $field_id ? $field_id : self::$field['id'];
+		$field_id = $field_id ? $field_id : self::$field->args( 'id' );
 
 		$data = 'options-page' === $type
 			? self::remove_option( $id, $field_id )
@@ -1028,14 +978,14 @@ public static function get_option( $option_key, $field_id = '' ) {
 	 * @param  string  $option_key Option key
 	 * @param  string  $field_id   Option array field key
 	 * @param  mixed   $value      Value to update data with
-	 * @param  array   $field      Optionally specify a field array
+	 * @param  object  $field      Optionally specify a field object
 	 * @return array               Modified options
 	 */
-	public static function update_option( $option_key, $field_id, $value, $field = array() ) {
+	public static function update_option( $option_key, $field_id, $value, $field = null ) {
 
-		$field = $field !== array() ? $field : self::$field;
+		$field = $field !== null ? $field : self::$field;
 
-		if ( isset( $field['multiple'] ) && $field['multiple'] ) {
+		if ( $field->args( 'multiple' ) ) {
 			// If multiple, add to array
 			self::$options[ $option_key ][ $field_id ][] = $value;
 		} else {
diff --git a/js/cmb.js b/js/cmb.js
index aab72da..71bc7ae 100644
--- a/js/cmb.js
+++ b/js/cmb.js
@@ -14,354 +14,469 @@
 /**
  * Custom jQuery for Custom Metaboxes and Fields
  */
-(function(window, document, $, undefined){
+window.CMB = (function(window, document, $, undefined){
 	'use strict';
 
-	// Move CMB functionality to an object
-	window.CMB = {
+	// localization strings
+	var l10n = window.cmb_l10;
+
+	// CMB functionality object
+	var cmb = {
 		formfield : '',
-		iterator: 0,
+		idNumber  : false,
 		file_frames: {},
+	}
 
-		init: function() {
-			CMB.log( window.cmb_l10 );
+	cmb.metabox = function() {
+		if ( cmb.$metabox ) {
+			return cmb.$metabox;
+		}
+		cmb.$metabox = $('table.cmb_metabox');
+		return cmb.$metabox;
+	}
 
-			// hide our spinner gif if we're on a MP6 dashboard
-			if ( window.cmb_l10.new_admin_style ) {
-				$('.cmb-spinner img').hide();
-			}
+	cmb.init = function() {
+		cmb.log( l10n );
 
-			/**
-			 * Initialize timepicker (this will be moved inline in a future release)
-			 */
-			$('.cmb_timepicker').each( function() {
-				$('#' + jQuery(this).attr('id')).timePicker({
-					startTime: "07:00",
-					endTime: "22:00",
-					show24Hours: false,
-					separator: ':',
-					step: 30
-				});
-			});
+		var $metabox = cmb.metabox();
 
-			/**
-			 * Initialize jQuery UI datepicker (this will be moved inline in a future release)
-			 */
-			$('.cmb_datepicker').each( function() {
-				$('#' + jQuery(this).attr('id')).datepicker();
-				// $('#' + jQuery(this).attr('id')).datepicker({ dateFormat: 'yy-mm-dd' });
-				// For more options see http://jqueryui.com/demos/datepicker/#option-dateFormat
-			});
-			// Wrap date picker in class to narrow the scope of jQuery UI CSS and prevent conflicts
-			$("#ui-datepicker-div").wrap('<div class="cmb_element" />');
-
-			/**
-			 * Initialize color picker
-			 */
-			if (typeof jQuery.wp === 'object' && typeof jQuery.wp.wpColorPicker === 'function') {
-				$('input:text.cmb_colorpicker').wpColorPicker();
-			} else {
-				$('input:text.cmb_colorpicker').each( function(i) {
-					$(this).after('<div id="picker-' + i + '" style="z-index: 1000; background: #EEE; border: 1px solid #CCC; position: absolute; display: block;"></div>');
-					$('#picker-' + i).hide().farbtastic($(this));
-				})
-				.focus( function() {
-					$(this).next().show();
-				})
-				.blur( function() {
-					$(this).next().hide();
-				});
-			}
+		// hide our spinner gif if we're on a MP6 dashboard
+		if ( l10n.new_admin_style ) {
+			$metabox.find('.cmb-spinner img').hide();
+		}
 
+		/**
+		 * Initialize time/date/color pickers
+		 */
+		cmb.initPickers( $metabox.find('input:text.cmb_timepicker'), $metabox.find('input:text.cmb_datepicker'), $metabox.find('input:text.cmb_colorpicker') );
 
-			/**
-			 * File and image upload handling
-			 */
+		// Wrap date picker in class to narrow the scope of jQuery UI CSS and prevent conflicts
+		$("#ui-datepicker-div").wrap('<div class="cmb_element" />');
 
 
-			$('.cmb_metabox')
+		$('.cmb_metabox')
 			.on( 'change', '.cmb_upload_file', function() {
-				CMB.formfield = $(this).attr('name');
-				$('#' + CMB.formfield + '_id').val("");
+				cmb.formfield = $(this).attr('id');
+				$('#' + cmb.formfield + '_id').val('');
 			})
-			.on( 'click', '.cmb_upload_button', function(event) {
-
-				event.preventDefault();
+			// Media/file management
+			.on( 'click', '.cmb_upload_button', cmb.handleMedia )
+			.on( 'click', '.cmb_remove_file_button', cmb.handleRemoveMedia )
+			// Repeatable content
+			.on( 'click', '.add-row-button', cmb.addAjaxRow )
+			.on( 'click', '.remove-row-button', cmb.removeAjaxRow )
+			// Ajax oEmbed display
+			.on( 'keyup paste focusout', '.cmb_oembed', cmb.maybeOembed );
+
+		// on pageload
+		setTimeout( cmb.resizeoEmbeds, 500);
+		// and on window resize
+		$(window).on( 'resize', cmb.resizeoEmbeds );
+
+	}
+
+	cmb.handleMedia = function(event) {
+
+		event.preventDefault();
+
+		var $metabox     = cmb.metabox();
+		var $self        = $(this);
+		cmb.formfield    = $self.prev('input').attr('id');
+		var $formfield   = $('#'+cmb.formfield);
+		var formName     = $formfield.attr('name');
+		var uploadStatus = true;
+		var attachment   = true;
+		var isList       = $self.hasClass( 'cmb_upload_list' );
+
+		// If this field's media frame already exists, reopen it.
+		if ( cmb.formfield in cmb.file_frames ) {
+			cmb.file_frames[cmb.formfield].open();
+			return;
+		}
 
-				var $self = $(this);
-				CMB.formfield = $self.prev('input').attr('name');
-				var $formfield = $('#'+CMB.formfield);
-				var uploadStatus = true;
-				var attachment = true;
-				var isList = $self.hasClass( 'cmb_upload_list' );
+		// Create the media frame.
+		cmb.file_frames[cmb.formfield] = wp.media.frames.file_frame = wp.media({
+			title: $metabox.find('label[for=' + cmb.formfield + ']').text(),
+			button: {
+				text: l10n.upload_file
+			},
+			multiple: isList ? true : false
+		});
+
+		var handlers = {
+			list : function( selection ) {
+				// Get all of our selected files
+				attachment = selection.toJSON();
+
+				$formfield.val(attachment.url);
+				$('#'+ cmb.formfield +'_id').val(attachment.id);
+
+				// Setup our fileGroup array
+				var fileGroup = [];
+
+				// Loop through each attachment
+				$( attachment ).each( function() {
+					if ( this.type && this.type === 'image' ) {
+						// image preview
+						uploadStatus = '<li class="img_status">'+
+							'<img width="50" height="50" src="' + this.url + '" class="attachment-50x50" alt="'+ this.filename +'">'+
+							'<p><a href="#" class="cmb_remove_file_button" rel="'+ cmb.formfield +'['+ this.id +']">'+ l10n.remove_image +'</a></p>'+
+							'<input type="hidden" id="filelist-'+ this.id +'" name="'+ formName +'['+ this.id +']" value="' + this.url + '">'+
+						'</li>';
 
+					} else {
+						// Standard generic output if it's not an image.
+						uploadStatus = '<li>'+ l10n.file +' <strong>'+ this.filename +'</strong>&nbsp;&nbsp;&nbsp; (<a href="' + this.url + '" target="_blank" rel="external">'+ l10n.download +'</a> / <a href="#" class="cmb_remove_file_button" rel="'+ cmb.formfield +'['+ this.id +']">'+ l10n.remove_file +'</a>)'+
+							'<input type="hidden" id="filelist-'+ this.id +'" name="'+ formName +'['+ this.id +']" value="' + this.url + '">'+
+						'</li>';
 
-				// If this field's media frame already exists, reopen it.
-				if ( CMB.formfield in CMB.file_frames ) {
-					CMB.file_frames[CMB.formfield].open();
-					return;
-				}
+					}
 
-				// Create the media frame.
-				CMB.file_frames[CMB.formfield] = wp.media.frames.file_frame = wp.media({
-					title: $('label[for=' + CMB.formfield + ']').text(),
-					button: {
-						text: window.cmb_l10.upload_file
-					},
-					multiple: isList ? true : false
+					// Add our file to our fileGroup array
+					fileGroup.push( uploadStatus );
 				});
 
-				// When an file is selected, run a callback.
-				CMB.file_frames[CMB.formfield].on( 'select', function() {
-
-
-					if ( isList ) {
-
-						// Get all of our selected files
-						attachment = CMB.file_frames[CMB.formfield].state().get('selection').toJSON();
-
-						$formfield.val(attachment.url);
-						$('#'+ CMB.formfield +'_id').val(attachment.id);
-
-						// Setup our fileGroup array
-						var fileGroup = [];
-
-						// Loop through each attachment
-						$( attachment ).each( function() {
-							if ( this.type && this.type === 'image' ) {
-								// image preview
-								uploadStatus = '<li class="img_status">'+
-									'<img width="50" height="50" src="' + this.url + '" class="attachment-50x50" alt="'+ this.filename +'">'+
-									'<p><a href="#" class="cmb_remove_file_button" rel="'+ CMB.formfield +'['+ this.id +']">'+ cmb_l10.remove_image +'</a></p>'+
-									'<input type="hidden" id="filelist-'+ this.id +'" name="'+ CMB.formfield +'['+ this.id +']" value="' + this.url + '">'+
-								'</li>';
-
-							} else {
-								// Standard generic output if it's not an image.
-								uploadStatus = '<li>'+ cmb_l10.file +' <strong>'+ this.filename +'</strong>&nbsp;&nbsp;&nbsp; (<a href="' + this.url + '" target="_blank" rel="external">'+ cmb_l10.download +'</a> / <a href="#" class="cmb_remove_file_button" rel="'+ CMB.formfield +'['+ this.id +']">'+ cmb_l10.remove_file +'</a>)'+
-									'<input type="hidden" id="filelist-'+ this.id +'" name="'+ CMB.formfield +'['+ this.id +']" value="' + this.url + '">'+
-								'</li>';
-
-							}
-
-							// Add our file to our fileGroup array
-							fileGroup.push( uploadStatus );
-						});
+				// Append each item from our fileGroup array to .cmb_media_status
+				$( fileGroup ).each( function() {
+					$formfield.siblings('.cmb_media_status').slideDown().append(this);
+				});
+			},
+			single : function( selection ) {
+				// Only get one file from the uploader
+				attachment = selection.first().toJSON();
 
-						// Append each item from our fileGroup array to .cmb_media_status
-						$( fileGroup ).each( function() {
-							$formfield.siblings('.cmb_media_status').slideDown().append(this);
-						});
+				$formfield.val(attachment.url);
+				$('#'+ cmb.formfield +'_id').val(attachment.id);
 
-					} else {
+				if ( attachment.type && attachment.type === 'image' ) {
+					// image preview
+					uploadStatus = '<div class="img_status"><img style="max-width: 350px; width: 100%; height: auto;" src="' + attachment.url + '" alt="'+ attachment.filename +'" title="'+ attachment.filename +'" /><p><a href="#" class="cmb_remove_file_button" rel="' + cmb.formfield + '">'+ l10n.remove_image +'</a></p></div>';
+				} else {
+					// Standard generic output if it's not an image.
+					uploadStatus = l10n.file +' <strong>'+ attachment.filename +'</strong>&nbsp;&nbsp;&nbsp; (<a href="'+ attachment.url +'" target="_blank" rel="external">'+ l10n.download +'</a> / <a href="#" class="cmb_remove_file_button" rel="'+ cmb.formfield +'">'+ l10n.remove_file +'</a>)';
+				}
 
-						// Only get one file from the uploader
-						attachment = CMB.file_frames[CMB.formfield].state().get('selection').first().toJSON();
+				// add/display our output
+				$formfield.siblings('.cmb_media_status').slideDown().html(uploadStatus);
+			}
+		}
 
-						$formfield.val(attachment.url);
-						$('#'+ CMB.formfield +'_id').val(attachment.id);
+		// When an file is selected, run a callback.
+		cmb.file_frames[cmb.formfield].on( 'select', function() {
+			var selection = cmb.file_frames[cmb.formfield].state().get('selection');
+			var type = isList ? 'list' : 'single';
+			handlers[type]( selection );
+		});
+
+		// Finally, open the modal
+		cmb.file_frames[cmb.formfield].open();
+	}
+
+	cmb.handleRemoveMedia = function( event ) {
+		var $self = $(this);
+		if ( $self.is( '.attach_list .cmb_remove_file_button' ) ){
+			$self.parents('li').remove();
+			return false;
+		}
+		cmb.formfield    = $self.attr('rel');
+		var $container   = $self.parents('.img_status');
+
+		$metabox.find('input#' + cmb.formfield).val('');
+		$metabox.find('input#' + cmb.formfield + '_id').val('');
+		if ( ! $container.length ) {
+			$self.parents('.cmb_media_status').html('');
+		} else {
+			$container.html('');
+		}
+		return false;
+	}
+
+	cmb.addAjaxRow = function( event ) {
+
+		event.preventDefault();
+
+		var $self         = $(this);
+		var tableselector = '#'+ $self.data('selector');
+		var inputselector = tableselector.slice(1,tableselector.lastIndexOf('repeat'));
+		var $table        = $(tableselector).data('numberels', cmb.idNumber );
+		var $emptyrow     = $table.find('.empty-row');
+		cmb.idNumber      = parseInt( $emptyrow.find('[data-iterator]').data('iterator') ) + 1;
+		var $row          = $emptyrow.clone();
+		var prevNum       = cmb.idNumber - 1;
+		var $colorPicker  = $row.find( '.wp-picker-container' );
+		var $list         = $row.find( '.cmb_media_status' );
+		var $newInput, $focusInput;
+
+		// Need to clean-up colorpicker before appending
+		if ( $colorPicker.length ) {
+			var $td = $row.find( 'td:first-child' );
+			$td.html( $td.find( 'input:text.cmb_colorpicker' ) );
+		}
 
-						if ( attachment.type && attachment.type === 'image' ) {
-							// image preview
-							uploadStatus = '<div class="img_status"><img style="max-width: 350px; width: 100%; height: auto;" src="' + attachment.url + '" alt="'+ attachment.filename +'" title="'+ attachment.filename +'" /><p><a href="#" class="cmb_remove_file_button" rel="' + CMB.formfield + '">'+ cmb_l10.remove_image +'</a></p></div>';
-						} else {
-							// Standard generic output if it's not an image.
-							uploadStatus = cmb_l10.file +' <strong>'+ attachment.filename +'</strong>&nbsp;&nbsp;&nbsp; (<a href="'+ attachment.url +'" target="_blank" rel="external">'+ cmb_l10.download +'</a> / <a href="#" class="cmb_remove_file_button" rel="'+ CMB.formfield +'">'+ cmb_l10.remove_file +'</a>)';
-						}
+		// Need to clean-up colorpicker before appending
+		if ( $list.length ) {
+			$list.empty();
+		}
 
-						// add/display our output
-						$formfield.siblings('.cmb_media_status').slideDown().html(uploadStatus);
-					}
+		var cleanRow = function() {
+
+			$newInput = $(this);
+			$focusInput = $focusInput ? $focusInput : $newInput;
+
+			var oldName = $newInput.attr( 'name' );
+			var newName = oldName ? oldName.replace( prevNum, cmb.idNumber ) : '';
+			var oldID = $newInput.attr( 'id' );
+			var newID = oldID ? oldID.replace( '_'+ prevNum, '_'+ cmb.idNumber ) : '';
+			var $next = $newInput.next();
+
+			cmb.log( $newInput.prop('tagName'), oldName, newName, prevNum, cmb.idNumber );
+			$newInput
+				.val('')
+				.removeAttr( 'checked' )
+				.removeAttr( 'selected' )
+				.removeClass( 'hasDatepicker' )
+				.attr({
+				  id: newID,
+				  name: newName,
+				  'data-iterator': cmb.idNumber,
 				});
+			if ( $next.is('label') ) {
+				$next.attr( 'for', newID );
+			}
+		}
 
-				// Finally, open the modal
-				CMB.file_frames[CMB.formfield].open();
-			})
-			.on( 'click', '.cmb_remove_file_button', function(event) {
-				var $self        = $(this);
-				if ( $self.is( '.attach_list .cmb_remove_file_button' ) ){
-					$self.parents('li').remove();
-					return false;
-				}
-				CMB.formfield    = $self.attr('rel');
-				var $container   = $self.parents('.img_status');
+		// cmb.log( $newInput.attr('id'), $newInput.data('iterator'));
+		$row.find('input:not([type="button"]),select,textarea').each( cleanRow );
 
-				$('input#' + CMB.formfield).val('');
-				$('input#' + CMB.formfield + '_id').val('');
-				if ( ! $container.length ) {
-					$self.parents('.cmb_media_status').html('');
-				} else {
-					$container.html('');
-				}
-				return false;
-			})
-			.on( 'click', '.add-row-button', function(e) {
+		$emptyrow.removeClass('empty-row').addClass('repeat-row');
+		$emptyrow.after( $row );
+		if ( $focusInput ) {
+			$focusInput.focus();
+		}
 
-				e.preventDefault();
-				var $self = $(this);
+		// Init pickers from new row
+		cmb.initPickers( $row.find('input:text.cmb_timepicker'), $row.find('input:text.cmb_datepicker'), $row.find('input:text.cmb_colorpicker') );
 
-				var tableselector = '#'+ $self.data('selector');
-				var $table = $(tableselector);
-				var row = $('.empty-row', $table).clone(true);
-				row.removeClass('empty-row').addClass('repeat-row');
-				row.insertBefore( tableselector +' tbody>tr:last' );
-				var input = $('input.cmb_datepicker',row);
-				var id = input.attr('id');
-				input.attr('id', id + CMB.iterator );
-				CMB.iterator++;
+	}
 
-				// @todo Make a colorpicker field repeatable
-				// row.find('.wp-color-result').remove();
-				// row.find('input:text.cmb_colorpicker').wpColorPicker();
+	cmb.removeAjaxRow = function( event ) {
+		event.preventDefault();
+		var $self   = $(this);
+		var $parent = $self.parents('tr');
+		var $table  = $self.parents('.cmb-repeat-table');
 
+		// cmb.log( 'number of tbodys', $table.length );
+		// cmb.log( 'number of trs', $('tr', $table).length );
+		if ( $table.find('tr').length > 1 ) {
+			if ( $parent.hasClass('empty-row') ) {
+				$parent.prev().addClass( 'empty-row' ).removeClass('repeat-row');
+			}
+			$self.parents('.cmb-repeat-table tr').remove();
+		}
+	}
+
+	/**
+	 * @todo make work, always
+	 */
+	cmb.initPickers = function( $timePickers, $datePickers, $colorPickers ) {
+		// Initialize timepicker
+		cmb.initTimePickers( $timePickers );
+
+		// Initialize jQuery UI datepicker
+		cmb.initDatePickers( $datePickers );
+
+		// Initialize color picker
+		cmb.initColorPickers( $colorPickers );
+	}
+
+	cmb.initTimePickers = function( $selector ) {
+		if ( ! $selector.length )
+			return;
+
+		$selector.timePicker({
+			startTime: "00:00",
+			endTime: "23:59",
+			show24Hours: false,
+			separator: ':',
+			step: 30
+		});
+	}
+
+	cmb.initDatePickers = function( $selector ) {
+		if ( ! $selector.length )
+			return;
+
+		$selector.datepicker( "destroy" );
+		$selector.datepicker();
+	}
+
+	cmb.initColorPickers = function( $selector ) {
+		if ( ! $selector.length )
+			return;
+		if (typeof jQuery.wp === 'object' && typeof jQuery.wp.wpColorPicker === 'function') {
+
+			$selector.wpColorPicker();
+
+		} else {
+			$selector.each( function(i) {
+				$(this).after('<div id="picker-' + i + '" style="z-index: 1000; background: #EEE; border: 1px solid #CCC; position: absolute; display: block;"></div>');
+				$('#picker-' + i).hide().farbtastic($(this));
 			})
-			.on( 'click', '.remove-row-button', function(e) {
-				e.preventDefault();
-				var $self = $(this);
-				var $parent = $self.parents('.cmb-repeat-table');
-				CMB.log( 'number of tbodys', $parent.length );
-				CMB.log( 'number of trs', $('tr', $parent).length );
-				if ( $('tr', $parent).length > 2 )
-					$self.parents('.cmb-repeat-table tr').remove();
+			.focus( function() {
+				$(this).next().show();
 			})
-
-			/**
-			 * Ajax oEmbed display
-			 */
-
-			// ajax when typing
-			.on( 'keyup', '.cmb_oembed', function(event) {
-				// fire our ajax function
-				CMB.doAjax($(this), event);
+			.blur( function() {
+				$(this).next().hide();
 			});
+		}
+	}
 
-			// ajax on paste
-			$('.cmb_oembed').bind( 'paste', function(e) {
-				var pasteitem = $(this);
-				// paste event is fired before the value is filled, so wait a bit
-				setTimeout( function() {
-					// fire our ajax function
-					CMB.doAjax(pasteitem, 'paste');
-				}, 100);
-			}).blur( function() {
-				// when leaving the input
+	cmb.maybeOembed = function( evt ) {
+		var $self = $(this);
+		var type = evt.type;
+
+		var m = {
+			focusout : function() {
 				setTimeout( function() {
 					// if it's been 2 seconds, hide our spinner
-					CMB.spinner( '.postbox table.cmb_metabox', true );
+					cmb.spinner( '.postbox table.cmb_metabox', true );
 				}, 2000);
-			});
-
-			// on pageload
-			setTimeout( CMB.resizeoEmbeds, 500);
-			// and on window resize
-			$(window).on( 'resize', CMB.resizeoEmbeds );
-
-		},
-
-		/**
-		 * Safely log things if query var is set
-		 * @since  1.0.0
-		 */
-		log: function() {
-			if ( window.cmb_l10.script_debug && console && typeof console.log === 'function' ) {
-				console.log.apply(console, arguments);
-			}
-		},
-
-		spinner: function( context, hide ) {
-			if ( hide )
-				$('.cmb-spinner', context).hide();
-			else
-				$('.cmb-spinner', context).show();
-		},
-
-		// function for running our ajax
-		doAjax: function(obj, e) {
-			// get typed value
-			var oembed_url = obj.val();
-			// only proceed if the field contains more than 6 characters
-			if (oembed_url.length < 6)
-				return;
-
-			// only proceed if the user has pasted, pressed a number, letter, or whitelisted characters
-			if (e === 'paste' || e.which <= 90 && e.which >= 48 || e.which >= 96 && e.which <= 111 || e.which == 8 || e.which == 9 || e.which == 187 || e.which == 190) {
-
-				// get field id
-				var field_id = obj.attr('id');
-				// get our inputs context for pinpointing
-				var context = obj.parents('.cmb_metabox tr td');
-
-				var embed_container = $('.embed_status', context);
-				var oembed_width = obj.width();
-				var child_el = $(':first-child', embed_container);
-
-				oembed_width = ( embed_container.length && child_el.length ) ? child_el.width() : obj.width();
-
-				// show our spinner
-				CMB.spinner( context );
-				// clear out previous results
-				$('.embed_wrap', context).html('');
-				// and run our ajax function
-				setTimeout( function() {
-					// if they haven't typed in 500 ms
-					if ($('.cmb_oembed:focus').val() != oembed_url)
-						return;
-					$.ajax({
-						type : 'post',
-						dataType : 'json',
-						url : window.cmb_l10.ajaxurl,
-						data : {
-							'action': 'cmb_oembed_handler',
-							'oembed_url': oembed_url,
-							'oembed_width': oembed_width > 300 ? oembed_width : 300,
-							'field_id': field_id,
-							'object_id': obj.data('objectid'),
-							'object_type': obj.data('objecttype'),
-							'cmb_ajax_nonce': window.cmb_l10.ajax_nonce
-						},
-						success: function(response) {
-							CMB.log( response );
-							// Make sure we have a response id
-							if (typeof response.id === 'undefined')
-								return;
-
-							// hide our spinner
-							CMB.spinner( context, true );
-							// and populate our results from ajax response
-							$('.embed_wrap', context).html(response.result);
-						}
-					});
-
-				}, 500);
+			},
+			keyup : function() {
+				var betw = function( min, max ) { return evt.which <= max && evt.which >= min; }
+				// Only Ajax on normal keystrokes
+				if ( betw( 48, 90 ) || betw( 96, 111 ) || betw( 8, 9 ) || evt.which == 187 || evt.which == 190 ) {
+					// fire our ajax function
+					cmb.doAjax( $self, evt);
+				}
+			},
+			paste : function() {
+				// paste event is fired before the value is filled, so wait a bit
+				setTimeout( function() { cmb.doAjax( $self ); }, 100);
 			}
-		},
+		}
+		m[type]();
+
+	}
+
+	/**
+	 * Resize oEmbed videos to fit in their respective metaboxes
+	 */
+	cmb.resizeoEmbeds = function() {
+		cmb.metabox().each( function() {
+			var $self      = $(this);
+			var $tableWrap = $self.parents('.inside');
+			if ( ! $tableWrap.length )
+				return true; // continue
+
+			// Calculate new width
+			var newWidth = Math.round(($tableWrap.width() * 0.82)*0.97) - 30;
+			if ( newWidth > 639 )
+				return true; // continue
+
+			var $embeds   = $self.find('.cmb-type-oembed .embed_status');
+			var $children = $embeds.children().not('.cmb_remove_wrapper');
+			if ( ! $children.length )
+				return true; // continue
+
+			$children.each( function() {
+				var $self     = $(this);
+				var iwidth    = $self.width();
+				var iheight   = $self.height();
+				var _newWidth = newWidth;
+				if ( $self.parents( '.repeat-row' ).length ) {
+					// Make room for our repeatable "remove" button column
+					_newWidth = newWidth - 91;
+				}
+				// Calc new height
+				var newHeight = Math.round((_newWidth * iheight)/iwidth);
+				$self.width(_newWidth).height(newHeight);
+			});
 
-		/**
-		 * Resize oEmbed videos to fit in their respective metaboxes
-		 */
-		resizeoEmbeds: function() {
-			$('table.cmb_metabox').each( function( index ) {
-				var self = $(this);
-				var parents = self.parents('.inside');
-				if ( ! parents.length )
-					return true; // continue
-
-				var tWidth = parents.width();
-				var newWidth = Math.round((tWidth * 0.82)*0.97) - 30;
-				if ( newWidth > 639 )
-					return true; // continue
-
-				var child_el = $('.cmb-type-oembed .embed_status', self).children().first();
-				var iwidth = child_el.width();
-				var iheight = child_el.height();
-				var newHeight = Math.round((newWidth * iheight)/iwidth);
-				child_el.width(newWidth).height(newHeight);
+		});
+	}
 
-			});
+	/**
+	 * Safely log things if query var is set
+	 * @since  1.0.0
+	 */
+	cmb.log = function() {
+		if ( l10n.script_debug && console && typeof console.log === 'function' ) {
+			console.log.apply(console, arguments);
 		}
+	}
+
+	cmb.spinner = function( $context, hide ) {
+		if ( hide )
+			$('.cmb-spinner', $context ).hide();
+		else
+			$('.cmb-spinner', $context ).show();
+	}
+
+	// function for running our ajax
+	cmb.doAjax = function($obj, e) {
+		// get typed value
+		var oembed_url = $obj.val();
+		// only proceed if the field contains more than 6 characters
+		if (oembed_url.length < 6)
+			return;
+
+		// only proceed if the user has pasted, pressed a number, letter, or whitelisted characters
+
+			// get field id
+			var field_id = $obj.attr('id');
+			// get our inputs $context for pinpointing
+			var $context = $obj.parents('.cmb-repeat-table  tr td');
+			$context = $context.length ? $context : $obj.parents('.cmb_metabox tr td');
+
+			var embed_container = $('.embed_status', $context);
+			var oembed_width = $obj.width();
+			var child_el = $(':first-child', embed_container);
+
+			// http://www.youtube.com/watch?v=dGG7aru2S6U
+			cmb.log( 'oembed_url', oembed_url, field_id );
+			oembed_width = ( embed_container.length && child_el.length ) ? child_el.width() : $obj.width();
+
+			// show our spinner
+			cmb.spinner( $context );
+			// clear out previous results
+			$('.embed_wrap', $context).html('');
+			// and run our ajax function
+			setTimeout( function() {
+				// if they haven't typed in 500 ms
+				if ($('.cmb_oembed:focus').val() != oembed_url)
+					return;
+				$.ajax({
+					type : 'post',
+					dataType : 'json',
+					url : l10n.ajaxurl,
+					data : {
+						'action': 'cmb_oembed_handler',
+						'oembed_url': oembed_url,
+						'oembed_width': oembed_width > 300 ? oembed_width : 300,
+						'field_id': field_id,
+						'object_id': $obj.data('objectid'),
+						'object_type': $obj.data('objecttype'),
+						'cmb_ajax_nonce': l10n.ajax_nonce
+					},
+					success: function(response) {
+						cmb.log( response );
+						// Make sure we have a response id
+						if (typeof response.id === 'undefined')
+							return;
+
+						// hide our spinner
+						cmb.spinner( $context, true );
+						// and populate our results from ajax response
+						$('.embed_wrap', $context).html(response.result);
+					}
+				});
+
+			}, 500);
+	}
 
-	};
+	$(document).ready(cmb.init);
 
-	$(document).ready(CMB.init);
+	return cmb;
 
 })(window, document, jQuery);
diff --git a/js/cmb.min.js b/js/cmb.min.js
index bb4d2a3..aa7b112 100644
--- a/js/cmb.min.js
+++ b/js/cmb.min.js
@@ -1,29 +1,38 @@
-(function(b,a,c,d){b.CMB={formfield:"",iterator:0,file_frames:{},init:function(){CMB.log(b.cmb_l10);if(b.cmb_l10.new_admin_style){c(".cmb-spinner img").hide();
-}c(".cmb_timepicker").each(function(){c("#"+jQuery(this).attr("id")).timePicker({startTime:"07:00",endTime:"22:00",show24Hours:false,separator:":",step:30});
-});c(".cmb_datepicker").each(function(){c("#"+jQuery(this).attr("id")).datepicker();});c("#ui-datepicker-div").wrap('<div class="cmb_element" />');if(typeof jQuery.wp==="object"&&typeof jQuery.wp.wpColorPicker==="function"){c("input:text.cmb_colorpicker").wpColorPicker();
-}else{c("input:text.cmb_colorpicker").each(function(e){c(this).after('<div id="picker-'+e+'" style="z-index: 1000; background: #EEE; border: 1px solid #CCC; position: absolute; display: block;"></div>');
-c("#picker-"+e).hide().farbtastic(c(this));}).focus(function(){c(this).next().show();}).blur(function(){c(this).next().hide();});}c(".cmb_metabox").on("change",".cmb_upload_file",function(){CMB.formfield=c(this).attr("name");
-c("#"+CMB.formfield+"_id").val("");}).on("click",".cmb_upload_button",function(f){f.preventDefault();var j=c(this);CMB.formfield=j.prev("input").attr("name");
-var i=c("#"+CMB.formfield);var e=true;var h=true;var g=j.hasClass("cmb_upload_list");if(CMB.formfield in CMB.file_frames){CMB.file_frames[CMB.formfield].open();
-return;}CMB.file_frames[CMB.formfield]=wp.media.frames.file_frame=wp.media({title:c("label[for="+CMB.formfield+"]").text(),button:{text:b.cmb_l10.upload_file},multiple:g?true:false});
-CMB.file_frames[CMB.formfield].on("select",function(){if(g){h=CMB.file_frames[CMB.formfield].state().get("selection").toJSON();i.val(h.url);c("#"+CMB.formfield+"_id").val(h.id);
-var k=[];c(h).each(function(){if(this.type&&this.type==="image"){e='<li class="img_status"><img width="50" height="50" src="'+this.url+'" class="attachment-50x50" alt="'+this.filename+'"><p><a href="#" class="cmb_remove_file_button" rel="'+CMB.formfield+"["+this.id+']">'+cmb_l10.remove_image+'</a></p><input type="hidden" id="filelist-'+this.id+'" name="'+CMB.formfield+"["+this.id+']" value="'+this.url+'"></li>';
-}else{e="<li>"+cmb_l10.file+" <strong>"+this.filename+'</strong>&nbsp;&nbsp;&nbsp; (<a href="'+this.url+'" target="_blank" rel="external">'+cmb_l10.download+'</a> / <a href="#" class="cmb_remove_file_button" rel="'+CMB.formfield+"["+this.id+']">'+cmb_l10.remove_file+'</a>)<input type="hidden" id="filelist-'+this.id+'" name="'+CMB.formfield+"["+this.id+']" value="'+this.url+'"></li>';
-}k.push(e);});c(k).each(function(){i.siblings(".cmb_media_status").slideDown().append(this);});}else{h=CMB.file_frames[CMB.formfield].state().get("selection").first().toJSON();
-i.val(h.url);c("#"+CMB.formfield+"_id").val(h.id);if(h.type&&h.type==="image"){e='<div class="img_status"><img style="max-width: 350px; width: 100%; height: auto;" src="'+h.url+'" alt="'+h.filename+'" title="'+h.filename+'" /><p><a href="#" class="cmb_remove_file_button" rel="'+CMB.formfield+'">'+cmb_l10.remove_image+"</a></p></div>";
-}else{e=cmb_l10.file+" <strong>"+h.filename+'</strong>&nbsp;&nbsp;&nbsp; (<a href="'+h.url+'" target="_blank" rel="external">'+cmb_l10.download+'</a> / <a href="#" class="cmb_remove_file_button" rel="'+CMB.formfield+'">'+cmb_l10.remove_file+"</a>)";
-}i.siblings(".cmb_media_status").slideDown().html(e);}});CMB.file_frames[CMB.formfield].open();}).on("click",".cmb_remove_file_button",function(e){var g=c(this);
-if(g.is(".attach_list .cmb_remove_file_button")){g.parents("li").remove();return false;}CMB.formfield=g.attr("rel");var f=g.parents(".img_status");c("input#"+CMB.formfield).val("");
-c("input#"+CMB.formfield+"_id").val("");if(!f.length){g.parents(".cmb_media_status").html("");}else{f.html("");}return false;}).on("click",".add-row-button",function(i){i.preventDefault();
-var k=c(this);var h="#"+k.data("selector");var g=c(h);var j=c(".empty-row",g).clone(true);j.removeClass("empty-row").addClass("repeat-row");j.insertBefore(h+" tbody>tr:last");
-var f=c("input.cmb_datepicker",j);var l=f.attr("id");f.attr("id",l+CMB.iterator);CMB.iterator++;}).on("click",".remove-row-button",function(g){g.preventDefault();
-var h=c(this);var f=h.parents(".cmb-repeat-table");CMB.log("number of tbodys",f.length);CMB.log("number of trs",c("tr",f).length);if(c("tr",f).length>2){h.parents(".cmb-repeat-table tr").remove();
-}}).on("keyup",".cmb_oembed",function(e){CMB.doAjax(c(this),e);});c(".cmb_oembed").bind("paste",function(g){var f=c(this);setTimeout(function(){CMB.doAjax(f,"paste");
-},100);}).blur(function(){setTimeout(function(){CMB.spinner(".postbox table.cmb_metabox",true);},2000);});setTimeout(CMB.resizeoEmbeds,500);c(b).on("resize",CMB.resizeoEmbeds);
-},log:function(){if(b.cmb_l10.script_debug&&console&&typeof console.log==="function"){console.log.apply(console,arguments);}},spinner:function(f,e){if(e){c(".cmb-spinner",f).hide();
-}else{c(".cmb-spinner",f).show();}},doAjax:function(m,l){var h=m.val();if(h.length<6){return;}if(l==="paste"||l.which<=90&&l.which>=48||l.which>=96&&l.which<=111||l.which==8||l.which==9||l.which==187||l.which==190){var j=m.attr("id");
-var g=m.parents(".cmb_metabox tr td");var k=c(".embed_status",g);var f=m.width();var i=c(":first-child",k);f=(k.length&&i.length)?i.width():m.width();CMB.spinner(g);
-c(".embed_wrap",g).html("");setTimeout(function(){if(c(".cmb_oembed:focus").val()!=h){return;}c.ajax({type:"post",dataType:"json",url:b.cmb_l10.ajaxurl,data:{action:"cmb_oembed_handler",oembed_url:h,oembed_width:f>300?f:300,field_id:j,object_id:m.data("objectid"),object_type:m.data("objecttype"),cmb_ajax_nonce:b.cmb_l10.ajax_nonce},success:function(e){CMB.log(e);
-if(typeof e.id==="undefined"){return;}CMB.spinner(g,true);c(".embed_wrap",g).html(e.result);}});},500);}},resizeoEmbeds:function(){c("table.cmb_metabox").each(function(j){var m=c(this);
-var l=m.parents(".inside");if(!l.length){return true;}var i=l.width();var h=Math.round((i*0.82)*0.97)-30;if(h>639){return true;}var f=c(".cmb-type-oembed .embed_status",m).children().first();
-var g=f.width();var k=f.height();var e=Math.round((h*k)/g);f.width(h).height(e);});}};c(a).ready(CMB.init);})(window,document,jQuery);
\ No newline at end of file
+window.CMB=(function(c,a,d,f){var b=c.cmb_l10;var e={formfield:"",idNumber:false,file_frames:{},};e.metabox=function(){if(e.$metabox){return e.$metabox;
+}e.$metabox=d("table.cmb_metabox");return e.$metabox;};e.init=function(){e.log(b);var g=e.metabox();if(b.new_admin_style){g.find(".cmb-spinner img").hide();
+}e.initPickers(g.find("input:text.cmb_timepicker"),g.find("input:text.cmb_datepicker"),g.find("input:text.cmb_colorpicker"));d("#ui-datepicker-div").wrap('<div class="cmb_element" />');
+d(".cmb_metabox").on("change",".cmb_upload_file",function(){e.formfield=d(this).attr("id");d("#"+e.formfield+"_id").val("");}).on("click",".cmb_upload_button",e.handleMedia).on("click",".cmb_remove_file_button",e.handleRemoveMedia).on("click",".add-row-button",e.addAjaxRow).on("click",".remove-row-button",e.removeAjaxRow).on("keyup paste focusout",".cmb_oembed",e.maybeOembed);
+setTimeout(e.resizeoEmbeds,500);d(c).on("resize",e.resizeoEmbeds);};e.handleMedia=function(h){h.preventDefault();var m=e.metabox();var n=d(this);e.formfield=n.prev("input").attr("id");
+var g=d("#"+e.formfield);var o=g.attr("name");var i=true;var l=true;var j=n.hasClass("cmb_upload_list");if(e.formfield in e.file_frames){e.file_frames[e.formfield].open();
+return;}e.file_frames[e.formfield]=wp.media.frames.file_frame=wp.media({title:m.find("label[for="+e.formfield+"]").text(),button:{text:b.upload_file},multiple:j?true:false});
+var k={list:function(q){l=q.toJSON();g.val(l.url);d("#"+e.formfield+"_id").val(l.id);var p=[];d(l).each(function(){if(this.type&&this.type==="image"){i='<li class="img_status"><img width="50" height="50" src="'+this.url+'" class="attachment-50x50" alt="'+this.filename+'"><p><a href="#" class="cmb_remove_file_button" rel="'+e.formfield+"["+this.id+']">'+b.remove_image+'</a></p><input type="hidden" id="filelist-'+this.id+'" name="'+o+"["+this.id+']" value="'+this.url+'"></li>';
+}else{i="<li>"+b.file+" <strong>"+this.filename+'</strong>&nbsp;&nbsp;&nbsp; (<a href="'+this.url+'" target="_blank" rel="external">'+b.download+'</a> / <a href="#" class="cmb_remove_file_button" rel="'+e.formfield+"["+this.id+']">'+b.remove_file+'</a>)<input type="hidden" id="filelist-'+this.id+'" name="'+o+"["+this.id+']" value="'+this.url+'"></li>';
+}p.push(i);});d(p).each(function(){g.siblings(".cmb_media_status").slideDown().append(this);});},single:function(p){l=p.first().toJSON();g.val(l.url);d("#"+e.formfield+"_id").val(l.id);
+if(l.type&&l.type==="image"){i='<div class="img_status"><img style="max-width: 350px; width: 100%; height: auto;" src="'+l.url+'" alt="'+l.filename+'" title="'+l.filename+'" /><p><a href="#" class="cmb_remove_file_button" rel="'+e.formfield+'">'+b.remove_image+"</a></p></div>";
+}else{i=b.file+" <strong>"+l.filename+'</strong>&nbsp;&nbsp;&nbsp; (<a href="'+l.url+'" target="_blank" rel="external">'+b.download+'</a> / <a href="#" class="cmb_remove_file_button" rel="'+e.formfield+'">'+b.remove_file+"</a>)";
+}g.siblings(".cmb_media_status").slideDown().html(i);}};e.file_frames[e.formfield].on("select",function(){var q=e.file_frames[e.formfield].state().get("selection");
+var p=j?"list":"single";k[p](q);});e.file_frames[e.formfield].open();};e.handleRemoveMedia=function(g){var i=d(this);if(i.is(".attach_list .cmb_remove_file_button")){i.parents("li").remove();
+return false;}e.formfield=i.attr("rel");var h=i.parents(".img_status");$metabox.find("input#"+e.formfield).val("");$metabox.find("input#"+e.formfield+"_id").val("");
+if(!h.length){i.parents(".cmb_media_status").html("");}else{h.html("");}return false;};e.addAjaxRow=function(i){i.preventDefault();var q=d(this);var s="#"+q.data("selector");
+var g=s.slice(1,s.lastIndexOf("repeat"));var t=d(s).data("numberels",e.idNumber);var k=t.find(".empty-row");e.idNumber=parseInt(k.find("[data-iterator]").data("iterator"))+1;
+var n=k.clone();var m=e.idNumber-1;var r=n.find(".wp-picker-container");var l=n.find(".cmb_media_status");var p,h;if(r.length){var j=n.find("td:first-child");
+j.html(j.find("input:text.cmb_colorpicker"));}if(l.length){l.empty();}var o=function(){p=d(this);h=h?h:p;var x=p.attr("name");var v=x?x.replace(m,e.idNumber):"";
+var y=p.attr("id");var w=y?y.replace("_"+m,"_"+e.idNumber):"";var u=p.next();e.log(p.prop("tagName"),x,v,m,e.idNumber);p.val("").removeAttr("checked").removeAttr("selected").removeClass("hasDatepicker").attr({id:w,name:v,"data-iterator":e.idNumber,});
+if(u.is("label")){u.attr("for",w);}};n.find('input:not([type="button"]),select,textarea').each(o);k.removeClass("empty-row").addClass("repeat-row");k.after(n);
+if(h){h.focus();}e.initPickers(n.find("input:text.cmb_timepicker"),n.find("input:text.cmb_datepicker"),n.find("input:text.cmb_colorpicker"));};e.removeAjaxRow=function(h){h.preventDefault();
+var j=d(this);var i=j.parents("tr");var g=j.parents(".cmb-repeat-table");if(g.find("tr").length>1){if(i.hasClass("empty-row")){i.prev().addClass("empty-row").removeClass("repeat-row");
+}j.parents(".cmb-repeat-table tr").remove();}};e.initPickers=function(h,i,g){e.initTimePickers(h);e.initDatePickers(i);e.initColorPickers(g);};e.initTimePickers=function(g){if(!g.length){return;
+}g.timePicker({startTime:"00:00",endTime:"23:59",show24Hours:false,separator:":",step:30});};e.initDatePickers=function(g){if(!g.length){return;}g.datepicker("destroy");
+g.datepicker();};e.initColorPickers=function(g){if(!g.length){return;}if(typeof jQuery.wp==="object"&&typeof jQuery.wp.wpColorPicker==="function"){g.wpColorPicker();
+}else{g.each(function(h){d(this).after('<div id="picker-'+h+'" style="z-index: 1000; background: #EEE; border: 1px solid #CCC; position: absolute; display: block;"></div>');
+d("#picker-"+h).hide().farbtastic(d(this));}).focus(function(){d(this).next().show();}).blur(function(){d(this).next().hide();});}};e.maybeOembed=function(h){var j=d(this);
+var i=h.type;var g={focusout:function(){setTimeout(function(){e.spinner(".postbox table.cmb_metabox",true);},2000);},keyup:function(){var k=function(m,l){return h.which<=l&&h.which>=m;
+};if(k(48,90)||k(96,111)||k(8,9)||h.which==187||h.which==190){e.doAjax(j,h);}},paste:function(){setTimeout(function(){e.doAjax(j);},100);}};g[i]();};e.resizeoEmbeds=function(){e.metabox().each(function(){var i=d(this);
+var k=i.parents(".inside");if(!k.length){return true;}var h=Math.round((k.width()*0.82)*0.97)-30;if(h>639){return true;}var j=i.find(".cmb-type-oembed .embed_status");
+var g=j.children().not(".cmb_remove_wrapper");if(!g.length){return true;}g.each(function(){var o=d(this);var m=o.width();var p=o.height();var n=h;if(o.parents(".repeat-row").length){n=h-91;
+}var l=Math.round((n*p)/m);o.width(n).height(l);});});};e.log=function(){if(b.script_debug&&console&&typeof console.log==="function"){console.log.apply(console,arguments);
+}};e.spinner=function(g,h){if(h){d(".cmb-spinner",g).hide();}else{d(".cmb-spinner",g).show();}};e.doAjax=function(n,m){var i=n.val();if(i.length<6){return;
+}var k=n.attr("id");var g=n.parents(".cmb-repeat-table  tr td");g=g.length?g:n.parents(".cmb_metabox tr td");var l=d(".embed_status",g);var h=n.width();
+var j=d(":first-child",l);e.log("oembed_url",i,k);h=(l.length&&j.length)?j.width():n.width();e.spinner(g);d(".embed_wrap",g).html("");setTimeout(function(){if(d(".cmb_oembed:focus").val()!=i){return;
+}d.ajax({type:"post",dataType:"json",url:b.ajaxurl,data:{action:"cmb_oembed_handler",oembed_url:i,oembed_width:h>300?h:300,field_id:k,object_id:n.data("objectid"),object_type:n.data("objecttype"),cmb_ajax_nonce:b.ajax_nonce},success:function(o){e.log(o);
+if(typeof o.id==="undefined"){return;}e.spinner(g,true);d(".embed_wrap",g).html(o.result);}});},500);};d(a).ready(e.init);return e;})(window,document,jQuery);
diff --git a/js/jquery.datePicker.min.js b/js/jquery.datePicker.min.js
new file mode 100644
index 0000000..2e721f3
--- /dev/null
+++ b/js/jquery.datePicker.min.js
@@ -0,0 +1,2038 @@
+/*!
+ * jQuery UI Datepicker 1.10.4
+ * http://jqueryui.com
+ *
+ * Copyright 2014 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://api.jqueryui.com/datepicker/
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ */
+(function( $, undefined ) {
+
+$.extend($.ui, { datepicker: { version: "1.10.4" } });
+
+var PROP_NAME = "datepicker",
+	instActive;
+
+/* Date picker manager.
+   Use the singleton instance of this class, $.datepicker, to interact with the date picker.
+   Settings for (groups of) date pickers are maintained in an instance object,
+   allowing multiple different settings on the same page. */
+
+function Datepicker() {
+	this._curInst = null; // The current instance in use
+	this._keyEvent = false; // If the last event was a key event
+	this._disabledInputs = []; // List of date picker inputs that have been disabled
+	this._datepickerShowing = false; // True if the popup picker is showing , false if not
+	this._inDialog = false; // True if showing within a "dialog", false if not
+	this._mainDivId = "ui-datepicker-div"; // The ID of the main datepicker division
+	this._inlineClass = "ui-datepicker-inline"; // The name of the inline marker class
+	this._appendClass = "ui-datepicker-append"; // The name of the append marker class
+	this._triggerClass = "ui-datepicker-trigger"; // The name of the trigger marker class
+	this._dialogClass = "ui-datepicker-dialog"; // The name of the dialog marker class
+	this._disableClass = "ui-datepicker-disabled"; // The name of the disabled covering marker class
+	this._unselectableClass = "ui-datepicker-unselectable"; // The name of the unselectable cell marker class
+	this._currentClass = "ui-datepicker-current-day"; // The name of the current day marker class
+	this._dayOverClass = "ui-datepicker-days-cell-over"; // The name of the day hover marker class
+	this.regional = []; // Available regional settings, indexed by language code
+	this.regional[""] = { // Default regional settings
+		closeText: "Done", // Display text for close link
+		prevText: "Prev", // Display text for previous month link
+		nextText: "Next", // Display text for next month link
+		currentText: "Today", // Display text for current month link
+		monthNames: ["January","February","March","April","May","June",
+			"July","August","September","October","November","December"], // Names of months for drop-down and formatting
+		monthNamesShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"], // For formatting
+		dayNames: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"], // For formatting
+		dayNamesShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"], // For formatting
+		dayNamesMin: ["Su","Mo","Tu","We","Th","Fr","Sa"], // Column headings for days starting at Sunday
+		weekHeader: "Wk", // Column header for week of the year
+		dateFormat: "mm/dd/yy", // See format options on parseDate
+		firstDay: 0, // The first day of the week, Sun = 0, Mon = 1, ...
+		isRTL: false, // True if right-to-left language, false if left-to-right
+		showMonthAfterYear: false, // True if the year select precedes month, false for month then year
+		yearSuffix: "" // Additional text to append to the year in the month headers
+	};
+	this._defaults = { // Global defaults for all the date picker instances
+		showOn: "focus", // "focus" for popup on focus,
+			// "button" for trigger button, or "both" for either
+		showAnim: "fadeIn", // Name of jQuery animation for popup
+		showOptions: {}, // Options for enhanced animations
+		defaultDate: null, // Used when field is blank: actual date,
+			// +/-number for offset from today, null for today
+		appendText: "", // Display text following the input box, e.g. showing the format
+		buttonText: "...", // Text for trigger button
+		buttonImage: "", // URL for trigger button image
+		buttonImageOnly: false, // True if the image appears alone, false if it appears on a button
+		hideIfNoPrevNext: false, // True to hide next/previous month links
+			// if not applicable, false to just disable them
+		navigationAsDateFormat: false, // True if date formatting applied to prev/today/next links
+		gotoCurrent: false, // True if today link goes back to current selection instead
+		changeMonth: false, // True if month can be selected directly, false if only prev/next
+		changeYear: false, // True if year can be selected directly, false if only prev/next
+		yearRange: "c-10:c+10", // Range of years to display in drop-down,
+			// either relative to today's year (-nn:+nn), relative to currently displayed year
+			// (c-nn:c+nn), absolute (nnnn:nnnn), or a combination of the above (nnnn:-n)
+		showOtherMonths: false, // True to show dates in other months, false to leave blank
+		selectOtherMonths: false, // True to allow selection of dates in other months, false for unselectable
+		showWeek: false, // True to show week of the year, false to not show it
+		calculateWeek: this.iso8601Week, // How to calculate the week of the year,
+			// takes a Date and returns the number of the week for it
+		shortYearCutoff: "+10", // Short year values < this are in the current century,
+			// > this are in the previous century,
+			// string value starting with "+" for current year + value
+		minDate: null, // The earliest selectable date, or null for no limit
+		maxDate: null, // The latest selectable date, or null for no limit
+		duration: "fast", // Duration of display/closure
+		beforeShowDay: null, // Function that takes a date and returns an array with
+			// [0] = true if selectable, false if not, [1] = custom CSS class name(s) or "",
+			// [2] = cell title (optional), e.g. $.datepicker.noWeekends
+		beforeShow: null, // Function that takes an input field and
+			// returns a set of custom settings for the date picker
+		onSelect: null, // Define a callback function when a date is selected
+		onChangeMonthYear: null, // Define a callback function when the month or year is changed
+		onClose: null, // Define a callback function when the datepicker is closed
+		numberOfMonths: 1, // Number of months to show at a time
+		showCurrentAtPos: 0, // The position in multipe months at which to show the current month (starting at 0)
+		stepMonths: 1, // Number of months to step back/forward
+		stepBigMonths: 12, // Number of months to step back/forward for the big links
+		altField: "", // Selector for an alternate field to store selected dates into
+		altFormat: "", // The date format to use for the alternate field
+		constrainInput: true, // The input is constrained by the current date format
+		showButtonPanel: false, // True to show button panel, false to not show it
+		autoSize: false, // True to size the input for the date format, false to leave as is
+		disabled: false // The initial disabled state
+	};
+	$.extend(this._defaults, this.regional[""]);
+	this.dpDiv = bindHover($("<div id='" + this._mainDivId + "' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"));
+}
+
+$.extend(Datepicker.prototype, {
+	/* Class name added to elements to indicate already configured with a date picker. */
+	markerClassName: "hasDatepicker",
+
+	//Keep track of the maximum number of rows displayed (see #7043)
+	maxRows: 4,
+
+	// TODO rename to "widget" when switching to widget factory
+	_widgetDatepicker: function() {
+		return this.dpDiv;
+	},
+
+	/* Override the default settings for all instances of the date picker.
+	 * @param  settings  object - the new settings to use as defaults (anonymous object)
+	 * @return the manager object
+	 */
+	setDefaults: function(settings) {
+		extendRemove(this._defaults, settings || {});
+		return this;
+	},
+
+	/* Attach the date picker to a jQuery selection.
+	 * @param  target	element - the target input field or division or span
+	 * @param  settings  object - the new settings to use for this date picker instance (anonymous)
+	 */
+	_attachDatepicker: function(target, settings) {
+		var nodeName, inline, inst;
+		nodeName = target.nodeName.toLowerCase();
+		inline = (nodeName === "div" || nodeName === "span");
+		if (!target.id) {
+			this.uuid += 1;
+			target.id = "dp" + this.uuid;
+		}
+		inst = this._newInst($(target), inline);
+		inst.settings = $.extend({}, settings || {});
+		if (nodeName === "input") {
+			this._connectDatepicker(target, inst);
+		} else if (inline) {
+			this._inlineDatepicker(target, inst);
+		}
+	},
+
+	/* Create a new instance object. */
+	_newInst: function(target, inline) {
+		var id = target[0].id.replace(/([^A-Za-z0-9_\-])/g, "\\\\$1"); // escape jQuery meta chars
+		return {id: id, input: target, // associated target
+			selectedDay: 0, selectedMonth: 0, selectedYear: 0, // current selection
+			drawMonth: 0, drawYear: 0, // month being drawn
+			inline: inline, // is datepicker inline or not
+			dpDiv: (!inline ? this.dpDiv : // presentation div
+			bindHover($("<div class='" + this._inlineClass + " ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")))};
+	},
+
+	/* Attach the date picker to an input field. */
+	_connectDatepicker: function(target, inst) {
+		var input = $(target);
+		inst.append = $([]);
+		inst.trigger = $([]);
+		if (input.hasClass(this.markerClassName)) {
+			return;
+		}
+		this._attachments(input, inst);
+		input.addClass(this.markerClassName).keydown(this._doKeyDown).
+			keypress(this._doKeyPress).keyup(this._doKeyUp);
+		this._autoSize(inst);
+		$.data(target, PROP_NAME, inst);
+		//If disabled option is true, disable the datepicker once it has been attached to the input (see ticket #5665)
+		if( inst.settings.disabled ) {
+			this._disableDatepicker( target );
+		}
+	},
+
+	/* Make attachments based on settings. */
+	_attachments: function(input, inst) {
+		var showOn, buttonText, buttonImage,
+			appendText = this._get(inst, "appendText"),
+			isRTL = this._get(inst, "isRTL");
+
+		if (inst.append) {
+			inst.append.remove();
+		}
+		if (appendText) {
+			inst.append = $("<span class='" + this._appendClass + "'>" + appendText + "</span>");
+			input[isRTL ? "before" : "after"](inst.append);
+		}
+
+		input.unbind("focus", this._showDatepicker);
+
+		if (inst.trigger) {
+			inst.trigger.remove();
+		}
+
+		showOn = this._get(inst, "showOn");
+		if (showOn === "focus" || showOn === "both") { // pop-up date picker when in the marked field
+			input.focus(this._showDatepicker);
+		}
+		if (showOn === "button" || showOn === "both") { // pop-up date picker when button clicked
+			buttonText = this._get(inst, "buttonText");
+			buttonImage = this._get(inst, "buttonImage");
+			inst.trigger = $(this._get(inst, "buttonImageOnly") ?
+				$("<img/>").addClass(this._triggerClass).
+					attr({ src: buttonImage, alt: buttonText, title: buttonText }) :
+				$("<button type='button'></button>").addClass(this._triggerClass).
+					html(!buttonImage ? buttonText : $("<img/>").attr(
+					{ src:buttonImage, alt:buttonText, title:buttonText })));
+			input[isRTL ? "before" : "after"](inst.trigger);
+			inst.trigger.click(function() {
+				if ($.datepicker._datepickerShowing && $.datepicker._lastInput === input[0]) {
+					$.datepicker._hideDatepicker();
+				} else if ($.datepicker._datepickerShowing && $.datepicker._lastInput !== input[0]) {
+					$.datepicker._hideDatepicker();
+					$.datepicker._showDatepicker(input[0]);
+				} else {
+					$.datepicker._showDatepicker(input[0]);
+				}
+				return false;
+			});
+		}
+	},
+
+	/* Apply the maximum length for the date format. */
+	_autoSize: function(inst) {
+		if (this._get(inst, "autoSize") && !inst.inline) {
+			var findMax, max, maxI, i,
+				date = new Date(2009, 12 - 1, 20), // Ensure double digits
+				dateFormat = this._get(inst, "dateFormat");
+
+			if (dateFormat.match(/[DM]/)) {
+				findMax = function(names) {
+					max = 0;
+					maxI = 0;
+					for (i = 0; i < names.length; i++) {
+						if (names[i].length > max) {
+							max = names[i].length;
+							maxI = i;
+						}
+					}
+					return maxI;
+				};
+				date.setMonth(findMax(this._get(inst, (dateFormat.match(/MM/) ?
+					"monthNames" : "monthNamesShort"))));
+				date.setDate(findMax(this._get(inst, (dateFormat.match(/DD/) ?
+					"dayNames" : "dayNamesShort"))) + 20 - date.getDay());
+			}
+			inst.input.attr("size", this._formatDate(inst, date).length);
+		}
+	},
+
+	/* Attach an inline date picker to a div. */
+	_inlineDatepicker: function(target, inst) {
+		var divSpan = $(target);
+		if (divSpan.hasClass(this.markerClassName)) {
+			return;
+		}
+		divSpan.addClass(this.markerClassName).append(inst.dpDiv);
+		$.data(target, PROP_NAME, inst);
+		this._setDate(inst, this._getDefaultDate(inst), true);
+		this._updateDatepicker(inst);
+		this._updateAlternate(inst);
+		//If disabled option is true, disable the datepicker before showing it (see ticket #5665)
+		if( inst.settings.disabled ) {
+			this._disableDatepicker( target );
+		}
+		// Set display:block in place of inst.dpDiv.show() which won't work on disconnected elements
+		// http://bugs.jqueryui.com/ticket/7552 - A Datepicker created on a detached div has zero height
+		inst.dpDiv.css( "display", "block" );
+	},
+
+	/* Pop-up the date picker in a "dialog" box.
+	 * @param  input element - ignored
+	 * @param  date	string or Date - the initial date to display
+	 * @param  onSelect  function - the function to call when a date is selected
+	 * @param  settings  object - update the dialog date picker instance's settings (anonymous object)
+	 * @param  pos int[2] - coordinates for the dialog's position within the screen or
+	 *					event - with x/y coordinates or
+	 *					leave empty for default (screen centre)
+	 * @return the manager object
+	 */
+	_dialogDatepicker: function(input, date, onSelect, settings, pos) {
+		var id, browserWidth, browserHeight, scrollX, scrollY,
+			inst = this._dialogInst; // internal instance
+
+		if (!inst) {
+			this.uuid += 1;
+			id = "dp" + this.uuid;
+			this._dialogInput = $("<input type='text' id='" + id +
+				"' style='position: absolute; top: -100px; width: 0px;'/>");
+			this._dialogInput.keydown(this._doKeyDown);
+			$("body").append(this._dialogInput);
+			inst = this._dialogInst = this._newInst(this._dialogInput, false);
+			inst.settings = {};
+			$.data(this._dialogInput[0], PROP_NAME, inst);
+		}
+		extendRemove(inst.settings, settings || {});
+		date = (date && date.constructor === Date ? this._formatDate(inst, date) : date);
+		this._dialogInput.val(date);
+
+		this._pos = (pos ? (pos.length ? pos : [pos.pageX, pos.pageY]) : null);
+		if (!this._pos) {
+			browserWidth = document.documentElement.clientWidth;
+			browserHeight = document.documentElement.clientHeight;
+			scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;
+			scrollY = document.documentElement.scrollTop || document.body.scrollTop;
+			this._pos = // should use actual width/height below
+				[(browserWidth / 2) - 100 + scrollX, (browserHeight / 2) - 150 + scrollY];
+		}
+
+		// move input on screen for focus, but hidden behind dialog
+		this._dialogInput.css("left", (this._pos[0] + 20) + "px").css("top", this._pos[1] + "px");
+		inst.settings.onSelect = onSelect;
+		this._inDialog = true;
+		this.dpDiv.addClass(this._dialogClass);
+		this._showDatepicker(this._dialogInput[0]);
+		if ($.blockUI) {
+			$.blockUI(this.dpDiv);
+		}
+		$.data(this._dialogInput[0], PROP_NAME, inst);
+		return this;
+	},
+
+	/* Detach a datepicker from its control.
+	 * @param  target	element - the target input field or division or span
+	 */
+	_destroyDatepicker: function(target) {
+		var nodeName,
+			$target = $(target),
+			inst = $.data(target, PROP_NAME);
+
+		if (!$target.hasClass(this.markerClassName)) {
+			return;
+		}
+
+		nodeName = target.nodeName.toLowerCase();
+		$.removeData(target, PROP_NAME);
+		if (nodeName === "input") {
+			inst.append.remove();
+			inst.trigger.remove();
+			$target.removeClass(this.markerClassName).
+				unbind("focus", this._showDatepicker).
+				unbind("keydown", this._doKeyDown).
+				unbind("keypress", this._doKeyPress).
+				unbind("keyup", this._doKeyUp);
+		} else if (nodeName === "div" || nodeName === "span") {
+			$target.removeClass(this.markerClassName).empty();
+		}
+	},
+
+	/* Enable the date picker to a jQuery selection.
+	 * @param  target	element - the target input field or division or span
+	 */
+	_enableDatepicker: function(target) {
+		var nodeName, inline,
+			$target = $(target),
+			inst = $.data(target, PROP_NAME);
+
+		if (!$target.hasClass(this.markerClassName)) {
+			return;
+		}
+
+		nodeName = target.nodeName.toLowerCase();
+		if (nodeName === "input") {
+			target.disabled = false;
+			inst.trigger.filter("button").
+				each(function() { this.disabled = false; }).end().
+				filter("img").css({opacity: "1.0", cursor: ""});
+		} else if (nodeName === "div" || nodeName === "span") {
+			inline = $target.children("." + this._inlineClass);
+			inline.children().removeClass("ui-state-disabled");
+			inline.find("select.ui-datepicker-month, select.ui-datepicker-year").
+				prop("disabled", false);
+		}
+		this._disabledInputs = $.map(this._disabledInputs,
+			function(value) { return (value === target ? null : value); }); // delete entry
+	},
+
+	/* Disable the date picker to a jQuery selection.
+	 * @param  target	element - the target input field or division or span
+	 */
+	_disableDatepicker: function(target) {
+		var nodeName, inline,
+			$target = $(target),
+			inst = $.data(target, PROP_NAME);
+
+		if (!$target.hasClass(this.markerClassName)) {
+			return;
+		}
+
+		nodeName = target.nodeName.toLowerCase();
+		if (nodeName === "input") {
+			target.disabled = true;
+			inst.trigger.filter("button").
+				each(function() { this.disabled = true; }).end().
+				filter("img").css({opacity: "0.5", cursor: "default"});
+		} else if (nodeName === "div" || nodeName === "span") {
+			inline = $target.children("." + this._inlineClass);
+			inline.children().addClass("ui-state-disabled");
+			inline.find("select.ui-datepicker-month, select.ui-datepicker-year").
+				prop("disabled", true);
+		}
+		this._disabledInputs = $.map(this._disabledInputs,
+			function(value) { return (value === target ? null : value); }); // delete entry
+		this._disabledInputs[this._disabledInputs.length] = target;
+	},
+
+	/* Is the first field in a jQuery collection disabled as a datepicker?
+	 * @param  target	element - the target input field or division or span
+	 * @return boolean - true if disabled, false if enabled
+	 */
+	_isDisabledDatepicker: function(target) {
+		if (!target) {
+			return false;
+		}
+		for (var i = 0; i < this._disabledInputs.length; i++) {
+			if (this._disabledInputs[i] === target) {
+				return true;
+			}
+		}
+		return false;
+	},
+
+	/* Retrieve the instance data for the target control.
+	 * @param  target  element - the target input field or division or span
+	 * @return  object - the associated instance data
+	 * @throws  error if a jQuery problem getting data
+	 */
+	_getInst: function(target) {
+		try {
+			return $.data(target, PROP_NAME);
+		}
+		catch (err) {
+			throw "Missing instance data for this datepicker";
+		}
+	},
+
+	/* Update or retrieve the settings for a date picker attached to an input field or division.
+	 * @param  target  element - the target input field or division or span
+	 * @param  name	object - the new settings to update or
+	 *				string - the name of the setting to change or retrieve,
+	 *				when retrieving also "all" for all instance settings or
+	 *				"defaults" for all global defaults
+	 * @param  value   any - the new value for the setting
+	 *				(omit if above is an object or to retrieve a value)
+	 */
+	_optionDatepicker: function(target, name, value) {
+		var settings, date, minDate, maxDate,
+			inst = this._getInst(target);
+
+		if (arguments.length === 2 && typeof name === "string") {
+			return (name === "defaults" ? $.extend({}, $.datepicker._defaults) :
+				(inst ? (name === "all" ? $.extend({}, inst.settings) :
+				this._get(inst, name)) : null));
+		}
+
+		settings = name || {};
+		if (typeof name === "string") {
+			settings = {};
+			settings[name] = value;
+		}
+
+		if (inst) {
+			if (this._curInst === inst) {
+				this._hideDatepicker();
+			}
+
+			date = this._getDateDatepicker(target, true);
+			minDate = this._getMinMaxDate(inst, "min");
+			maxDate = this._getMinMaxDate(inst, "max");
+			extendRemove(inst.settings, settings);
+			// reformat the old minDate/maxDate values if dateFormat changes and a new minDate/maxDate isn't provided
+			if (minDate !== null && settings.dateFormat !== undefined && settings.minDate === undefined) {
+				inst.settings.minDate = this._formatDate(inst, minDate);
+			}
+			if (maxDate !== null && settings.dateFormat !== undefined && settings.maxDate === undefined) {
+				inst.settings.maxDate = this._formatDate(inst, maxDate);
+			}
+			if ( "disabled" in settings ) {
+				if ( settings.disabled ) {
+					this._disableDatepicker(target);
+				} else {
+					this._enableDatepicker(target);
+				}
+			}
+			this._attachments($(target), inst);
+			this._autoSize(inst);
+			this._setDate(inst, date);
+			this._updateAlternate(inst);
+			this._updateDatepicker(inst);
+		}
+	},
+
+	// change method deprecated
+	_changeDatepicker: function(target, name, value) {
+		this._optionDatepicker(target, name, value);
+	},
+
+	/* Redraw the date picker attached to an input field or division.
+	 * @param  target  element - the target input field or division or span
+	 */
+	_refreshDatepicker: function(target) {
+		var inst = this._getInst(target);
+		if (inst) {
+			this._updateDatepicker(inst);
+		}
+	},
+
+	/* Set the dates for a jQuery selection.
+	 * @param  target element - the target input field or division or span
+	 * @param  date	Date - the new date
+	 */
+	_setDateDatepicker: function(target, date) {
+		var inst = this._getInst(target);
+		if (inst) {
+			this._setDate(inst, date);
+			this._updateDatepicker(inst);
+			this._updateAlternate(inst);
+		}
+	},
+
+	/* Get the date(s) for the first entry in a jQuery selection.
+	 * @param  target element - the target input field or division or span
+	 * @param  noDefault boolean - true if no default date is to be used
+	 * @return Date - the current date
+	 */
+	_getDateDatepicker: function(target, noDefault) {
+		var inst = this._getInst(target);
+		if (inst && !inst.inline) {
+			this._setDateFromField(inst, noDefault);
+		}
+		return (inst ? this._getDate(inst) : null);
+	},
+
+	/* Handle keystrokes. */
+	_doKeyDown: function(event) {
+		var onSelect, dateStr, sel,
+			inst = $.datepicker._getInst(event.target),
+			handled = true,
+			isRTL = inst.dpDiv.is(".ui-datepicker-rtl");
+
+		inst._keyEvent = true;
+		if ($.datepicker._datepickerShowing) {
+			switch (event.keyCode) {
+				case 9: $.datepicker._hideDatepicker();
+						handled = false;
+						break; // hide on tab out
+				case 13: sel = $("td." + $.datepicker._dayOverClass + ":not(." +
+									$.datepicker._currentClass + ")", inst.dpDiv);
+						if (sel[0]) {
+							$.datepicker._selectDay(event.target, inst.selectedMonth, inst.selectedYear, sel[0]);
+						}
+
+						onSelect = $.datepicker._get(inst, "onSelect");
+						if (onSelect) {
+							dateStr = $.datepicker._formatDate(inst);
+
+							// trigger custom callback
+							onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]);
+						} else {
+							$.datepicker._hideDatepicker();
+						}
+
+						return false; // don't submit the form
+				case 27: $.datepicker._hideDatepicker();
+						break; // hide on escape
+				case 33: $.datepicker._adjustDate(event.target, (event.ctrlKey ?
+							-$.datepicker._get(inst, "stepBigMonths") :
+							-$.datepicker._get(inst, "stepMonths")), "M");
+						break; // previous month/year on page up/+ ctrl
+				case 34: $.datepicker._adjustDate(event.target, (event.ctrlKey ?
+							+$.datepicker._get(inst, "stepBigMonths") :
+							+$.datepicker._get(inst, "stepMonths")), "M");
+						break; // next month/year on page down/+ ctrl
+				case 35: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._clearDate(event.target);
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // clear on ctrl or command +end
+				case 36: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._gotoToday(event.target);
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // current on ctrl or command +home
+				case 37: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._adjustDate(event.target, (isRTL ? +1 : -1), "D");
+						}
+						handled = event.ctrlKey || event.metaKey;
+						// -1 day on ctrl or command +left
+						if (event.originalEvent.altKey) {
+							$.datepicker._adjustDate(event.target, (event.ctrlKey ?
+								-$.datepicker._get(inst, "stepBigMonths") :
+								-$.datepicker._get(inst, "stepMonths")), "M");
+						}
+						// next month/year on alt +left on Mac
+						break;
+				case 38: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._adjustDate(event.target, -7, "D");
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // -1 week on ctrl or command +up
+				case 39: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._adjustDate(event.target, (isRTL ? -1 : +1), "D");
+						}
+						handled = event.ctrlKey || event.metaKey;
+						// +1 day on ctrl or command +right
+						if (event.originalEvent.altKey) {
+							$.datepicker._adjustDate(event.target, (event.ctrlKey ?
+								+$.datepicker._get(inst, "stepBigMonths") :
+								+$.datepicker._get(inst, "stepMonths")), "M");
+						}
+						// next month/year on alt +right
+						break;
+				case 40: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._adjustDate(event.target, +7, "D");
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // +1 week on ctrl or command +down
+				default: handled = false;
+			}
+		} else if (event.keyCode === 36 && event.ctrlKey) { // display the date picker on ctrl+home
+			$.datepicker._showDatepicker(this);
+		} else {
+			handled = false;
+		}
+
+		if (handled) {
+			event.preventDefault();
+			event.stopPropagation();
+		}
+	},
+
+	/* Filter entered characters - based on date format. */
+	_doKeyPress: function(event) {
+		var chars, chr,
+			inst = $.datepicker._getInst(event.target);
+
+		if ($.datepicker._get(inst, "constrainInput")) {
+			chars = $.datepicker._possibleChars($.datepicker._get(inst, "dateFormat"));
+			chr = String.fromCharCode(event.charCode == null ? event.keyCode : event.charCode);
+			return event.ctrlKey || event.metaKey || (chr < " " || !chars || chars.indexOf(chr) > -1);
+		}
+	},
+
+	/* Synchronise manual entry and field/alternate field. */
+	_doKeyUp: function(event) {
+		var date,
+			inst = $.datepicker._getInst(event.target);
+
+		if (inst.input.val() !== inst.lastVal) {
+			try {
+				date = $.datepicker.parseDate($.datepicker._get(inst, "dateFormat"),
+					(inst.input ? inst.input.val() : null),
+					$.datepicker._getFormatConfig(inst));
+
+				if (date) { // only if valid
+					$.datepicker._setDateFromField(inst);
+					$.datepicker._updateAlternate(inst);
+					$.datepicker._updateDatepicker(inst);
+				}
+			}
+			catch (err) {
+			}
+		}
+		return true;
+	},
+
+	/* Pop-up the date picker for a given input field.
+	 * If false returned from beforeShow event handler do not show.
+	 * @param  input  element - the input field attached to the date picker or
+	 *					event - if triggered by focus
+	 */
+	_showDatepicker: function(input) {
+		input = input.target || input;
+		if (input.nodeName.toLowerCase() !== "input") { // find from button/image trigger
+			input = $("input", input.parentNode)[0];
+		}
+
+		if ($.datepicker._isDisabledDatepicker(input) || $.datepicker._lastInput === input) { // already here
+			return;
+		}
+
+		var inst, beforeShow, beforeShowSettings, isFixed,
+			offset, showAnim, duration;
+
+		inst = $.datepicker._getInst(input);
+		if ($.datepicker._curInst && $.datepicker._curInst !== inst) {
+			$.datepicker._curInst.dpDiv.stop(true, true);
+			if ( inst && $.datepicker._datepickerShowing ) {
+				$.datepicker._hideDatepicker( $.datepicker._curInst.input[0] );
+			}
+		}
+
+		beforeShow = $.datepicker._get(inst, "beforeShow");
+		beforeShowSettings = beforeShow ? beforeShow.apply(input, [input, inst]) : {};
+		if(beforeShowSettings === false){
+			return;
+		}
+		extendRemove(inst.settings, beforeShowSettings);
+
+		inst.lastVal = null;
+		$.datepicker._lastInput = input;
+		$.datepicker._setDateFromField(inst);
+
+		if ($.datepicker._inDialog) { // hide cursor
+			input.value = "";
+		}
+		if (!$.datepicker._pos) { // position below input
+			$.datepicker._pos = $.datepicker._findPos(input);
+			$.datepicker._pos[1] += input.offsetHeight; // add the height
+		}
+
+		isFixed = false;
+		$(input).parents().each(function() {
+			isFixed |= $(this).css("position") === "fixed";
+			return !isFixed;
+		});
+
+		offset = {left: $.datepicker._pos[0], top: $.datepicker._pos[1]};
+		$.datepicker._pos = null;
+		//to avoid flashes on Firefox
+		inst.dpDiv.empty();
+		// determine sizing offscreen
+		inst.dpDiv.css({position: "absolute", display: "block", top: "-1000px"});
+		$.datepicker._updateDatepicker(inst);
+		// fix width for dynamic number of date pickers
+		// and adjust position before showing
+		offset = $.datepicker._checkOffset(inst, offset, isFixed);
+		inst.dpDiv.css({position: ($.datepicker._inDialog && $.blockUI ?
+			"static" : (isFixed ? "fixed" : "absolute")), display: "none",
+			left: offset.left + "px", top: offset.top + "px"});
+
+		if (!inst.inline) {
+			showAnim = $.datepicker._get(inst, "showAnim");
+			duration = $.datepicker._get(inst, "duration");
+			inst.dpDiv.zIndex($(input).zIndex()+1);
+			$.datepicker._datepickerShowing = true;
+
+			if ( $.effects && $.effects.effect[ showAnim ] ) {
+				inst.dpDiv.show(showAnim, $.datepicker._get(inst, "showOptions"), duration);
+			} else {
+				inst.dpDiv[showAnim || "show"](showAnim ? duration : null);
+			}
+
+			if ( $.datepicker._shouldFocusInput( inst ) ) {
+				inst.input.focus();
+			}
+
+			$.datepicker._curInst = inst;
+		}
+	},
+
+	/* Generate the date picker content. */
+	_updateDatepicker: function(inst) {
+		this.maxRows = 4; //Reset the max number of rows being displayed (see #7043)
+		instActive = inst; // for delegate hover events
+		inst.dpDiv.empty().append(this._generateHTML(inst));
+		this._attachHandlers(inst);
+		inst.dpDiv.find("." + this._dayOverClass + " a").mouseover();
+
+		var origyearshtml,
+			numMonths = this._getNumberOfMonths(inst),
+			cols = numMonths[1],
+			width = 17;
+
+		inst.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");
+		if (cols > 1) {
+			inst.dpDiv.addClass("ui-datepicker-multi-" + cols).css("width", (width * cols) + "em");
+		}
+		inst.dpDiv[(numMonths[0] !== 1 || numMonths[1] !== 1 ? "add" : "remove") +
+			"Class"]("ui-datepicker-multi");
+		inst.dpDiv[(this._get(inst, "isRTL") ? "add" : "remove") +
+			"Class"]("ui-datepicker-rtl");
+
+		if (inst === $.datepicker._curInst && $.datepicker._datepickerShowing && $.datepicker._shouldFocusInput( inst ) ) {
+			inst.input.focus();
+		}
+
+		// deffered render of the years select (to avoid flashes on Firefox)
+		if( inst.yearshtml ){
+			origyearshtml = inst.yearshtml;
+			setTimeout(function(){
+				//assure that inst.yearshtml didn't change.
+				if( origyearshtml === inst.yearshtml && inst.yearshtml ){
+					inst.dpDiv.find("select.ui-datepicker-year:first").replaceWith(inst.yearshtml);
+				}
+				origyearshtml = inst.yearshtml = null;
+			}, 0);
+		}
+	},
+
+	// #6694 - don't focus the input if it's already focused
+	// this breaks the change event in IE
+	// Support: IE and jQuery <1.9
+	_shouldFocusInput: function( inst ) {
+		return inst.input && inst.input.is( ":visible" ) && !inst.input.is( ":disabled" ) && !inst.input.is( ":focus" );
+	},
+
+	/* Check positioning to remain on screen. */
+	_checkOffset: function(inst, offset, isFixed) {
+		var dpWidth = inst.dpDiv.outerWidth(),
+			dpHeight = inst.dpDiv.outerHeight(),
+			inputWidth = inst.input ? inst.input.outerWidth() : 0,
+			inputHeight = inst.input ? inst.input.outerHeight() : 0,
+			viewWidth = document.documentElement.clientWidth + (isFixed ? 0 : $(document).scrollLeft()),
+			viewHeight = document.documentElement.clientHeight + (isFixed ? 0 : $(document).scrollTop());
+
+		offset.left -= (this._get(inst, "isRTL") ? (dpWidth - inputWidth) : 0);
+		offset.left -= (isFixed && offset.left === inst.input.offset().left) ? $(document).scrollLeft() : 0;
+		offset.top -= (isFixed && offset.top === (inst.input.offset().top + inputHeight)) ? $(document).scrollTop() : 0;
+
+		// now check if datepicker is showing outside window viewport - move to a better place if so.
+		offset.left -= Math.min(offset.left, (offset.left + dpWidth > viewWidth && viewWidth > dpWidth) ?
+			Math.abs(offset.left + dpWidth - viewWidth) : 0);
+		offset.top -= Math.min(offset.top, (offset.top + dpHeight > viewHeight && viewHeight > dpHeight) ?
+			Math.abs(dpHeight + inputHeight) : 0);
+
+		return offset;
+	},
+
+	/* Find an object's position on the screen. */
+	_findPos: function(obj) {
+		var position,
+			inst = this._getInst(obj),
+			isRTL = this._get(inst, "isRTL");
+
+		while (obj && (obj.type === "hidden" || obj.nodeType !== 1 || $.expr.filters.hidden(obj))) {
+			obj = obj[isRTL ? "previousSibling" : "nextSibling"];
+		}
+
+		position = $(obj).offset();
+		return [position.left, position.top];
+	},
+
+	/* Hide the date picker from view.
+	 * @param  input  element - the input field attached to the date picker
+	 */
+	_hideDatepicker: function(input) {
+		var showAnim, duration, postProcess, onClose,
+			inst = this._curInst;
+
+		if (!inst || (input && inst !== $.data(input, PROP_NAME))) {
+			return;
+		}
+
+		if (this._datepickerShowing) {
+			showAnim = this._get(inst, "showAnim");
+			duration = this._get(inst, "duration");
+			postProcess = function() {
+				$.datepicker._tidyDialog(inst);
+			};
+
+			// DEPRECATED: after BC for 1.8.x $.effects[ showAnim ] is not needed
+			if ( $.effects && ( $.effects.effect[ showAnim ] || $.effects[ showAnim ] ) ) {
+				inst.dpDiv.hide(showAnim, $.datepicker._get(inst, "showOptions"), duration, postProcess);
+			} else {
+				inst.dpDiv[(showAnim === "slideDown" ? "slideUp" :
+					(showAnim === "fadeIn" ? "fadeOut" : "hide"))]((showAnim ? duration : null), postProcess);
+			}
+
+			if (!showAnim) {
+				postProcess();
+			}
+			this._datepickerShowing = false;
+
+			onClose = this._get(inst, "onClose");
+			if (onClose) {
+				onClose.apply((inst.input ? inst.input[0] : null), [(inst.input ? inst.input.val() : ""), inst]);
+			}
+
+			this._lastInput = null;
+			if (this._inDialog) {
+				this._dialogInput.css({ position: "absolute", left: "0", top: "-100px" });
+				if ($.blockUI) {
+					$.unblockUI();
+					$("body").append(this.dpDiv);
+				}
+			}
+			this._inDialog = false;
+		}
+	},
+
+	/* Tidy up after a dialog display. */
+	_tidyDialog: function(inst) {
+		inst.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar");
+	},
+
+	/* Close date picker if clicked elsewhere. */
+	_checkExternalClick: function(event) {
+		if (!$.datepicker._curInst) {
+			return;
+		}
+
+		var $target = $(event.target),
+			inst = $.datepicker._getInst($target[0]);
+
+		if ( ( ( $target[0].id !== $.datepicker._mainDivId &&
+				$target.parents("#" + $.datepicker._mainDivId).length === 0 &&
+				!$target.hasClass($.datepicker.markerClassName) &&
+				!$target.closest("." + $.datepicker._triggerClass).length &&
+				$.datepicker._datepickerShowing && !($.datepicker._inDialog && $.blockUI) ) ) ||
+			( $target.hasClass($.datepicker.markerClassName) && $.datepicker._curInst !== inst ) ) {
+				$.datepicker._hideDatepicker();
+		}
+	},
+
+	/* Adjust one of the date sub-fields. */
+	_adjustDate: function(id, offset, period) {
+		var target = $(id),
+			inst = this._getInst(target[0]);
+
+		if (this._isDisabledDatepicker(target[0])) {
+			return;
+		}
+		this._adjustInstDate(inst, offset +
+			(period === "M" ? this._get(inst, "showCurrentAtPos") : 0), // undo positioning
+			period);
+		this._updateDatepicker(inst);
+	},
+
+	/* Action for current link. */
+	_gotoToday: function(id) {
+		var date,
+			target = $(id),
+			inst = this._getInst(target[0]);
+
+		if (this._get(inst, "gotoCurrent") && inst.currentDay) {
+			inst.selectedDay = inst.currentDay;
+			inst.drawMonth = inst.selectedMonth = inst.currentMonth;
+			inst.drawYear = inst.selectedYear = inst.currentYear;
+		} else {
+			date = new Date();
+			inst.selectedDay = date.getDate();
+			inst.drawMonth = inst.selectedMonth = date.getMonth();
+			inst.drawYear = inst.selectedYear = date.getFullYear();
+		}
+		this._notifyChange(inst);
+		this._adjustDate(target);
+	},
+
+	/* Action for selecting a new month/year. */
+	_selectMonthYear: function(id, select, period) {
+		var target = $(id),
+			inst = this._getInst(target[0]);
+
+		inst["selected" + (period === "M" ? "Month" : "Year")] =
+		inst["draw" + (period === "M" ? "Month" : "Year")] =
+			parseInt(select.options[select.selectedIndex].value,10);
+
+		this._notifyChange(inst);
+		this._adjustDate(target);
+	},
+
+	/* Action for selecting a day. */
+	_selectDay: function(id, month, year, td) {
+		var inst,
+			target = $(id);
+
+		if ($(td).hasClass(this._unselectableClass) || this._isDisabledDatepicker(target[0])) {
+			return;
+		}
+
+		inst = this._getInst(target[0]);
+		inst.selectedDay = inst.currentDay = $("a", td).html();
+		inst.selectedMonth = inst.currentMonth = month;
+		inst.selectedYear = inst.currentYear = year;
+		this._selectDate(id, this._formatDate(inst,
+			inst.currentDay, inst.currentMonth, inst.currentYear));
+	},
+
+	/* Erase the input field and hide the date picker. */
+	_clearDate: function(id) {
+		var target = $(id);
+		this._selectDate(target, "");
+	},
+
+	/* Update the input field with the selected date. */
+	_selectDate: function(id, dateStr) {
+		var onSelect,
+			target = $(id),
+			inst = this._getInst(target[0]);
+
+		dateStr = (dateStr != null ? dateStr : this._formatDate(inst));
+		if (inst.input) {
+			inst.input.val(dateStr);
+		}
+		this._updateAlternate(inst);
+
+		onSelect = this._get(inst, "onSelect");
+		if (onSelect) {
+			onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]);  // trigger custom callback
+		} else if (inst.input) {
+			inst.input.trigger("change"); // fire the change event
+		}
+
+		if (inst.inline){
+			this._updateDatepicker(inst);
+		} else {
+			this._hideDatepicker();
+			this._lastInput = inst.input[0];
+			if (typeof(inst.input[0]) !== "object") {
+				inst.input.focus(); // restore focus
+			}
+			this._lastInput = null;
+		}
+	},
+
+	/* Update any alternate field to synchronise with the main field. */
+	_updateAlternate: function(inst) {
+		var altFormat, date, dateStr,
+			altField = this._get(inst, "altField");
+
+		if (altField) { // update alternate field too
+			altFormat = this._get(inst, "altFormat") || this._get(inst, "dateFormat");
+			date = this._getDate(inst);
+			dateStr = this.formatDate(altFormat, date, this._getFormatConfig(inst));
+			$(altField).each(function() { $(this).val(dateStr); });
+		}
+	},
+
+	/* Set as beforeShowDay function to prevent selection of weekends.
+	 * @param  date  Date - the date to customise
+	 * @return [boolean, string] - is this date selectable?, what is its CSS class?
+	 */
+	noWeekends: function(date) {
+		var day = date.getDay();
+		return [(day > 0 && day < 6), ""];
+	},
+
+	/* Set as calculateWeek to determine the week of the year based on the ISO 8601 definition.
+	 * @param  date  Date - the date to get the week for
+	 * @return  number - the number of the week within the year that contains this date
+	 */
+	iso8601Week: function(date) {
+		var time,
+			checkDate = new Date(date.getTime());
+
+		// Find Thursday of this week starting on Monday
+		checkDate.setDate(checkDate.getDate() + 4 - (checkDate.getDay() || 7));
+
+		time = checkDate.getTime();
+		checkDate.setMonth(0); // Compare with Jan 1
+		checkDate.setDate(1);
+		return Math.floor(Math.round((time - checkDate) / 86400000) / 7) + 1;
+	},
+
+	/* Parse a string value into a date object.
+	 * See formatDate below for the possible formats.
+	 *
+	 * @param  format string - the expected format of the date
+	 * @param  value string - the date in the above format
+	 * @param  settings Object - attributes include:
+	 *					shortYearCutoff  number - the cutoff year for determining the century (optional)
+	 *					dayNamesShort	string[7] - abbreviated names of the days from Sunday (optional)
+	 *					dayNames		string[7] - names of the days from Sunday (optional)
+	 *					monthNamesShort string[12] - abbreviated names of the months (optional)
+	 *					monthNames		string[12] - names of the months (optional)
+	 * @return  Date - the extracted date value or null if value is blank
+	 */
+	parseDate: function (format, value, settings) {
+		if (format == null || value == null) {
+			throw "Invalid arguments";
+		}
+
+		value = (typeof value === "object" ? value.toString() : value + "");
+		if (value === "") {
+			return null;
+		}
+
+		var iFormat, dim, extra,
+			iValue = 0,
+			shortYearCutoffTemp = (settings ? settings.shortYearCutoff : null) || this._defaults.shortYearCutoff,
+			shortYearCutoff = (typeof shortYearCutoffTemp !== "string" ? shortYearCutoffTemp :
+				new Date().getFullYear() % 100 + parseInt(shortYearCutoffTemp, 10)),
+			dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort,
+			dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames,
+			monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort,
+			monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames,
+			year = -1,
+			month = -1,
+			day = -1,
+			doy = -1,
+			literal = false,
+			date,
+			// Check whether a format character is doubled
+			lookAhead = function(match) {
+				var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match);
+				if (matches) {
+					iFormat++;
+				}
+				return matches;
+			},
+			// Extract a number from the string value
+			getNumber = function(match) {
+				var isDoubled = lookAhead(match),
+					size = (match === "@" ? 14 : (match === "!" ? 20 :
+					(match === "y" && isDoubled ? 4 : (match === "o" ? 3 : 2)))),
+					digits = new RegExp("^\\d{1," + size + "}"),
+					num = value.substring(iValue).match(digits);
+				if (!num) {
+					throw "Missing number at position " + iValue;
+				}
+				iValue += num[0].length;
+				return parseInt(num[0], 10);
+			},
+			// Extract a name from the string value and convert to an index
+			getName = function(match, shortNames, longNames) {
+				var index = -1,
+					names = $.map(lookAhead(match) ? longNames : shortNames, function (v, k) {
+						return [ [k, v] ];
+					}).sort(function (a, b) {
+						return -(a[1].length - b[1].length);
+					});
+
+				$.each(names, function (i, pair) {
+					var name = pair[1];
+					if (value.substr(iValue, name.length).toLowerCase() === name.toLowerCase()) {
+						index = pair[0];
+						iValue += name.length;
+						return false;
+					}
+				});
+				if (index !== -1) {
+					return index + 1;
+				} else {
+					throw "Unknown name at position " + iValue;
+				}
+			},
+			// Confirm that a literal character matches the string value
+			checkLiteral = function() {
+				if (value.charAt(iValue) !== format.charAt(iFormat)) {
+					throw "Unexpected literal at position " + iValue;
+				}
+				iValue++;
+			};
+
+		for (iFormat = 0; iFormat < format.length; iFormat++) {
+			if (literal) {
+				if (format.charAt(iFormat) === "'" && !lookAhead("'")) {
+					literal = false;
+				} else {
+					checkLiteral();
+				}
+			} else {
+				switch (format.charAt(iFormat)) {
+					case "d":
+						day = getNumber("d");
+						break;
+					case "D":
+						getName("D", dayNamesShort, dayNames);
+						break;
+					case "o":
+						doy = getNumber("o");
+						break;
+					case "m":
+						month = getNumber("m");
+						break;
+					case "M":
+						month = getName("M", monthNamesShort, monthNames);
+						break;
+					case "y":
+						year = getNumber("y");
+						break;
+					case "@":
+						date = new Date(getNumber("@"));
+						year = date.getFullYear();
+						month = date.getMonth() + 1;
+						day = date.getDate();
+						break;
+					case "!":
+						date = new Date((getNumber("!") - this._ticksTo1970) / 10000);
+						year = date.getFullYear();
+						month = date.getMonth() + 1;
+						day = date.getDate();
+						break;
+					case "'":
+						if (lookAhead("'")){
+							checkLiteral();
+						} else {
+							literal = true;
+						}
+						break;
+					default:
+						checkLiteral();
+				}
+			}
+		}
+
+		if (iValue < value.length){
+			extra = value.substr(iValue);
+			if (!/^\s+/.test(extra)) {
+				throw "Extra/unparsed characters found in date: " + extra;
+			}
+		}
+
+		if (year === -1) {
+			year = new Date().getFullYear();
+		} else if (year < 100) {
+			year += new Date().getFullYear() - new Date().getFullYear() % 100 +
+				(year <= shortYearCutoff ? 0 : -100);
+		}
+
+		if (doy > -1) {
+			month = 1;
+			day = doy;
+			do {
+				dim = this._getDaysInMonth(year, month - 1);
+				if (day <= dim) {
+					break;
+				}
+				month++;
+				day -= dim;
+			} while (true);
+		}
+
+		date = this._daylightSavingAdjust(new Date(year, month - 1, day));
+		if (date.getFullYear() !== year || date.getMonth() + 1 !== month || date.getDate() !== day) {
+			throw "Invalid date"; // E.g. 31/02/00
+		}
+		return date;
+	},
+
+	/* Standard date formats. */
+	ATOM: "yy-mm-dd", // RFC 3339 (ISO 8601)
+	COOKIE: "D, dd M yy",
+	ISO_8601: "yy-mm-dd",
+	RFC_822: "D, d M y",
+	RFC_850: "DD, dd-M-y",
+	RFC_1036: "D, d M y",
+	RFC_1123: "D, d M yy",
+	RFC_2822: "D, d M yy",
+	RSS: "D, d M y", // RFC 822
+	TICKS: "!",
+	TIMESTAMP: "@",
+	W3C: "yy-mm-dd", // ISO 8601
+
+	_ticksTo1970: (((1970 - 1) * 365 + Math.floor(1970 / 4) - Math.floor(1970 / 100) +
+		Math.floor(1970 / 400)) * 24 * 60 * 60 * 10000000),
+
+	/* Format a date object into a string value.
+	 * The format can be combinations of the following:
+	 * d  - day of month (no leading zero)
+	 * dd - day of month (two digit)
+	 * o  - day of year (no leading zeros)
+	 * oo - day of year (three digit)
+	 * D  - day name short
+	 * DD - day name long
+	 * m  - month of year (no leading zero)
+	 * mm - month of year (two digit)
+	 * M  - month name short
+	 * MM - month name long
+	 * y  - year (two digit)
+	 * yy - year (four digit)
+	 * @ - Unix timestamp (ms since 01/01/1970)
+	 * ! - Windows ticks (100ns since 01/01/0001)
+	 * "..." - literal text
+	 * '' - single quote
+	 *
+	 * @param  format string - the desired format of the date
+	 * @param  date Date - the date value to format
+	 * @param  settings Object - attributes include:
+	 *					dayNamesShort	string[7] - abbreviated names of the days from Sunday (optional)
+	 *					dayNames		string[7] - names of the days from Sunday (optional)
+	 *					monthNamesShort string[12] - abbreviated names of the months (optional)
+	 *					monthNames		string[12] - names of the months (optional)
+	 * @return  string - the date in the above format
+	 */
+	formatDate: function (format, date, settings) {
+		if (!date) {
+			return "";
+		}
+
+		var iFormat,
+			dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort,
+			dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames,
+			monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort,
+			monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames,
+			// Check whether a format character is doubled
+			lookAhead = function(match) {
+				var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match);
+				if (matches) {
+					iFormat++;
+				}
+				return matches;
+			},
+			// Format a number, with leading zero if necessary
+			formatNumber = function(match, value, len) {
+				var num = "" + value;
+				if (lookAhead(match)) {
+					while (num.length < len) {
+						num = "0" + num;
+					}
+				}
+				return num;
+			},
+			// Format a name, short or long as requested
+			formatName = function(match, value, shortNames, longNames) {
+				return (lookAhead(match) ? longNames[value] : shortNames[value]);
+			},
+			output = "",
+			literal = false;
+
+		if (date) {
+			for (iFormat = 0; iFormat < format.length; iFormat++) {
+				if (literal) {
+					if (format.charAt(iFormat) === "'" && !lookAhead("'")) {
+						literal = false;
+					} else {
+						output += format.charAt(iFormat);
+					}
+				} else {
+					switch (format.charAt(iFormat)) {
+						case "d":
+							output += formatNumber("d", date.getDate(), 2);
+							break;
+						case "D":
+							output += formatName("D", date.getDay(), dayNamesShort, dayNames);
+							break;
+						case "o":
+							output += formatNumber("o",
+								Math.round((new Date(date.getFullYear(), date.getMonth(), date.getDate()).getTime() - new Date(date.getFullYear(), 0, 0).getTime()) / 86400000), 3);
+							break;
+						case "m":
+							output += formatNumber("m", date.getMonth() + 1, 2);
+							break;
+						case "M":
+							output += formatName("M", date.getMonth(), monthNamesShort, monthNames);
+							break;
+						case "y":
+							output += (lookAhead("y") ? date.getFullYear() :
+								(date.getYear() % 100 < 10 ? "0" : "") + date.getYear() % 100);
+							break;
+						case "@":
+							output += date.getTime();
+							break;
+						case "!":
+							output += date.getTime() * 10000 + this._ticksTo1970;
+							break;
+						case "'":
+							if (lookAhead("'")) {
+								output += "'";
+							} else {
+								literal = true;
+							}
+							break;
+						default:
+							output += format.charAt(iFormat);
+					}
+				}
+			}
+		}
+		return output;
+	},
+
+	/* Extract all possible characters from the date format. */
+	_possibleChars: function (format) {
+		var iFormat,
+			chars = "",
+			literal = false,
+			// Check whether a format character is doubled
+			lookAhead = function(match) {
+				var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match);
+				if (matches) {
+					iFormat++;
+				}
+				return matches;
+			};
+
+		for (iFormat = 0; iFormat < format.length; iFormat++) {
+			if (literal) {
+				if (format.charAt(iFormat) === "'" && !lookAhead("'")) {
+					literal = false;
+				} else {
+					chars += format.charAt(iFormat);
+				}
+			} else {
+				switch (format.charAt(iFormat)) {
+					case "d": case "m": case "y": case "@":
+						chars += "0123456789";
+						break;
+					case "D": case "M":
+						return null; // Accept anything
+					case "'":
+						if (lookAhead("'")) {
+							chars += "'";
+						} else {
+							literal = true;
+						}
+						break;
+					default:
+						chars += format.charAt(iFormat);
+				}
+			}
+		}
+		return chars;
+	},
+
+	/* Get a setting value, defaulting if necessary. */
+	_get: function(inst, name) {
+		return inst.settings[name] !== undefined ?
+			inst.settings[name] : this._defaults[name];
+	},
+
+	/* Parse existing date and initialise date picker. */
+	_setDateFromField: function(inst, noDefault) {
+		if (inst.input.val() === inst.lastVal) {
+			return;
+		}
+
+		var dateFormat = this._get(inst, "dateFormat"),
+			dates = inst.lastVal = inst.input ? inst.input.val() : null,
+			defaultDate = this._getDefaultDate(inst),
+			date = defaultDate,
+			settings = this._getFormatConfig(inst);
+
+		try {
+			date = this.parseDate(dateFormat, dates, settings) || defaultDate;
+		} catch (event) {
+			dates = (noDefault ? "" : dates);
+		}
+		inst.selectedDay = date.getDate();
+		inst.drawMonth = inst.selectedMonth = date.getMonth();
+		inst.drawYear = inst.selectedYear = date.getFullYear();
+		inst.currentDay = (dates ? date.getDate() : 0);
+		inst.currentMonth = (dates ? date.getMonth() : 0);
+		inst.currentYear = (dates ? date.getFullYear() : 0);
+		this._adjustInstDate(inst);
+	},
+
+	/* Retrieve the default date shown on opening. */
+	_getDefaultDate: function(inst) {
+		return this._restrictMinMax(inst,
+			this._determineDate(inst, this._get(inst, "defaultDate"), new Date()));
+	},
+
+	/* A date may be specified as an exact value or a relative one. */
+	_determineDate: function(inst, date, defaultDate) {
+		var offsetNumeric = function(offset) {
+				var date = new Date();
+				date.setDate(date.getDate() + offset);
+				return date;
+			},
+			offsetString = function(offset) {
+				try {
+					return $.datepicker.parseDate($.datepicker._get(inst, "dateFormat"),
+						offset, $.datepicker._getFormatConfig(inst));
+				}
+				catch (e) {
+					// Ignore
+				}
+
+				var date = (offset.toLowerCase().match(/^c/) ?
+					$.datepicker._getDate(inst) : null) || new Date(),
+					year = date.getFullYear(),
+					month = date.getMonth(),
+					day = date.getDate(),
+					pattern = /([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,
+					matches = pattern.exec(offset);
+
+				while (matches) {
+					switch (matches[2] || "d") {
+						case "d" : case "D" :
+							day += parseInt(matches[1],10); break;
+						case "w" : case "W" :
+							day += parseInt(matches[1],10) * 7; break;
+						case "m" : case "M" :
+							month += parseInt(matches[1],10);
+							day = Math.min(day, $.datepicker._getDaysInMonth(year, month));
+							break;
+						case "y": case "Y" :
+							year += parseInt(matches[1],10);
+							day = Math.min(day, $.datepicker._getDaysInMonth(year, month));
+							break;
+					}
+					matches = pattern.exec(offset);
+				}
+				return new Date(year, month, day);
+			},
+			newDate = (date == null || date === "" ? defaultDate : (typeof date === "string" ? offsetString(date) :
+				(typeof date === "number" ? (isNaN(date) ? defaultDate : offsetNumeric(date)) : new Date(date.getTime()))));
+
+		newDate = (newDate && newDate.toString() === "Invalid Date" ? defaultDate : newDate);
+		if (newDate) {
+			newDate.setHours(0);
+			newDate.setMinutes(0);
+			newDate.setSeconds(0);
+			newDate.setMilliseconds(0);
+		}
+		return this._daylightSavingAdjust(newDate);
+	},
+
+	/* Handle switch to/from daylight saving.
+	 * Hours may be non-zero on daylight saving cut-over:
+	 * > 12 when midnight changeover, but then cannot generate
+	 * midnight datetime, so jump to 1AM, otherwise reset.
+	 * @param  date  (Date) the date to check
+	 * @return  (Date) the corrected date
+	 */
+	_daylightSavingAdjust: function(date) {
+		if (!date) {
+			return null;
+		}
+		date.setHours(date.getHours() > 12 ? date.getHours() + 2 : 0);
+		return date;
+	},
+
+	/* Set the date(s) directly. */
+	_setDate: function(inst, date, noChange) {
+		var clear = !date,
+			origMonth = inst.selectedMonth,
+			origYear = inst.selectedYear,
+			newDate = this._restrictMinMax(inst, this._determineDate(inst, date, new Date()));
+
+		inst.selectedDay = inst.currentDay = newDate.getDate();
+		inst.drawMonth = inst.selectedMonth = inst.currentMonth = newDate.getMonth();
+		inst.drawYear = inst.selectedYear = inst.currentYear = newDate.getFullYear();
+		if ((origMonth !== inst.selectedMonth || origYear !== inst.selectedYear) && !noChange) {
+			this._notifyChange(inst);
+		}
+		this._adjustInstDate(inst);
+		if (inst.input) {
+			inst.input.val(clear ? "" : this._formatDate(inst));
+		}
+	},
+
+	/* Retrieve the date(s) directly. */
+	_getDate: function(inst) {
+		var startDate = (!inst.currentYear || (inst.input && inst.input.val() === "") ? null :
+			this._daylightSavingAdjust(new Date(
+			inst.currentYear, inst.currentMonth, inst.currentDay)));
+			return startDate;
+	},
+
+	/* Attach the onxxx handlers.  These are declared statically so
+	 * they work with static code transformers like Caja.
+	 */
+	_attachHandlers: function(inst) {
+		var stepMonths = this._get(inst, "stepMonths"),
+			id = "#" + inst.id.replace( /\\\\/g, "\\" );
+		inst.dpDiv.find("[data-handler]").map(function () {
+			var handler = {
+				prev: function () {
+					$.datepicker._adjustDate(id, -stepMonths, "M");
+				},
+				next: function () {
+					$.datepicker._adjustDate(id, +stepMonths, "M");
+				},
+				hide: function () {
+					$.datepicker._hideDatepicker();
+				},
+				today: function () {
+					$.datepicker._gotoToday(id);
+				},
+				selectDay: function () {
+					$.datepicker._selectDay(id, +this.getAttribute("data-month"), +this.getAttribute("data-year"), this);
+					return false;
+				},
+				selectMonth: function () {
+					$.datepicker._selectMonthYear(id, this, "M");
+					return false;
+				},
+				selectYear: function () {
+					$.datepicker._selectMonthYear(id, this, "Y");
+					return false;
+				}
+			};
+			$(this).bind(this.getAttribute("data-event"), handler[this.getAttribute("data-handler")]);
+		});
+	},
+
+	/* Generate the HTML for the current state of the date picker. */
+	_generateHTML: function(inst) {
+		var maxDraw, prevText, prev, nextText, next, currentText, gotoDate,
+			controls, buttonPanel, firstDay, showWeek, dayNames, dayNamesMin,
+			monthNames, monthNamesShort, beforeShowDay, showOtherMonths,
+			selectOtherMonths, defaultDate, html, dow, row, group, col, selectedDate,
+			cornerClass, calender, thead, day, daysInMonth, leadDays, curRows, numRows,
+			printDate, dRow, tbody, daySettings, otherMonth, unselectable,
+			tempDate = new Date(),
+			today = this._daylightSavingAdjust(
+				new Date(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate())), // clear time
+			isRTL = this._get(inst, "isRTL"),
+			showButtonPanel = this._get(inst, "showButtonPanel"),
+			hideIfNoPrevNext = this._get(inst, "hideIfNoPrevNext"),
+			navigationAsDateFormat = this._get(inst, "navigationAsDateFormat"),
+			numMonths = this._getNumberOfMonths(inst),
+			showCurrentAtPos = this._get(inst, "showCurrentAtPos"),
+			stepMonths = this._get(inst, "stepMonths"),
+			isMultiMonth = (numMonths[0] !== 1 || numMonths[1] !== 1),
+			currentDate = this._daylightSavingAdjust((!inst.currentDay ? new Date(9999, 9, 9) :
+				new Date(inst.currentYear, inst.currentMonth, inst.currentDay))),
+			minDate = this._getMinMaxDate(inst, "min"),
+			maxDate = this._getMinMaxDate(inst, "max"),
+			drawMonth = inst.drawMonth - showCurrentAtPos,
+			drawYear = inst.drawYear;
+
+		if (drawMonth < 0) {
+			drawMonth += 12;
+			drawYear--;
+		}
+		if (maxDate) {
+			maxDraw = this._daylightSavingAdjust(new Date(maxDate.getFullYear(),
+				maxDate.getMonth() - (numMonths[0] * numMonths[1]) + 1, maxDate.getDate()));
+			maxDraw = (minDate && maxDraw < minDate ? minDate : maxDraw);
+			while (this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1)) > maxDraw) {
+				drawMonth--;
+				if (drawMonth < 0) {
+					drawMonth = 11;
+					drawYear--;
+				}
+			}
+		}
+		inst.drawMonth = drawMonth;
+		inst.drawYear = drawYear;
+
+		prevText = this._get(inst, "prevText");
+		prevText = (!navigationAsDateFormat ? prevText : this.formatDate(prevText,
+			this._daylightSavingAdjust(new Date(drawYear, drawMonth - stepMonths, 1)),
+			this._getFormatConfig(inst)));
+
+		prev = (this._canAdjustMonth(inst, -1, drawYear, drawMonth) ?
+			"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click'" +
+			" title='" + prevText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "e" : "w") + "'>" + prevText + "</span></a>" :
+			(hideIfNoPrevNext ? "" : "<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='"+ prevText +"'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "e" : "w") + "'>" + prevText + "</span></a>"));
+
+		nextText = this._get(inst, "nextText");
+		nextText = (!navigationAsDateFormat ? nextText : this.formatDate(nextText,
+			this._daylightSavingAdjust(new Date(drawYear, drawMonth + stepMonths, 1)),
+			this._getFormatConfig(inst)));
+
+		next = (this._canAdjustMonth(inst, +1, drawYear, drawMonth) ?
+			"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click'" +
+			" title='" + nextText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "w" : "e") + "'>" + nextText + "</span></a>" :
+			(hideIfNoPrevNext ? "" : "<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='"+ nextText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "w" : "e") + "'>" + nextText + "</span></a>"));
+
+		currentText = this._get(inst, "currentText");
+		gotoDate = (this._get(inst, "gotoCurrent") && inst.currentDay ? currentDate : today);
+		currentText = (!navigationAsDateFormat ? currentText :
+			this.formatDate(currentText, gotoDate, this._getFormatConfig(inst)));
+
+		controls = (!inst.inline ? "<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>" +
+			this._get(inst, "closeText") + "</button>" : "");
+
+		buttonPanel = (showButtonPanel) ? "<div class='ui-datepicker-buttonpane ui-widget-content'>" + (isRTL ? controls : "") +
+			(this._isInRange(inst, gotoDate) ? "<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'" +
+			">" + currentText + "</button>" : "") + (isRTL ? "" : controls) + "</div>" : "";
+
+		firstDay = parseInt(this._get(inst, "firstDay"),10);
+		firstDay = (isNaN(firstDay) ? 0 : firstDay);
+
+		showWeek = this._get(inst, "showWeek");
+		dayNames = this._get(inst, "dayNames");
+		dayNamesMin = this._get(inst, "dayNamesMin");
+		monthNames = this._get(inst, "monthNames");
+		monthNamesShort = this._get(inst, "monthNamesShort");
+		beforeShowDay = this._get(inst, "beforeShowDay");
+		showOtherMonths = this._get(inst, "showOtherMonths");
+		selectOtherMonths = this._get(inst, "selectOtherMonths");
+		defaultDate = this._getDefaultDate(inst);
+		html = "";
+		dow;
+		for (row = 0; row < numMonths[0]; row++) {
+			group = "";
+			this.maxRows = 4;
+			for (col = 0; col < numMonths[1]; col++) {
+				selectedDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, inst.selectedDay));
+				cornerClass = " ui-corner-all";
+				calender = "";
+				if (isMultiMonth) {
+					calender += "<div class='ui-datepicker-group";
+					if (numMonths[1] > 1) {
+						switch (col) {
+							case 0: calender += " ui-datepicker-group-first";
+								cornerClass = " ui-corner-" + (isRTL ? "right" : "left"); break;
+							case numMonths[1]-1: calender += " ui-datepicker-group-last";
+								cornerClass = " ui-corner-" + (isRTL ? "left" : "right"); break;
+							default: calender += " ui-datepicker-group-middle"; cornerClass = ""; break;
+						}
+					}
+					calender += "'>";
+				}
+				calender += "<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix" + cornerClass + "'>" +
+					(/all|left/.test(cornerClass) && row === 0 ? (isRTL ? next : prev) : "") +
+					(/all|right/.test(cornerClass) && row === 0 ? (isRTL ? prev : next) : "") +
+					this._generateMonthYearHeader(inst, drawMonth, drawYear, minDate, maxDate,
+					row > 0 || col > 0, monthNames, monthNamesShort) + // draw month headers
+					"</div><table class='ui-datepicker-calendar'><thead>" +
+					"<tr>";
+				thead = (showWeek ? "<th class='ui-datepicker-week-col'>" + this._get(inst, "weekHeader") + "</th>" : "");
+				for (dow = 0; dow < 7; dow++) { // days of the week
+					day = (dow + firstDay) % 7;
+					thead += "<th" + ((dow + firstDay + 6) % 7 >= 5 ? " class='ui-datepicker-week-end'" : "") + ">" +
+						"<span title='" + dayNames[day] + "'>" + dayNamesMin[day] + "</span></th>";
+				}
+				calender += thead + "</tr></thead><tbody>";
+				daysInMonth = this._getDaysInMonth(drawYear, drawMonth);
+				if (drawYear === inst.selectedYear && drawMonth === inst.selectedMonth) {
+					inst.selectedDay = Math.min(inst.selectedDay, daysInMonth);
+				}
+				leadDays = (this._getFirstDayOfMonth(drawYear, drawMonth) - firstDay + 7) % 7;
+				curRows = Math.ceil((leadDays + daysInMonth) / 7); // calculate the number of rows to generate
+				numRows = (isMultiMonth ? this.maxRows > curRows ? this.maxRows : curRows : curRows); //If multiple months, use the higher number of rows (see #7043)
+				this.maxRows = numRows;
+				printDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1 - leadDays));
+				for (dRow = 0; dRow < numRows; dRow++) { // create date picker rows
+					calender += "<tr>";
+					tbody = (!showWeek ? "" : "<td class='ui-datepicker-week-col'>" +
+						this._get(inst, "calculateWeek")(printDate) + "</td>");
+					for (dow = 0; dow < 7; dow++) { // create date picker days
+						daySettings = (beforeShowDay ?
+							beforeShowDay.apply((inst.input ? inst.input[0] : null), [printDate]) : [true, ""]);
+						otherMonth = (printDate.getMonth() !== drawMonth);
+						unselectable = (otherMonth && !selectOtherMonths) || !daySettings[0] ||
+							(minDate && printDate < minDate) || (maxDate && printDate > maxDate);
+						tbody += "<td class='" +
+							((dow + firstDay + 6) % 7 >= 5 ? " ui-datepicker-week-end" : "") + // highlight weekends
+							(otherMonth ? " ui-datepicker-other-month" : "") + // highlight days from other months
+							((printDate.getTime() === selectedDate.getTime() && drawMonth === inst.selectedMonth && inst._keyEvent) || // user pressed key
+							(defaultDate.getTime() === printDate.getTime() && defaultDate.getTime() === selectedDate.getTime()) ?
+							// or defaultDate is current printedDate and defaultDate is selectedDate
+							" " + this._dayOverClass : "") + // highlight selected day
+							(unselectable ? " " + this._unselectableClass + " ui-state-disabled": "") +  // highlight unselectable days
+							(otherMonth && !showOtherMonths ? "" : " " + daySettings[1] + // highlight custom dates
+							(printDate.getTime() === currentDate.getTime() ? " " + this._currentClass : "") + // highlight selected day
+							(printDate.getTime() === today.getTime() ? " ui-datepicker-today" : "")) + "'" + // highlight today (if different)
+							((!otherMonth || showOtherMonths) && daySettings[2] ? " title='" + daySettings[2].replace(/'/g, "&#39;") + "'" : "") + // cell title
+							(unselectable ? "" : " data-handler='selectDay' data-event='click' data-month='" + printDate.getMonth() + "' data-year='" + printDate.getFullYear() + "'") + ">" + // actions
+							(otherMonth && !showOtherMonths ? "&#xa0;" : // display for other months
+							(unselectable ? "<span class='ui-state-default'>" + printDate.getDate() + "</span>" : "<a class='ui-state-default" +
+							(printDate.getTime() === today.getTime() ? " ui-state-highlight" : "") +
+							(printDate.getTime() === currentDate.getTime() ? " ui-state-active" : "") + // highlight selected day
+							(otherMonth ? " ui-priority-secondary" : "") + // distinguish dates from other months
+							"' href='#'>" + printDate.getDate() + "</a>")) + "</td>"; // display selectable date
+						printDate.setDate(printDate.getDate() + 1);
+						printDate = this._daylightSavingAdjust(printDate);
+					}
+					calender += tbody + "</tr>";
+				}
+				drawMonth++;
+				if (drawMonth > 11) {
+					drawMonth = 0;
+					drawYear++;
+				}
+				calender += "</tbody></table>" + (isMultiMonth ? "</div>" +
+							((numMonths[0] > 0 && col === numMonths[1]-1) ? "<div class='ui-datepicker-row-break'></div>" : "") : "");
+				group += calender;
+			}
+			html += group;
+		}
+		html += buttonPanel;
+		inst._keyEvent = false;
+		return html;
+	},
+
+	/* Generate the month and year header. */
+	_generateMonthYearHeader: function(inst, drawMonth, drawYear, minDate, maxDate,
+			secondary, monthNames, monthNamesShort) {
+
+		var inMinYear, inMaxYear, month, years, thisYear, determineYear, year, endYear,
+			changeMonth = this._get(inst, "changeMonth"),
+			changeYear = this._get(inst, "changeYear"),
+			showMonthAfterYear = this._get(inst, "showMonthAfterYear"),
+			html = "<div class='ui-datepicker-title'>",
+			monthHtml = "";
+
+		// month selection
+		if (secondary || !changeMonth) {
+			monthHtml += "<span class='ui-datepicker-month'>" + monthNames[drawMonth] + "</span>";
+		} else {
+			inMinYear = (minDate && minDate.getFullYear() === drawYear);
+			inMaxYear = (maxDate && maxDate.getFullYear() === drawYear);
+			monthHtml += "<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>";
+			for ( month = 0; month < 12; month++) {
+				if ((!inMinYear || month >= minDate.getMonth()) && (!inMaxYear || month <= maxDate.getMonth())) {
+					monthHtml += "<option value='" + month + "'" +
+						(month === drawMonth ? " selected='selected'" : "") +
+						">" + monthNamesShort[month] + "</option>";
+				}
+			}
+			monthHtml += "</select>";
+		}
+
+		if (!showMonthAfterYear) {
+			html += monthHtml + (secondary || !(changeMonth && changeYear) ? "&#xa0;" : "");
+		}
+
+		// year selection
+		if ( !inst.yearshtml ) {
+			inst.yearshtml = "";
+			if (secondary || !changeYear) {
+				html += "<span class='ui-datepicker-year'>" + drawYear + "</span>";
+			} else {
+				// determine range of years to display
+				years = this._get(inst, "yearRange").split(":");
+				thisYear = new Date().getFullYear();
+				determineYear = function(value) {
+					var year = (value.match(/c[+\-].*/) ? drawYear + parseInt(value.substring(1), 10) :
+						(value.match(/[+\-].*/) ? thisYear + parseInt(value, 10) :
+						parseInt(value, 10)));
+					return (isNaN(year) ? thisYear : year);
+				};
+				year = determineYear(years[0]);
+				endYear = Math.max(year, determineYear(years[1] || ""));
+				year = (minDate ? Math.max(year, minDate.getFullYear()) : year);
+				endYear = (maxDate ? Math.min(endYear, maxDate.getFullYear()) : endYear);
+				inst.yearshtml += "<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";
+				for (; year <= endYear; year++) {
+					inst.yearshtml += "<option value='" + year + "'" +
+						(year === drawYear ? " selected='selected'" : "") +
+						">" + year + "</option>";
+				}
+				inst.yearshtml += "</select>";
+
+				html += inst.yearshtml;
+				inst.yearshtml = null;
+			}
+		}
+
+		html += this._get(inst, "yearSuffix");
+		if (showMonthAfterYear) {
+			html += (secondary || !(changeMonth && changeYear) ? "&#xa0;" : "") + monthHtml;
+		}
+		html += "</div>"; // Close datepicker_header
+		return html;
+	},
+
+	/* Adjust one of the date sub-fields. */
+	_adjustInstDate: function(inst, offset, period) {
+		var year = inst.drawYear + (period === "Y" ? offset : 0),
+			month = inst.drawMonth + (period === "M" ? offset : 0),
+			day = Math.min(inst.selectedDay, this._getDaysInMonth(year, month)) + (period === "D" ? offset : 0),
+			date = this._restrictMinMax(inst, this._daylightSavingAdjust(new Date(year, month, day)));
+
+		inst.selectedDay = date.getDate();
+		inst.drawMonth = inst.selectedMonth = date.getMonth();
+		inst.drawYear = inst.selectedYear = date.getFullYear();
+		if (period === "M" || period === "Y") {
+			this._notifyChange(inst);
+		}
+	},
+
+	/* Ensure a date is within any min/max bounds. */
+	_restrictMinMax: function(inst, date) {
+		var minDate = this._getMinMaxDate(inst, "min"),
+			maxDate = this._getMinMaxDate(inst, "max"),
+			newDate = (minDate && date < minDate ? minDate : date);
+		return (maxDate && newDate > maxDate ? maxDate : newDate);
+	},
+
+	/* Notify change of month/year. */
+	_notifyChange: function(inst) {
+		var onChange = this._get(inst, "onChangeMonthYear");
+		if (onChange) {
+			onChange.apply((inst.input ? inst.input[0] : null),
+				[inst.selectedYear, inst.selectedMonth + 1, inst]);
+		}
+	},
+
+	/* Determine the number of months to show. */
+	_getNumberOfMonths: function(inst) {
+		var numMonths = this._get(inst, "numberOfMonths");
+		return (numMonths == null ? [1, 1] : (typeof numMonths === "number" ? [1, numMonths] : numMonths));
+	},
+
+	/* Determine the current maximum date - ensure no time components are set. */
+	_getMinMaxDate: function(inst, minMax) {
+		return this._determineDate(inst, this._get(inst, minMax + "Date"), null);
+	},
+
+	/* Find the number of days in a given month. */
+	_getDaysInMonth: function(year, month) {
+		return 32 - this._daylightSavingAdjust(new Date(year, month, 32)).getDate();
+	},
+
+	/* Find the day of the week of the first of a month. */
+	_getFirstDayOfMonth: function(year, month) {
+		return new Date(year, month, 1).getDay();
+	},
+
+	/* Determines if we should allow a "next/prev" month display change. */
+	_canAdjustMonth: function(inst, offset, curYear, curMonth) {
+		var numMonths = this._getNumberOfMonths(inst),
+			date = this._daylightSavingAdjust(new Date(curYear,
+			curMonth + (offset < 0 ? offset : numMonths[0] * numMonths[1]), 1));
+
+		if (offset < 0) {
+			date.setDate(this._getDaysInMonth(date.getFullYear(), date.getMonth()));
+		}
+		return this._isInRange(inst, date);
+	},
+
+	/* Is the given date in the accepted range? */
+	_isInRange: function(inst, date) {
+		var yearSplit, currentYear,
+			minDate = this._getMinMaxDate(inst, "min"),
+			maxDate = this._getMinMaxDate(inst, "max"),
+			minYear = null,
+			maxYear = null,
+			years = this._get(inst, "yearRange");
+			if (years){
+				yearSplit = years.split(":");
+				currentYear = new Date().getFullYear();
+				minYear = parseInt(yearSplit[0], 10);
+				maxYear = parseInt(yearSplit[1], 10);
+				if ( yearSplit[0].match(/[+\-].*/) ) {
+					minYear += currentYear;
+				}
+				if ( yearSplit[1].match(/[+\-].*/) ) {
+					maxYear += currentYear;
+				}
+			}
+
+		return ((!minDate || date.getTime() >= minDate.getTime()) &&
+			(!maxDate || date.getTime() <= maxDate.getTime()) &&
+			(!minYear || date.getFullYear() >= minYear) &&
+			(!maxYear || date.getFullYear() <= maxYear));
+	},
+
+	/* Provide the configuration settings for formatting/parsing. */
+	_getFormatConfig: function(inst) {
+		var shortYearCutoff = this._get(inst, "shortYearCutoff");
+		shortYearCutoff = (typeof shortYearCutoff !== "string" ? shortYearCutoff :
+			new Date().getFullYear() % 100 + parseInt(shortYearCutoff, 10));
+		return {shortYearCutoff: shortYearCutoff,
+			dayNamesShort: this._get(inst, "dayNamesShort"), dayNames: this._get(inst, "dayNames"),
+			monthNamesShort: this._get(inst, "monthNamesShort"), monthNames: this._get(inst, "monthNames")};
+	},
+
+	/* Format the given date for display. */
+	_formatDate: function(inst, day, month, year) {
+		if (!day) {
+			inst.currentDay = inst.selectedDay;
+			inst.currentMonth = inst.selectedMonth;
+			inst.currentYear = inst.selectedYear;
+		}
+		var date = (day ? (typeof day === "object" ? day :
+			this._daylightSavingAdjust(new Date(year, month, day))) :
+			this._daylightSavingAdjust(new Date(inst.currentYear, inst.currentMonth, inst.currentDay)));
+		return this.formatDate(this._get(inst, "dateFormat"), date, this._getFormatConfig(inst));
+	}
+});
+
+/*
+ * Bind hover events for datepicker elements.
+ * Done via delegate so the binding only occurs once in the lifetime of the parent div.
+ * Global instActive, set by _updateDatepicker allows the handlers to find their way back to the active picker.
+ */
+function bindHover(dpDiv) {
+	var selector = "button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";
+	return dpDiv.delegate(selector, "mouseout", function() {
+			$(this).removeClass("ui-state-hover");
+			if (this.className.indexOf("ui-datepicker-prev") !== -1) {
+				$(this).removeClass("ui-datepicker-prev-hover");
+			}
+			if (this.className.indexOf("ui-datepicker-next") !== -1) {
+				$(this).removeClass("ui-datepicker-next-hover");
+			}
+		})
+		.delegate(selector, "mouseover", function(){
+			if (!$.datepicker._isDisabledDatepicker( instActive.inline ? dpDiv.parent()[0] : instActive.input[0])) {
+				$(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");
+				$(this).addClass("ui-state-hover");
+				if (this.className.indexOf("ui-datepicker-prev") !== -1) {
+					$(this).addClass("ui-datepicker-prev-hover");
+				}
+				if (this.className.indexOf("ui-datepicker-next") !== -1) {
+					$(this).addClass("ui-datepicker-next-hover");
+				}
+			}
+		});
+}
+
+/* jQuery extend now ignores nulls! */
+function extendRemove(target, props) {
+	$.extend(target, props);
+	for (var name in props) {
+		if (props[name] == null) {
+			target[name] = props[name];
+		}
+	}
+	return target;
+}
+
+/* Invoke the datepicker functionality.
+   @param  options  string - a command, optionally followed by additional parameters or
+					Object - settings for attaching new datepicker functionality
+   @return  jQuery object */
+$.fn.datepicker = function(options){
+
+	/* Verify an empty collection wasn't passed - Fixes #6976 */
+	if ( !this.length ) {
+		return this;
+	}
+
+	/* Initialise the date picker. */
+	if (!$.datepicker.initialized) {
+		$(document).mousedown($.datepicker._checkExternalClick);
+		$.datepicker.initialized = true;
+	}
+
+	/* Append datepicker main container to body if not exist. */
+	if ($("#"+$.datepicker._mainDivId).length === 0) {
+		$("body").append($.datepicker.dpDiv);
+	}
+
+	var otherArgs = Array.prototype.slice.call(arguments, 1);
+	if (typeof options === "string" && (options === "isDisabled" || options === "getDate" || options === "widget")) {
+		return $.datepicker["_" + options + "Datepicker"].
+			apply($.datepicker, [this[0]].concat(otherArgs));
+	}
+	if (options === "option" && arguments.length === 2 && typeof arguments[1] === "string") {
+		return $.datepicker["_" + options + "Datepicker"].
+			apply($.datepicker, [this[0]].concat(otherArgs));
+	}
+	return this.each(function() {
+		typeof options === "string" ?
+			$.datepicker["_" + options + "Datepicker"].
+				apply($.datepicker, [this].concat(otherArgs)) :
+			$.datepicker._attachDatepicker(this, options);
+	});
+};
+
+$.datepicker = new Datepicker(); // singleton instance
+$.datepicker.initialized = false;
+$.datepicker.uuid = new Date().getTime();
+$.datepicker.version = "1.10.4";
+
+})(jQuery);

From 6ee180ca901765df967ea254cdb39a2342c26b30 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Tue, 4 Mar 2014 14:10:39 -0500
Subject: [PATCH 19/71] use _id()

---
 helpers/cmb_Meta_Box_types.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helpers/cmb_Meta_Box_types.php b/helpers/cmb_Meta_Box_types.php
index e038889..d1a9fbb 100644
--- a/helpers/cmb_Meta_Box_types.php
+++ b/helpers/cmb_Meta_Box_types.php
@@ -458,7 +458,7 @@ public static function wysiwyg( $field, $meta ) {
 
 	public static function taxonomy_select( $field, $meta, $object_id ) {
 
-		echo '<select name="', $field['id'], '" id="', $field['id'], '">';
+		echo '<select name="', self::_name(), '" id="', self::_id(), '">';
 		$names    = self::get_object_terms( $object_id, $field['taxonomy'] );
 		$terms    = get_terms( $field['taxonomy'], 'hide_empty=0' );
 		$has_term = false;

From 934078f6700814bbb441c22746d5fc4c7cb12b0f Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Mon, 10 Mar 2014 14:35:19 -0400
Subject: [PATCH 20/71] Restructure types class to be proper OOP, and pass in
 the field object. Also restructured for repeatable fields to work properly
 across more field types

---
 helpers/cmb_Meta_Box_types.php | 878 +++++++++++++++++----------------
 1 file changed, 465 insertions(+), 413 deletions(-)

diff --git a/helpers/cmb_Meta_Box_types.php b/helpers/cmb_Meta_Box_types.php
index d1a9fbb..01e960f 100644
--- a/helpers/cmb_Meta_Box_types.php
+++ b/helpers/cmb_Meta_Box_types.php
@@ -2,135 +2,167 @@
 
 /**
  * CMB field types
+ *
+ * @todo test taxonomy methods with non-post objects
+ * @todo test all methods with non-post objects
+ *
  * @since  1.0.0
  */
 class cmb_Meta_Box_types {
 
-	/**
-	 * @todo test taxonomy methods with non-post objects
-	 * @todo test all methods with non-post objects
-	 */
-
-	/**
-	 * A single instance of this class.
-	 * @var   cmb_Meta_Box_types object
-	 * @since 1.0.0
-	 */
-	public static $instance = null;
-
 	/**
 	 * An iterator value for repeatable fields
 	 * @var   integer
 	 * @since 1.0.0
 	 */
-	public static $iterator = 0;
+	public $iterator = 0;
 
 	/**
-	 * Holds cmb_valid_img_types
+	 * Current field
 	 * @var   array
 	 * @since 1.0.0
 	 */
-	public static $valid = array();
+	public $field;
 
-	/**
-	 * Current field type
-	 * @var   string
-	 * @since 1.0.0
-	 */
-	public static $type = 'text';
+	public function __construct( $field ) {
+		$this->field = $field;
+	}
+
+	public function render() {
+		if ( $this->field->args( 'repeatable' ) ) {
+			$this->render_repeatable_field();
+		} else {
+			echo $this->{$this->field->args( 'type' )}();
+		}
+	}
 
 	/**
-	 * Current field
-	 * @var   array
-	 * @since 1.0.0
+	 * Checks if we can get a post object, and if so, uses `get_the_terms` which utilizes caching
+	 * @since  1.0.2
+	 * @return mixed Array of terms on success
 	 */
-	public static $field;
+	public function get_object_terms() {
+		$object_id = $this->field->object_id;
+		$taxonomy = $this->field->args( 'taxonomy' );
+
+		if ( ! $post = get_post( $object_id ) ) {
+
+			$cache_key = 'cmb-cache-'. $taxonomy .'-'. $object_id;
+
+			// Check cache
+			$cached = $test = get_transient( $cache_key );
+			if ( $cached )
+				return $cached;
+
+			$cached = wp_get_object_terms( $object_id, $taxonomy );
+			// Do our own (minimal) caching. Long enough for a page-load.
+			$set = set_transient( $cache_key, $cached, 60 );
+			return $cached;
+		}
+
+		// WP caches internally so it's better to use
+		return get_the_terms( $post, $taxonomy );
+
+	}
 
 	/**
-	 * Current field meta value
-	 * @var   mixed
-	 * @since 1.0.0
+	 * Determine a file's extension
+	 * @since  1.0.0
+	 * @param  string       $file File url
+	 * @return string|false       File extension or false
 	 */
-	public static $meta;
+	public function get_file_ext( $file ) {
+		$parsed = @parse_url( $file, PHP_URL_PATH );
+		return $parsed ? strtolower( pathinfo( $parsed, PATHINFO_EXTENSION ) ) : false;
+	}
 
 	/**
-	 * Creates or returns an instance of this class.
+	 * Determines if a file has a valid image extension
 	 * @since  1.0.0
-	 * @return cmb_Meta_Box_types A single instance of this class.
+	 * @param  string $file File url
+	 * @return bool         Whether file has a valid image extension
 	 */
-	public static function get() {
-		if ( self::$instance === null )
-			self::$instance = new self();
+	public function is_valid_img_ext( $file ) {
+		$file_ext = $this->get_file_ext( $file );
+
+		$this->valid = empty( $this->valid )
+			? (array) apply_filters( 'cmb_valid_img_types', array( 'jpg', 'jpeg', 'png', 'gif', 'ico', 'icon' ) )
+			: $this->valid;
 
-		return self::$instance;
+		return ( $file_ext && in_array( $file_ext, $this->valid ) );
 	}
 
 	/**
-	 * Generates a field's description markup
-	 * @since  1.0.0
-	 * @param  string  $desc      Field's description
-	 * @param  boolean $paragraph Paragraph tag or span
-	 * @return strgin             Field's description markup
+	 * Handles parsing and filtering attributes while preserving any passed in via field config.
+	 * @since  1.0.3
+	 * @param  array  $args     Override arguments
+	 * @param  string $element  Element for filter
+	 * @param  array  $defaults Default arguments
+	 * @return array            Parsed and filtered arguments
 	 */
-	private static function desc( $paragraph = false ) {
-		$tag = $paragraph ? 'p' : 'span';
-		$desc = cmb_Meta_Box::$field['desc'];
-		return "\n<$tag class=\"cmb_metabox_description\">$desc</$tag>\n";
+	public function parse_args( $args, $element, $defaults ) {
+		return wp_parse_args( apply_filters( "cmb_{$element}_attributes", $this->field->maybe_set_attributes( $args ), $this->field, $this ), $defaults );
 	}
 
 	/**
-	 * Generates repeatable text fields
-	 * @since  1.0.0
-	 * @param  string  $field Metabox field
-	 * @param  mixed   $meta  Field's meta value
-	 * @param  string  $class Field's class attribute
-	 * @param  string  $type  Field Type
+	 * Combines attributes into a string for a form element
+	 * @since  1.0.3
+	 * @param  array  $attrs        Attributes to concatenate
+	 * @param  array  $attr_exclude Attributes that should NOT be concatenated
+	 * @return string               String of attributes for form element
 	 */
-	private static function repeat_text_field( $meta, $class = '', $type = 'text' ) {
+	public function concat_attributes( $attrs, $attr_exclude = array() ) {
+		$attributes = '';
+		foreach ( $attrs as $attr => $val ) {
+			if ( ! in_array( $attr, (array) $attr_exclude, true ) )
+				$attributes .= sprintf( ' %s="%s"', $attr, $val );
+		}
+		return $attributes;
+	}
 
-		$field = cmb_Meta_Box::$field; self::$meta = $meta; self::$type = $type;
+	/**
+	 * Generates repeatable fields
+	 * @since  1.0.0
+	 */
+	public function render_repeatable_field() {
+		$meta_value = $this->field->escaped_value();
 
 		// check for default content
-		$default = isset( $field['default'] ) ? array( $field['default'] ) : false;
+		$default = $this->field->args( 'default' );
 		// check for saved data
-		if ( !empty( $meta ) ) {
-			$meta = is_array( $meta ) ? array_filter( $meta ) : $meta;
-			$meta = ! empty( $meta ) ? $meta : $default;
+		if ( !empty( $meta_value ) ) {
+			$meta_value = is_array( $meta_value ) ? array_filter( $meta_value ) : $meta_value;
+			$meta_value = ! empty( $meta_value ) ? $meta_value : $default;
 		} else {
-			$meta = $default;
+			$meta_value = $default;
 		}
 
-		self::repeat_table_open( $class );
+		$class = 'widefat';
+		$this->repeat_table_open();
 
-		$class = $class ? $class .' widefat' : 'widefat';
-
-		if ( !empty( $meta ) ) {
-			foreach ( (array) $meta as $val ) {
-				self::repeat_row( self::text_input( $class, $val ) );
+		if ( !empty( $meta_value ) ) {
+			foreach ( (array) $meta_value as $val ) {
+				$this->field->escaped_value = $val;
+				$this->open_repeat_row();
+				echo call_user_func( array( $this, $this->field->args( 'type' ) ) );
+				$this->close_repeat_row();
+				$this->iterator++;
 			}
 		} else {
-			self::repeat_row( self::text_input( $class ) );
+			$this->open_repeat_row();
+			echo call_user_func( array( $this, $this->field->args( 'type' ) ) );
+			$this->close_repeat_row();
 		}
 
-		self::empty_row( self::text_input( $class ) );
-		self::repeat_table_close();
-		// reset iterator
-		self::$iterator = 0;
-	}
+		$this->open_empty_row();
+		$this->field->escaped_value = '';
+		$this->iterator = $this->iterator ? $this->iterator : 1;
+		echo call_user_func( array( $this, $this->field->args( 'type' ) ) );
+		$this->close_repeat_row();
 
-	/**
-	 * Text input field used by repeatable fields
-	 * @since  1.0.0
-	 * @param  string  $class Field's class attribute
-	 * @param  mixed   $val   Field's meta value
-	 * @return string         HTML text input
-	 */
-	private static function text_input( $class = '', $val = '' ) {
-		self::$iterator = self::$iterator ? self::$iterator + 1 : 1;
-		$before = '';
-		if ( cmb_Meta_Box::$field['type'] == 'text_money' )
-			$before = ! empty( cmb_Meta_Box::$field['before'] ) ? ' ' : '$ ';
-		return $before . '<input type="'. self::$type .'" class="'. $class .'" name="'. cmb_Meta_Box::$field['id'] .'[]" id="'. cmb_Meta_Box::$field['id'] .'_'. self::$iterator .'" value="'. self::esc( $val ) .'" data-id="'. cmb_Meta_Box::$field['id'] .'" data-count="'. self::$iterator .'"/>';
+		$this->repeat_table_close();
+		// reset iterator
+		$this->iterator = 0;
 	}
 
 	/**
@@ -138,401 +170,439 @@ private static function text_input( $class = '', $val = '' ) {
 	 * @since  1.0.0
 	 * @param  string $class Field's class attribute
 	 */
-	private static function repeat_table_open( $class = '' ) {
-		echo self::desc(), '<table id="', cmb_Meta_Box::$field['id'], '_repeat" class="cmb-repeat-table ', $class ,'"><tbody>';
+	protected function repeat_table_open( $class = '' ) {
+		echo $this->_desc(), '<table id="', $this->field->args( 'id' ), '_repeat" class="cmb-repeat-table ', $class ,'"><tbody>';
 	}
 
 	/**
-	 * Generates repeatable feild closing table markup for repeatable fields
+	 * Generates repeatable field closing table markup for repeatable fields
 	 * @since 1.0.0
 	 */
-	private static function repeat_table_close() {
-		echo '</tbody></table><p class="add-row"><a data-selector="', cmb_Meta_Box::$field['id'] ,'_repeat" class="add-row-button button" href="#">'. __( 'Add Row', 'cmb' ) .'</a></p>';
+	protected function repeat_table_close() {
+		echo '</tbody></table><p class="add-row"><a data-selector="', $this->field->args( 'id' ) ,'_repeat" class="add-row-button button" href="#">'. __( 'Add Row', 'cmb' ) .'</a></p>';
 	}
 
-	/**
-	 * Generates table row markup for repeatable fields
-	 * @since 1.0.0
-	 * @param string $input Table cell markup
-	 */
-	private static function repeat_row( $input ) {
-		echo '<tr class="repeat-row">', self::repeat_cell( $input ) ,'</tr>';
+	protected function open_repeat_row() {
+		echo '<tr class="repeat-row">';
+		echo '<td>';
 	}
 
-	/**
-	 * Generates the empty table row markup (for duplication) for repeatable fields
-	 * @since 1.0.0
-	 * @param string $input Table cell markup
-	 */
-	private static function empty_row( $input ) {
-		echo '<tr class="empty-row">', self::repeat_cell( $input ) ,'</tr>';
+	protected function open_empty_row() {
+		echo '<tr class="empty-row">';
+		echo '<td>';
 	}
 
-	/**
-	 * Generates table cell markup for repeatable fields
-	 * @since  1.0.0
-	 * @param  string $input Text input field
-	 * @return string        HTML table cell markup
-	 */
-	private static function repeat_cell( $input ) {
-		return '<td>'. $input .'</td><td class="remove-row"><a class="button remove-row-button" href="#">'. __( 'Remove', 'cmb' ) .'</a></td>';
+	protected function close_repeat_row() {
+		echo '</td><td class="remove-row"><a class="button remove-row-button" href="#">'. __( 'Remove', 'cmb' ) .'</a></td>';
+		echo '</tr>';
 	}
 
 	/**
-	 * Determine a file's extension
+	 * Generates description markup
 	 * @since  1.0.0
-	 * @param  string       $file File url
-	 * @return string|false       File extension or false
+	 * @param  boolean $paragraph Paragraph tag or span
+	 * @return string             Field's description markup
 	 */
-	public static function get_file_ext( $file ) {
-		$parsed = @parse_url( $file, PHP_URL_PATH );
-		return $parsed ? strtolower( pathinfo( $parsed, PATHINFO_EXTENSION ) ) : false;
+	public function _desc( $paragraph = false ) {
+		// Prevent description from printing multiple times for repeatable fields
+		if ( $this->field->args( 'repeatable' ) || $this->iterator > 0 ) {
+			return '';
+		}
+		$tag = $paragraph ? 'p' : 'span';
+		return "\n<$tag class=\"cmb_metabox_description\">{$this->field->args( 'description' )}</$tag>\n";
 	}
 
-	/**
-	 * Determines if a file has a valid image extension
-	 * @since  1.0.0
-	 * @param  string $file File url
-	 * @return bool         Whether file has a valid image extension
-	 */
-	public static function is_valid_img_ext( $file ) {
-		$file_ext = self::get_file_ext( $file );
-
-		self::$valid = empty( self::$valid ) ? (array) apply_filters( 'cmb_valid_img_types', array( 'jpg', 'jpeg', 'png', 'gif', 'ico', 'icon' ) ) : self::$valid;
+	public function _name( $suffix = '' ) {
+		return $this->field->args( 'id' ) . ( $this->field->args( 'repeatable' ) ? '['. $this->iterator .']' : '' ) . $suffix;
+	}
 
-		return ( $file_ext && in_array( $file_ext, self::$valid ) );
+	public function _id( $suffix = '' ) {
+		return $this->field->args( 'id' ) . $suffix . ( $this->field->args( 'repeatable' ) ? '_'. $this->iterator .'" data-iterator="'. $this->iterator : '' );
 	}
 
 	/**
-	 * Checks if we can get a post object, and if so, uses `get_the_terms` which utilizes caching
-	 * @since  1.0.2
-	 * @param  integer $object_id Object ID
-	 * @param  string  $taxonomy  Taxonomy terms to return
-	 * @return mixed              Array of terms on success
+	 * Handles outputting an 'input' element
+	 * @since  1.0.3
+	 * @param  array  $args Override arguments
+	 * @return string       Form input element
 	 */
-	public static function get_object_terms( $object_id, $taxonomy ) {
-
-		if ( ! $post = get_post( $object_id ) ) {
-
-			$cache_key = 'cmb-cache-'. $taxonomy .'-'. $object_id;
-
-			// Check cache
-			$cached = $test = get_transient( $cache_key );
-			if ( $cached )
-				return $cached;
-
-			$cached = wp_get_object_terms( $object_id, $taxonomy );
-			// Do our own (minimal) caching. Long enough for a page-load.
-			$set = set_transient( $cache_key, $cached, 60 );
-			return $cached;
-		}
-
-		// WP caches internally so it's better to use
-		return get_the_terms( $post, $taxonomy );
+	public function input( $args = array() ) {
+		$args = $this->parse_args( $args, 'input', array(
+			'type'  => 'text',
+			'class' => 'regular-text',
+			'name'  => $this->_name(),
+			'id'    => $this->_id(),
+			'value' => $this->field->escaped_value(),
+			'desc'  => $this->_desc( true ),
+		) );
 
+		return sprintf( '<input%s/>%s', $this->concat_attributes( $args, 'desc' ), $args['desc'] );
 	}
 
 	/**
-	 * Escape the value before output. Defaults to 'esc_attr()'
-	 * @since  1.0.1
-	 * @param  mixed  $meta_value Meta value
-	 * @param  mixed  $func       Escaping function (if not esc_attr())
-	 * @return mixed              Final value
+	 * Handles outputting an 'textarea' element
+	 * @since  1.0.3
+	 * @param  array  $args Override arguments
+	 * @return string       Form textarea element
 	 */
-	public static function esc( $meta_value, $func = '' ) {
-		$field = cmb_Meta_Box::$field;
-
-		// Check if the field has a registered escaping callback
-		$cb = cmb_Meta_Box::maybe_callback( $field, 'escape_cb' );
-		if ( false === $cb ) {
-			// If requesting NO escaping, return meta value
-			return $meta_value;
-		} elseif ( $cb ) {
-			// Ok, callback is good, let's run it.
-			return call_user_func( $cb, $meta_value, $field );
-		}
-
-		// Or custom escaping filter can be used
-		$esc = apply_filters( 'cmb_types_esc_'. $field['type'], null, $meta_value, $field );
-		if ( null !== $esc ) {
-			return $esc;
-		}
-
-		// escaping function passed in?
-		$func       = is_string( $func ) && ! empty( $func ) ? $func : 'esc_attr';
-		$meta_value = ! empty( $meta_value ) ? $meta_value : $field['default'];
-
-		return call_user_func( $func, $meta_value );
+	public function textarea( $args = array() ) {
+		$args = $this->parse_args( $args, 'textarea', array(
+			'class' => 'cmb_textarea',
+			'name'  => $this->_name(),
+			'id'    => $this->_id(),
+			'cols'  => 60,
+			'rows'  => 10,
+			'value' => $this->field->escaped_value( 'esc_textarea' ),
+			'desc'  => $this->_desc( true ),
+		) );
+		return sprintf( '<textarea%s>%s</textarea>%s', $this->concat_attributes( $args, array( 'desc', 'value' ) ), $args['value'], $args['desc'] );
 	}
 
-
 	/**
 	 * Begin Field Types
 	 */
 
-	public static function text( $field, $meta ) {
-		if ( $field['repeatable'] ) {
-			return self::repeat_text_field( $meta );
-		}
-
-		echo '<input type="text" class="regular-text" name="', $field['id'], '" id="', $field['id'], '" value="', self::esc( $meta ), '" />', self::desc( true );
+	public function text() {
+		return $this->input();
 	}
 
-	public static function text_small( $field, $meta ) {
-		if ( $field['repeatable'] ) {
-			return self::repeat_text_field( $meta, 'cmb_text_small' );
-		}
-
-		echo '<input class="cmb_text_small" type="text" name="', $field['id'], '" id="', $field['id'], '" value="', self::esc( $meta ), '" />', self::desc();
+	public function text_small() {
+		return $this->input( array( 'class' => 'cmb_text_small', 'desc' => $this->_desc() ) );
 	}
 
-	public static function text_medium( $field, $meta ) {
-		if ( $field['repeatable'] ) {
-			return self::repeat_text_field( $meta, 'cmb_text_medium' );
-		}
-		echo '<input class="cmb_text_medium" type="text" name="', $field['id'], '" id="', $field['id'], '" value="', self::esc( $meta ), '" />', self::desc();
+	public function text_medium() {
+		return $this->input( array( 'class' => 'cmb_text_medium', 'desc' => $this->_desc() ) );
 	}
 
-	public static function text_email( $field, $meta ) {
-		if ( $field['repeatable'] ) {
-			return self::repeat_text_field( $meta, 'cmb_text_email cmb_text_medium', 'email' );
-		}
-
-		echo '<input class="cmb_text_email cmb_text_medium" type="email" name="', $field['id'], '" id="', $field['id'], '" value="', self::esc( $meta ), '" />', self::desc( true );
+	public function text_email() {
+		return $this->input( array( 'class' => 'cmb_text_email cmb_text_medium', 'type' => 'email' ) );
 	}
 
-	public static function text_url( $field, $meta ) {
-		if ( $field['repeatable'] ) {
-			return self::repeat_text_field( $meta, 'cmb_text_url cmb_text_medium' );
-		}
-
-		echo '<input class="cmb_text_url cmb_text_medium regular-text" type="text" name="', $field['id'], '" id="', $field['id'], '" value="', self::esc( $meta, 'esc_url' ), '" />', self::desc( true );
+	public function text_url() {
+		return $this->input( array( 'class' => 'cmb_text_url cmb_text_medium regular-text', 'value' => $this->field->escaped_value( 'esc_url' ) ) );
 	}
 
-	public static function text_date( $field, $meta ) {
-		echo '<input class="cmb_text_small cmb_datepicker" type="text" name="', $field['id'], '" id="', $field['id'], '" value="', self::esc( $meta ), '" />', self::desc();
+	public function text_date() {
+		return $this->input( array( 'class' => 'cmb_text_small cmb_datepicker', 'desc' => $this->_desc() ) );
 	}
 
-	public static function text_date_timestamp( $field, $meta ) {
-		echo '<input class="cmb_text_small cmb_datepicker" type="text" name="', $field['id'], '" id="', $field['id'], '" value="', ! empty( $meta ) ? date( 'm\/d\/Y', $meta ) : $field['default'], '" />', self::desc();
+	public function text_time() {
+		return $this->input( array( 'class' => 'cmb_timepicker text_time', 'desc' => $this->_desc() ) );
 	}
 
-	public static function text_datetime_timestamp( $field, $meta, $object_id ) {
+	public function text_date_timestamp() {
+		$meta_value = $this->field->escaped_value();
+		$value = ! empty( $meta_value ) ? date( 'm\/d\/Y', $meta_value ) : '';
+		return $this->input( array( 'class' => 'cmb_text_small cmb_datepicker', 'value' => $value ) );
+	}
 
-		// This will be used if there is a select_timezone set for this field
-		$tz_offset = cmb_Meta_Box::field_timezone_offset( $object_id );
-		if ( ! empty( $tz_offset ) ) {
-			$meta -= $tz_offset;
+	public function text_datetime_timestamp( $meta_value = '' ) {
+		$desc = '';
+		if ( ! $meta_value ) {
+			$meta_value = $this->field->escaped_value();
+			// This will be used if there is a select_timezone set for this field
+			$tz_offset = cmb_Meta_Box::field_timezone_offset( $this->field->object_id );
+			if ( ! empty( $tz_offset ) ) {
+				$meta_value -= $tz_offset;
+			}
+			$desc = $this->_desc();
 		}
 
-		echo '<input class="cmb_text_small cmb_datepicker" type="text" name="', $field['id'], '[date]" id="', $field['id'], '_date" value="', ! empty( $meta ) ? date( 'm\/d\/Y', $meta ) : $field['default'], '" />';
-		echo '<input class="cmb_timepicker text_time" type="text" name="', $field['id'], '[time]" id="', $field['id'], '_time" value="', ! empty( $meta ) ? date( 'h:i A', $meta ) : $field['default'], '" />', self::desc();
-	}
+		$inputs = array(
+			$this->input( array(
+				'class' => 'cmb_text_small cmb_datepicker',
+				'name'  => $this->_name( '[date]' ),
+				'id'    => $this->_id( '_date' ),
+				'value' => ! empty( $meta_value ) ? date( 'm\/d\/Y', $meta_value ) : '',
+				'desc'  => '',
+			) ),
+			$this->input( array(
+				'class' => 'cmb_timepicker text_time',
+				'name'  => $this->_name( '[time]' ),
+				'id'    => $this->_id( '_time' ),
+				'value' => ! empty( $meta_value ) ? date( 'h:i A', $meta_value ) : '',
+				'desc'  => $desc,
+			) )
+		);
+
+		return implode( "\n", $inputs );
+	}
+
+	public function text_datetime_timestamp_timezone() {
+		$meta_value = $this->field->escaped_value();
+		$datetime   = unserialize( $meta_value );
+		$meta_value = $tzstring = false;
 
-	public static function text_datetime_timestamp_timezone( $field, $meta ) {
+		if ( $datetime && $datetime instanceof DateTime ) {
+			$tz         = $datetime->getTimezone();
+			$tzstring   = $tz->getName();
+			$meta_value = $datetime->getTimestamp() + $tz->getOffset( new DateTime( 'NOW' ) );
+		}
 
-		$datetime = unserialize( $meta );
-		$meta = $tzstring = false;
+		$inputs = $this->text_datetime_timestamp( $meta_value );
+		$inputs .= '<select name="'. $this->_name( '[timezone]' ) .'" id="'. $this->_id( '_timezone' ) .'">';
+		$inputs .= wp_timezone_choice( $tzstring );
+		$inputs .= '</select>'. $this->_desc();
 
-		if ( $datetime && $datetime instanceof DateTime ) {
-			$tz = $datetime->getTimezone();
-			$tzstring = $tz->getName();
+		return $inputs;
+	}
 
-			$meta = $datetime->getTimestamp() + $tz->getOffset( new DateTime('NOW') );
-		}
+	public function select_timezone() {
+		$this->field->args['default'] = $this->field->args( 'default' )
+			? $this->field->args( 'default' )
+			: cmb_Meta_Box::timezone_string();
 
-		echo '<input class="cmb_text_small cmb_datepicker" type="text" name="', $field['id'], '[date]" id="', $field['id'], '_date" value="', ! empty( $meta ) ? date( 'm\/d\/Y', $meta ) : $field['default'], '" />';
-		echo '<input class="cmb_timepicker text_time" type="text" name="', $field['id'], '[time]" id="', $field['id'], '_time" value="', ! empty( $meta ) ? date( 'h:i A', $meta ) : $field['default'], '" />';
+		$meta_value = $this->field->escaped_value();
 
-		echo '<select name="', $field['id'], '[timezone]" id="', $field['id'], '_timezone">';
-		echo wp_timezone_choice( $tzstring );
-		echo '</select>', self::desc();
+		return '<select name="'. $this->_name() .'" id="'. $this->_id() .'">'. wp_timezone_choice( $meta_value ) .'</select>';
 	}
 
-	public static function text_time( $field, $meta ) {
-		echo '<input class="cmb_timepicker text_time" type="text" name="', $field['id'], '" id="', $field['id'], '" value="', self::esc( $meta ), '" />', self::desc();
+	public function text_money() {
+		return ( ! $this->field->args( 'before' ) ? '$ ' : ' ' ) . $this->input( array( 'class' => 'cmb_text_money', 'desc' => $this->_desc() ) );
 	}
 
-	public static function select_timezone( $field, $meta ) {
-		$meta = self::esc( $meta );
-		if ( '' === $meta )
-			$meta = cmb_Meta_Box::timezone_string();
+	public function colorpicker() {
+		$meta_value = $this->field->escaped_value();
+		$hex_color = '(([a-fA-F0-9]){3}){1,2}$';
+		if ( preg_match( '/^' . $hex_color . '/i', $meta_value ) ) // Value is just 123abc, so prepend #.
+			$meta_value = '#' . $meta_value;
+		elseif ( ! preg_match( '/^#' . $hex_color . '/i', $meta_value ) ) // Value doesn't match #123abc, so sanitize to just #.
+			$meta_value = "#";
 
-		echo '<select name="', $field['id'], '" id="', $field['id'], '">';
-		echo wp_timezone_choice( $meta );
-		echo '</select>';
+		return $this->input( array( 'class' => 'cmb_colorpicker cmb_text_small', 'value' => $meta_value ) );
 	}
 
-	public static function text_money( $field, $meta ) {
-		if ( $field['repeatable'] ) {
-			return self::repeat_text_field( $meta, 'cmb_text_money' );
-		}
-
-		echo ! empty( $field['before'] ) ? '' : '$', ' <input class="cmb_text_money" type="text" name="', $field['id'], '" id="', $field['id'], '" value="', self::esc( $meta ), '" />', self::desc();
+	public function textarea_small() {
+		return $this->textarea( array( 'class' => 'cmb_textarea_small', 'rows' => 4 ) );
 	}
 
-	public static function colorpicker( $field, $meta ) {
-		$meta = self::esc( $meta );
-		$hex_color = '(([a-fA-F0-9]){3}){1,2}$';
-		if ( preg_match( '/^' . $hex_color . '/i', $meta ) ) // Value is just 123abc, so prepend #.
-			$meta = '#' . $meta;
-		elseif ( ! preg_match( '/^#' . $hex_color . '/i', $meta ) ) // Value doesn't match #123abc, so sanitize to just #.
-			$meta = "#";
-		echo '<input class="cmb_colorpicker cmb_text_small" type="text" name="', $field['id'], '" id="', $field['id'], '" value="', $meta, '" />', self::desc();
+	public function textarea_code() {
+		return sprintf( '<pre>%s</pre>', $this->textarea( array( 'class' => 'cmb_textarea_code' )  ) );
 	}
 
-	public static function textarea( $field, $meta ) {
-		echo '<textarea name="', $field['id'], '" id="', $field['id'], '" cols="60" rows="10">', self::esc( $meta, 'esc_textarea' ), '</textarea>', self::desc( true );
+	public function title() {
+		$args = $this->parse_args( array(), 'title', array(
+			'class' => 'cmb_metabox_title',
+			'tag'   => $this->field->object_type == 'post' ? 'h5' : 'h3',
+			'desc'  => $this->_desc( true ),
+		) );
+
+		$attrs = $this->concat_attributes( $args, array( 'desc', 'tag' ) );
+		return sprintf( '<%1$s%2s">%3$s</%1$s>%4$s', $args['tag'], $attrs, $this->field->args( 'name' ), $args['desc'] );
 	}
 
-	public static function textarea_small( $field, $meta ) {
-		echo '<textarea name="', $field['id'], '" id="', $field['id'], '" cols="60" rows="4">', self::esc( $meta, 'esc_textarea' ), '</textarea>', self::desc( true );
+	public function wysiwyg() {
+		$saved_value = stripslashes( html_entity_decode( $this->field->escaped_value( 'esc_html' ) ) );
+		// $id = strtolower( str_ireplace( array( '-', '_' ), '', $this->_id() ) ) . 'wpeditor';
+		wp_editor( $saved_value, $this->_id(), $this->field->args( 'options' ) );
+		echo $this->_desc( true );
 	}
 
-	public static function textarea_code( $field, $meta ) {
-		echo '<pre><textarea name="', $field['id'], '" id="', $field['id'], '" cols="60" rows="10" class="cmb_textarea_code">', ! empty( $meta ) ? $meta : $field['default'], '</textarea></pre>', self::desc( true );
+	public function option( $opt_label, $opt_value, $selected ) {
+		return sprintf( "\t".'<option value="%s" %s>%s</option>', $opt_value, selected( $selected, true, false ), $opt_label )."\n";
 	}
 
-	public static function select( $field, $meta ) {
-		$meta = self::esc( $meta );
-		echo '<select name="', $field['id'], '" id="', $field['id'], '">';
-		foreach ( $field['options'] as $option_key => $option ) {
+	public function concat_options( $args = array(), $method = 'list_input' ) {
+
+		$options     = (array) $this->field->args( 'options' );
+		$saved_value = $this->field->escaped_value();
+		$value       = $saved_value ? $saved_value : $this->field->args( 'default' );
+
+		$_options = ''; $i = 1;
+		foreach ( $options as $option_key => $option ) {
 
 			// Check for the "old" way
-			$label = isset( $option['name'] ) ? $option['name'] : $option;
-			$value = isset( $option['value'] ) ? $option['value'] : $option_key;
+			$opt_label = isset( $option['name'] ) ? $option['name'] : $option;
+			$opt_value = isset( $option['value'] ) ? $option['value'] : $option_key;
+			$selected  = $value == $opt_value;
 
-			echo '<option value="', $value, '" ', selected( $meta == $value ) ,'>', $label, '</option>';
+			if ( ! empty( $args ) ) {
+				$args['value'] = $opt_value;
+				$args['label'] = $opt_label;
+				if ( $selected )
+					$args['selected'] = 'selected';
+
+				$_options .= $this->$method( $args, $i );
+			} else {
+				$_options .= $this->option( $opt_label, $opt_value, $selected );
+			}
+			// $_options .= $args
+			// 	? $this->list_input( $args, $opt_label, $opt_value, $selected, $i )
+			// 	: $this->option( $opt_label, $opt_value, $selected );
 
+			$i++;
 		}
-		echo '</select>', self::desc( true );
+		return $_options;
 	}
 
-	public static function radio( $field, $meta ) {
-		$meta = self::esc( $meta );
-		echo '<ul>';
-		$i = 1;
-		foreach ( $field['options'] as $option_key => $option ) {
+	public function select( $args = array() ) {
+		$args = $this->parse_args( $args, 'select', array(
+			'class'   => 'cmb_select',
+			'name'    => $this->_name(),
+			'id'      => $this->_id(),
+			'desc'    => $this->_desc( true ),
+			'options' => $this->concat_options(),
+		) );
 
-			// Check for the "old" way
-			$label = isset( $option['name'] ) ? $option['name'] : $option;
-			$value = isset( $option['value'] ) ? $option['value'] : $option_key;
+		$attrs = $this->concat_attributes( $args, array( 'desc', 'options' ) );
+		return sprintf( '<select%s>%s</select>%s', $attrs, $args['options'], $args['desc'] );
+	}
 
-			echo '<li class="cmb_option"><input type="radio" name="', $field['id'], '" id="', $field['id'], $i,'" value="', $value, '" ', checked( $meta == $value ), ' /> <label for="', $field['id'], $i, '">', $label ,'</label></li>';
-			$i++;
+	public function taxonomy_select() {
+
+		$names      = $this->get_object_terms();
+		$saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->args( 'default' ) : $names[0]->slug;
+		$terms      = get_terms( $this->field->args( 'taxonomy' ), 'hide_empty=0' );
+		$options    = '';
+
+		foreach ( $terms as $term ) {
+			$selected = $saved_term == $term->slug;
+			$options .= $this->option( $term->name, $term->slug, $selected );
 		}
-		echo '</ul>', self::desc( true );
-	}
 
-	public static function radio_inline( $field, $meta ) {
-		self::radio( $field, $meta );
+		return $this->select( array( 'options' => $options ) );
 	}
 
-	public static function checkbox( $field, $meta ) {
-		echo '<input class="cmb_option" type="checkbox" name="', $field['id'], '" id="', $field['id'], '" ', checked( ! empty( $meta ) ), ' value="on"/> <label for="', $field['id'], '">', self::desc() ,'</label>';
+	public function list_input( $args = array(), $i ) {
+		$args = $this->parse_args( $args, 'list_input', array(
+			'type'  => 'radio',
+			'class' => 'cmb_option',
+			'name'  => $this->_name(),
+			'id'    => $this->_id( $i ),
+			'value' => $this->field->escaped_value(),
+			'label' => '',
+		) );
+
+		return sprintf( "\t".'<li><input%s/> <label for="%s">%s</label></li>'."\n", $this->concat_attributes( $args, 'label' ), $this->_id( $i ), $args['label'] );
 	}
 
-	public static function multicheck( $field, $meta ) {
-		echo '<ul>';
-		$i = 1;
-		foreach ( $field['options'] as $value => $name ) {
-			echo '<li><input class="cmb_option" type="checkbox" name="', $field['id'], '[]" id="', $field['id'], $i, '" value="', $value, '" ', checked( is_array( $meta ) && in_array( $value, $meta ) ), '  /> <label for="', $field['id'], $i, '">', $name, '</label></li>';
-			$i++;
+	public function list_input_checkbox( $args, $i ) {
+		unset( $args['selected'] );
+		$saved_value = $this->field->escaped_value();
+		if ( is_array( $saved_value ) && in_array( $args['value'], $saved_value ) ) {
+			$args['checked'] = 'checked';
 		}
-		echo '</ul>', self::desc();
+		return $this->list_input( $args, $i );
 	}
 
-	public static function multicheck_inline( $field, $meta ) {
-		self::multicheck( $field, $meta );
-	}
+	public function radio( $args = array(), $type = 'radio' ) {
+		$args = $this->parse_args( $args, $type, array(
+			'class'   => 'cmb_radio_list',
+			'desc'    => $this->_desc( true ),
+			'options' => $this->concat_options( array( 'label' => 'test' ) ),
+		) );
 
-	public static function title( $field, $meta, $object_id, $object_type ) {
-		$tag = $object_type == 'post' ? 'h5' : 'h3';
-		echo '<'. $tag .' class="cmb_metabox_title">', $field['name'], '</'. $tag .'>', self::desc( true );
+		$attrs = $this->concat_attributes( $args, array( 'desc', 'options' ) );
+		return sprintf( '<ul%s>%s</ul>%s', $attrs, $args['options'], $args['desc'] );
 	}
 
-	public static function wysiwyg( $field, $meta ) {
-		wp_editor( stripslashes( html_entity_decode( self::esc( $meta, 'esc_html' ) ) ), $field['id'], isset( $field['options'] ) ? $field['options'] : array() );
-		echo self::desc( true );
+	public function radio_inline() {
+		return $this->radio( array(), 'radio_inline' );
 	}
 
-	public static function taxonomy_select( $field, $meta, $object_id ) {
+	public function multicheck( $type = 'checkbox' ) {
+		return $this->radio( array( 'class' => 'cmb_checkbox_list', 'options' => $this->concat_options( array( 'type' => 'checkbox', 'name' => $this->_name() .'[]' ), 'list_input_checkbox' ) ), $type );
+	}
 
-		echo '<select name="', self::_name(), '" id="', self::_id(), '">';
-		$names    = self::get_object_terms( $object_id, $field['taxonomy'] );
-		$terms    = get_terms( $field['taxonomy'], 'hide_empty=0' );
-		$has_term = false;
+	public function multicheck_inline() {
+		$this->multicheck( 'multicheck_inline' );
+	}
 
-		foreach ( $terms as $term ) {
-			if ( !is_wp_error( $names ) && !empty( $names ) && ! strcmp( $term->slug, $names[0]->slug ) ) {
-				echo '<option value="' . $term->slug . '" selected>' . $term->name . '</option>';
-				$has_term = true;
-			}
-			else if ( ! $has_term == false && $term->slug == $field['default'] ) {
-				echo '<option value="' . $term->slug . '" selected>' . $term->name . '</option>';
-			} else {
-				echo '<option value="' . $term->slug . '  ' , $meta == $term->slug ? $meta : ' ' ,'  ">' . $term->name . '</option>';
-			}
+	public function checkbox() {
+		$meta_value = $this->field->escaped_value();
+		$args = array( 'type' => 'checkbox', 'class' => 'cmb_option', 'value' => 'on', 'desc' => '' );
+		if ( ! empty( $meta_value ) ) {
+			$args['checked'] = 'checked';
 		}
-		echo '</select>', self::desc( true );
+		return sprintf( '%s <label for="%s">%s</label>', $this->input( $args ), $this->_id(), $this->_desc() );
 	}
 
-	public static function taxonomy_radio( $field, $meta, $object_id ) {
-
-		$names = self::get_object_terms( $object_id, $field['taxonomy'] );
-		$terms = get_terms( $field['taxonomy'], 'hide_empty=0' );
-		echo '<ul>';
-		$i = 1;
-		foreach ( $terms as $term ) {
-			$checked = ( !is_wp_error( $names ) && !empty( $names ) && !strcmp( $term->slug, $names[0]->slug ) );
+	public function taxonomy_radio() {
+		$names      = $this->get_object_terms();
+		$saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->args( 'default' ) : $names[0]->slug;
+		$terms      = get_terms( $this->field->args( 'taxonomy' ), 'hide_empty=0' );
+		$options    = ''; $i = 1;
 
-			echo '<li class="cmb_option"><input type="radio" name="', $field['id'], '" id="', $field['id'], $i,'" value="'. $term->slug . '" ', checked( $checked ), ' /> <label for="', $field['id'], $i, '">' . $term->name . '</label></li>';
-			$i++;
+		if ( ! $terms ) {
+			$options .= '<li><label>'. __( 'No terms', 'cmb' ) .'</label></li>';
+		} else {
+			foreach ( $terms as $term ) {
+				$args = array(
+					'value' => $term->slug,
+					'label' => $term->name,
+				);
+
+				if ( $saved_term == $term->slug ) {
+					$args['checked'] = 'checked';
+				}
+				$options .= $this->list_input( $args, $i );
+				$i++;
+			}
 		}
-		echo '</ul>', self::desc( true );
+
+		return $this->radio( array( 'options' => $options ), 'taxonomy_radio' );
+
 	}
 
-	public static function taxonomy_radio_inline( $field, $meta ) {
-		self::taxonomy_radio( $field, $meta );
+	public function taxonomy_radio_inline() {
+		$this->taxonomy_radio();
 	}
 
-	public static function taxonomy_multicheck( $field, $meta, $object_id ) {
-		echo '<ul>';
-		$names = self::get_object_terms( $object_id, $field['taxonomy'] );
-		$terms = get_terms( $field['taxonomy'], 'hide_empty=0' );
-		$i = 1;
-		foreach ( $terms as $term ) {
-			echo '<li><input class="cmb_option" type="checkbox" name="', $field['id'], '[]" id="', $field['id'], $i,'" value="'. $term->slug . '" ';
-			foreach ($names as $name) {
-				checked( $term->slug == $name->slug );
-			}
+	public function taxonomy_multicheck() {
 
-			echo ' /> <label for="', $field['id'], $i, '">' . $term->name . '</label></li>';
-			$i++;
+		$names   = $this->get_object_terms();
+		$saved_terms   = is_wp_error( $names ) || empty( $names )
+			? $this->field->args( 'default' )
+			: wp_list_pluck( $names, 'slug' );
+		$terms   = get_terms( $this->field->args( 'taxonomy' ), 'hide_empty=0' );
+		$name    = $this->_name() .'[]';
+		$options = ''; $i = 1;
+
+		if ( ! $terms ) {
+			$options .= '<li><label>'. __( 'No terms', 'cmb' ) .'</label></li>';
+		} else {
+
+			foreach ( $terms as $term ) {
+				$args = array(
+					'value' => $term->slug,
+					'label' => $term->name,
+					'type' => 'checkbox',
+					'name' => $name,
+				);
+
+				if ( in_array( $term->slug, $saved_terms ) ) {
+					$args['checked'] = 'checked';
+				}
+				$options .= $this->list_input( $args, $i );
+				$i++;
+			}
 		}
-		echo '</ul>', self::desc();
+
+		return $this->radio( array( 'class' => 'cmb_checkbox_list', 'options' => $options ), 'taxonomy_multicheck' );
 	}
 
-	public static function taxonomy_multicheck_inline( $field, $meta ) {
-		self::taxonomy_multicheck( $field, $meta );
+	public function taxonomy_multicheck_inline() {
+		$this->taxonomy_multicheck();
 	}
 
-	public static function file_list( $field, $meta, $object_id ) {
+	public function file_list() {
+		$meta_value = $this->field->escaped_value();
 
-		echo '<input class="cmb_upload_file cmb_upload_list" type="hidden" size="45" id="', $field['id'], '" name="', $field['id'], '" value="" />';
-		echo '<input class="cmb_upload_button button cmb_upload_list" type="button" value="'. __( 'Add or Upload File', 'cmb' ) .'" />', self::desc( true );
+		$name = $this->_name();
+		echo '<input class="cmb_upload_file cmb_upload_list" type="hidden" size="45" id="', $this->_id(), '" name="', $name ,'" value="" />';
+		echo '<input class="cmb_upload_button button cmb_upload_list" type="button" value="'. __( 'Add or Upload File', 'cmb' ) .'" />', $this->_desc( true );
 
-		echo '<ul id="', $field['id'], '_status" class="cmb_media_status attach_list">';
+		echo '<ul id="', $this->_id( '_status' ) ,'" class="cmb_media_status attach_list">';
 
-		if ( $meta && is_array( $meta ) ) {
+		if ( $meta_value && is_array( $meta_value ) ) {
 
-			foreach ( $meta as $id => $fullurl ) {
-				if ( self::is_valid_img_ext( $fullurl ) ) {
+			foreach ( $meta_value as $id => $fullurl ) {
+				if ( $this->is_valid_img_ext( $fullurl ) ) {
 					echo
 					'<li class="img_status">',
-						wp_get_attachment_image( $id, $field['preview_size'] ),
-						'<p><a href="#" class="cmb_remove_file_button">'. __( 'Remove Image', 'cmb' ) .'</a></p>
-						<input type="hidden" id="filelist-', $id ,'" name="', $field['id'] ,'[', $id ,']" value="', $fullurl ,'" />
+						wp_get_attachment_image( $id, $this->field->args( 'preview_size' ) ),
+						'<p class="cmb_remove_wrapper"><a href="#" class="cmb_remove_file_button">'. __( 'Remove Image', 'cmb' ) .'</a></p>
+						<input type="hidden" id="filelist-', $id ,'" name="', $name ,'[', $id ,']" value="', $fullurl ,'" />
 					</li>';
 
 				} else {
@@ -543,7 +613,7 @@ public static function file_list( $field, $meta, $object_id ) {
 					echo
 					'<li>',
 						__( 'File:', 'cmb' ), ' <strong>', $title, '</strong>&nbsp;&nbsp;&nbsp; (<a href="', $fullurl, '" target="_blank" rel="external">'. __( 'Download', 'cmb' ) .'</a> / <a href="#" class="cmb_remove_file_button">'. __( 'Remove', 'cmb' ) .'</a>)
-						<input type="hidden" id="filelist-', $id ,'" name="', $field['id'] ,'[', $id ,']" value="', $fullurl ,'" />
+						<input type="hidden" id="filelist-', $id ,'" name="', $name ,'[', $id ,']" value="', $fullurl ,'" />
 					</li>';
 				}
 			}
@@ -552,87 +622,70 @@ public static function file_list( $field, $meta, $object_id ) {
 		echo '</ul>';
 	}
 
-	public static function file( $field, $meta, $object_id, $object_type ) {
+	public function file() {
+		$meta_value = $this->field->escaped_value();
+		$allow      = $this->field->args( 'allow' );
+		$input_type = ( 'url' == $allow || ( is_array( $allow ) && in_array( 'url', $allow ) ) )
+			? 'text' : 'hidden';
 
-		$input_type_url = 'hidden';
-		if ( 'url' == $field['allow'] || ( is_array( $field['allow'] ) && in_array( 'url', $field['allow'] ) ) )
-			$input_type_url = 'text';
-		echo '<input class="cmb_upload_file" type="' . $input_type_url . '" size="45" id="', $field['id'], '" name="', $field['id'], '" value="', $meta, '" />';
+		echo '<input class="cmb_upload_file" type="' . $input_type . '" size="45" id="', $this->_id(), '" name="', $this->_name(), '" value="', $meta_value, '" />';
 		echo '<input class="cmb_upload_button button" type="button" value="'. __( 'Add or Upload File', 'cmb' ) .'" />';
 
-		$_id_name = $field['id'] .'_id';
+		$_id_id = $_id_name = $this->field->args( 'id' );
+		$_id_name .= '_id';
+		if ( $this->field->args( 'repeatable' ) ) {
+			$_id_id .= '_' . $this->iterator;
+			$_id_name .= '['. $this->iterator .']';
+		}
+		$_id_id .= '_id';
 
-		$_id_meta = cmb_Meta_Box::get_data( $_id_name );
+		$_id_meta = cmb_Meta_Box::get_data( $_id_id );
 
 		// If there is no ID saved yet, try to get it from the url
-		if ( $meta && ! $_id_meta ) {
-			$_id_meta = cmb_Meta_Box::image_id_from_url( esc_url_raw( $meta ) );
+		if ( $meta_value && ! $_id_meta ) {
+			$_id_meta = cmb_Meta_Box::image_id_from_url( esc_url_raw( $meta_value ) );
 		}
 
-		echo '<input class="cmb_upload_file_id" type="hidden" id="', $_id_name, '" name="', $_id_name, '" value="', $_id_meta, '" />',
-		self::desc( true ),
-		'<div id="', $field['id'], '_status" class="cmb_media_status">';
-			if ( ! empty( $meta ) ) {
+		echo '<input class="cmb_upload_file_id" type="hidden" id="', $_id_id, '" name="', $_id_name, '" value="', $_id_meta, '" />',
+		$this->_desc( true ),
+		'<div id="', $this->_id( '_status' ) ,'" class="cmb_media_status">';
+			if ( ! empty( $meta_value ) ) {
 
-				if ( self::is_valid_img_ext( $meta ) ) {
+				if ( $this->is_valid_img_ext( $meta_value ) ) {
 					echo '<div class="img_status">';
-					echo '<img style="max-width: 350px; width: 100%; height: auto;" src="', $meta, '" alt="" />';
-					echo '<p><a href="#" class="cmb_remove_file_button" rel="', $field['id'], '">'. __( 'Remove Image', 'cmb' ) .'</a></p>';
+					echo '<img style="max-width: 350px; width: 100%; height: auto;" src="', $meta_value, '" alt="" />';
+					echo '<p class="cmb_remove_wrapper"><a href="#" class="cmb_remove_file_button" rel="', $this->field->args( 'id' ), '">'. __( 'Remove Image', 'cmb' ) .'</a></p>';
 					echo '</div>';
 				} else {
-					// $file_ext = self::get_file_ext( $meta );
-					$parts = explode( '/', $meta );
+					// $file_ext = $this->get_file_ext( $meta_value );
+					$parts = explode( '/', $meta_value );
 					for ( $i = 0; $i < count( $parts ); ++$i ) {
 						$title = $parts[$i];
 					}
-					echo __( 'File:', 'cmb' ), ' <strong>', $title, '</strong>&nbsp;&nbsp;&nbsp; (<a href="', $meta, '" target="_blank" rel="external">'. __( 'Download', 'cmb' ) .'</a> / <a href="#" class="cmb_remove_file_button" rel="', $field['id'], '">'. __( 'Remove', 'cmb' ) .'</a>)';
+					echo __( 'File:', 'cmb' ), ' <strong>', $title, '</strong>&nbsp;&nbsp;&nbsp; (<a href="', $meta_value, '" target="_blank" rel="external">'. __( 'Download', 'cmb' ) .'</a> / <a href="#" class="cmb_remove_file_button" rel="', $this->field->args( 'id' ), '">'. __( 'Remove', 'cmb' ) .'</a>)';
 				}
 			}
 		echo '</div>';
 	}
 
-	public static function oembed( $field, $meta, $object_id, $object_type ) {
-		echo '<input class="cmb_oembed regular-text" type="text" name="', $field['id'], '" id="', $field['id'], '" value="', self::esc( $meta ), '" data-objectid="', $object_id ,'" data-objecttype="', $object_type ,'" />', self::desc( true );
+	public function oembed() {
+		$meta_value = $this->field->escaped_value();
+
+		echo '<input class="cmb_oembed regular-text" type="text" name="', $this->_name(), '" id="', $this->_id(), '" value="', $meta_value, '" data-objectid="', $this->field->object_id ,'" data-objecttype="', $this->field->object_type ,'" />', $this->_desc( true );
 		echo '<p class="cmb-spinner spinner" style="display:none;"><img src="'. admin_url( '/images/wpspin_light.gif' ) .'" alt="spinner"/></p>';
-		echo '<div id="', $field['id'], '_status" class="cmb_media_status ui-helper-clearfix embed_wrap">';
+		echo '<div id="',$this->_id( '_status' ) ,'" class="cmb_media_status ui-helper-clearfix embed_wrap">';
 
-			if ( $meta != '' )
-				echo cmb_Meta_Box_ajax::get_oembed( $meta, $object_id, array(
-					'object_type' => $object_type,
+			if ( $meta_value ) {
+				echo cmb_Meta_Box_ajax::get_oembed( $meta_value, $this->field->object_id, array(
+					'object_type' => $this->field->object_type,
 					'oembed_args' => array( 'width' => '640' ),
-					'field_id'    => $field['id'],
+					'field_id'    => $this->_id(),
 				) );
+			}
 
 		echo '</div>';
 	}
 
-	/**
-	 * Deprecated methods. use cmb_Meta_Box_types::repeat( true/false ) to toggle repeatable
-	 */
-
-	public static function text_repeat( $field, $meta ) {
-		self::repeat_text_field( $meta );
-	}
-	public static function text_small_repeat( $field, $meta ) {
-		self::repeat_text_field( $meta, 'cmb_text_small' );
-	}
-	public static function text_medium_repeat( $field, $meta ) {
-		self::repeat_text_field( $meta, 'cmb_text_medium' );
-	}
-	public static function text_email_repeat( $field, $meta ) {
-		self::repeat_text_field( $meta, 'cmb_text_email cmb_text_medium', 'email' );
-	}
-	public static function text_url_repeat( $field, $meta ) {
-		$val = self::esc( $meta );
-		$protocols = isset( $field['protocols'] ) ? (array) $field['protocols'] : null;
-		$val = $val ? esc_url( $val, $protocols ) : '';
-		self::repeat_text_field( $val, 'cmb_text_url cmb_text_medium' );
-	}
-	public static function text_money_repeat( $field, $meta ) {
-		self::repeat_text_field( $meta, 'cmb_text_money' );
-	}
-
-
 	/**
 	 * Default fallback. Allows rendering fields via "cmb_render_$name" hook
 	 * @since  1.0.0
@@ -640,9 +693,8 @@ public static function text_money_repeat( $field, $meta ) {
 	 * @param  array  $arguments All arguments passed to the method
 	 */
 	public function __call( $name, $arguments ) {
-		list( $field, $meta, $object_id, $object_type ) = $arguments;
 		// When a non-registered field is called, send it through an action.
-		do_action( "cmb_render_$name", $field, $meta, $object_id, $object_type );
+		do_action( "cmb_render_$name", $this->field->args(), $this->field->escaped_value(), $this->field->object_id, $this->field->object_type, $this );
 	}
 
 }

From 7dcffe4fd04d43b3b57035c3eb61bf8642d1d565 Mon Sep 17 00:00:00 2001
From: ArchCarrier <melson@kilohertz.nl>
Date: Mon, 10 Mar 2014 20:18:22 +0100
Subject: [PATCH 21/71] Added i18n compatibility to text_money

---
 helpers/cmb_Meta_Box_Sanitize.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/helpers/cmb_Meta_Box_Sanitize.php b/helpers/cmb_Meta_Box_Sanitize.php
index 2010d39..24933d1 100644
--- a/helpers/cmb_Meta_Box_Sanitize.php
+++ b/helpers/cmb_Meta_Box_Sanitize.php
@@ -104,13 +104,19 @@ public function text_email( $value ) {
 	 * @return string       Empty string or validated money value
 	 */
 	public function text_money( $value ) {
+		
+		global $wp_locale;
+		
+		$search = array( $wp_locale->number_format['thousands_sep'], $wp_locale->number_format['decimal_point'] );
+		$replace = array( '', $wp_locale->number_format['thousands_sep'] );
+
 		// for repeatable
 		if ( is_array( $value ) ) {
 			foreach ( $value as $key => $val ) {
-				$value[ $key ] = number_format( (float) str_ireplace( ',', '', $val ), 2, '.', ',');
+				$value[ $key ] = number_format_i18n( (float) str_ireplace( $search, $replace, $value ), 2 );
 			}
 		} else {
-			$value = number_format( (float) str_ireplace( ',', '', $value ), 2, '.', ',');
+			$value = number_format_i18n( (float) str_ireplace( $search, $replace, $meta ), 2 );
 		}
 
 		return $value;

From 0f2f86005f742513ef9a6ca4c8eb9017b0385bdd Mon Sep 17 00:00:00 2001
From: ArchCarrier <melson@kilohertz.nl>
Date: Mon, 10 Mar 2014 20:26:03 +0100
Subject: [PATCH 22/71] Update cmb_Meta_Box_Sanitize.php

Corrected two typos in variable names because of changes in trunk vs. master
---
 helpers/cmb_Meta_Box_Sanitize.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helpers/cmb_Meta_Box_Sanitize.php b/helpers/cmb_Meta_Box_Sanitize.php
index 24933d1..e6af740 100644
--- a/helpers/cmb_Meta_Box_Sanitize.php
+++ b/helpers/cmb_Meta_Box_Sanitize.php
@@ -113,10 +113,10 @@ public function text_money( $value ) {
 		// for repeatable
 		if ( is_array( $value ) ) {
 			foreach ( $value as $key => $val ) {
-				$value[ $key ] = number_format_i18n( (float) str_ireplace( $search, $replace, $value ), 2 );
+				$value[ $key ] = number_format_i18n( (float) str_ireplace( $search, $replace, $val ), 2 );
 			}
 		} else {
-			$value = number_format_i18n( (float) str_ireplace( $search, $replace, $meta ), 2 );
+			$value = number_format_i18n( (float) str_ireplace( $search, $replace, $value ), 2 );
 		}
 
 		return $value;

From e1cbf2c7724842489f12167f3c2633489d0dadd7 Mon Sep 17 00:00:00 2001
From: ArchCarrier <melson@kilohertz.nl>
Date: Tue, 11 Mar 2014 00:27:47 +0100
Subject: [PATCH 23/71] Update cmb_Meta_Box_Sanitize.php

---
 helpers/cmb_Meta_Box_Sanitize.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helpers/cmb_Meta_Box_Sanitize.php b/helpers/cmb_Meta_Box_Sanitize.php
index e6af740..faab693 100644
--- a/helpers/cmb_Meta_Box_Sanitize.php
+++ b/helpers/cmb_Meta_Box_Sanitize.php
@@ -108,7 +108,7 @@ public function text_money( $value ) {
 		global $wp_locale;
 		
 		$search = array( $wp_locale->number_format['thousands_sep'], $wp_locale->number_format['decimal_point'] );
-		$replace = array( '', $wp_locale->number_format['thousands_sep'] );
+		$replace = array( '', '.' );
 
 		// for repeatable
 		if ( is_array( $value ) ) {

From 387d4f08ace0390097e28d7a9cd4c2d3a912145d Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Tue, 11 Mar 2014 17:13:04 -0400
Subject: [PATCH 24/71] clean up and shuffle methods around

---
 helpers/cmb_Meta_Box_Sanitize.php | 116 +++++++++++++++---------------
 1 file changed, 56 insertions(+), 60 deletions(-)

diff --git a/helpers/cmb_Meta_Box_Sanitize.php b/helpers/cmb_Meta_Box_Sanitize.php
index 2010d39..9d8b5ab 100644
--- a/helpers/cmb_Meta_Box_Sanitize.php
+++ b/helpers/cmb_Meta_Box_Sanitize.php
@@ -25,8 +25,59 @@ class cmb_Meta_Box_Sanitize {
 	 * @param mixed  $value Field value
 	 */
 	public function __construct( $field, $value ) {
-		$this->field = $field;
-		$this->value = $value;
+		$this->field       = $field;
+		$this->value       = $value;
+		$this->object_id   = cmb_Meta_Box::get_object_id();
+		$this->object_type = cmb_Meta_Box::get_object_type();
+	}
+
+	/**
+	 * Catchall method if field's 'sanitization_cb' is NOT defined, or field type does not have a corresponding validation method
+	 * @since  1.0.0
+	 * @param  string $name      Non-existent method name
+	 * @param  array  $arguments All arguments passed to the method
+	 */
+	public function __call( $name, $arguments ) {
+		list( $value ) = $arguments;
+		return $this->default_sanitization( $value );
+	}
+
+	/**
+	 * Default fallback sanitization method. Applies filters.
+	 * @since  1.0.2
+	 * @param  mixed $value Meta value
+	 */
+	public function default_sanitization( $value ) {
+
+		// Allow field type validation via filter
+		$updated = apply_filters( 'cmb_validate_'. $this->field->type(), null, $value, $this->object_id, $this->field->args(), $this );
+
+		if ( null !== $updated )
+			return $updated;
+
+		switch ( $this->field->type() ) {
+			case 'wysiwyg':
+				// $value = wp_kses( $value );
+				// break;
+			case 'textarea_small':
+				return $this->textarea( $value );
+			case 'taxonomy_select':
+			case 'taxonomy_radio':
+			case 'taxonomy_multicheck':
+				if ( $this->field->args( 'taxonomy' ) ) {
+					return wp_set_object_terms( $this->object_id, $value, $this->field->args( 'taxonomy' ) );
+				}
+			case 'multicheck':
+			case 'file_list':
+			case 'oembed':
+				// no filtering
+				return $value;
+			default:
+				// Handle repeatable fields array
+				// We'll fallback to 'sanitize_text_field'
+				return is_array( $value ) ? array_map( 'sanitize_text_field', $value ) : call_user_func( 'sanitize_text_field', $value );
+		}
+
 	}
 
 	/**
@@ -46,7 +97,6 @@ public function checkbox( $value ) {
 	 * @return string        Empty string or escaped url
 	 */
 	public function text_url( $value ) {
-
 		$protocols = $this->field->args( 'protocols' );
 		// for repeatable
 		if ( is_array( $value ) ) {
@@ -143,7 +193,7 @@ public function text_datetime_timestamp( $value, $repeat = false ) {
 
 		$value = strtotime( $value['date'] .' '. $value['time'] );
 
-		if ( $tz_offset = cmb_Meta_Box::field_timezone_offset() )
+		if ( $tz_offset = $this->field->field_timezone_offset() )
 			$value += $tz_offset;
 
 		return $value;
@@ -214,10 +264,10 @@ public function textarea_code( $value, $repeat = false ) {
 	 */
 	public function file( $value ) {
 		$args = $this->field->args();
-		$id = $this->field->args( 'id' );
+		$id = $this->field->id();
 		$_id_name = $id .'_id';
 		// get _id old value
-		$_id_old = cmb_Meta_Box::get_data( $_id_name );
+		$_id_old = $this->field->get_data( $_id_name );
 
 		// If specified NOT to save the file ID
 		if ( isset( $args['save_id'] ) && ! $args['save_id'] ) {
@@ -243,60 +293,6 @@ public function file( $value ) {
 
 	}
 
-	/**
-	 * Catchall method if field's 'sanitization_cb' is NOT defined, or field type does not have a corresponding validation method
-	 * @since  1.0.0
-	 * @param  string $name      Non-existent method name
-	 * @param  array  $arguments All arguments passed to the method
-	 */
-	public function __call( $name, $arguments ) {
-		list( $value ) = $arguments;
-		return $this->default_sanitization( $value );
-	}
-
-	/**
-	 * Default fallback sanitization method. Applies filters.
-	 * @since  1.0.2
-	 * @param  mixed $value Meta value
-	 */
-	public function default_sanitization( $value ) {
-
-		$object_type = cmb_Meta_Box::get_object_type();
-		$object_id   = cmb_Meta_Box::get_object_id();
-		// Allow field type validation via filter
-		$updated     = apply_filters( 'cmb_validate_'. $this->field->args( 'type' ), null, $value, $object_id, $this->field->args(), $object_type, $this->field );
-
-		if ( null != $updated ) {
-			return $updated;
-		}
-
-		$pre = $value;
-
-		// we'll fallback to 'sanitize_text_field', or 'wp_kses_post`
-		switch ( $this->field->args( 'type' ) ) {
-			case 'wysiwyg':
-				// $value = wp_kses( $value );
-				// break;
-			case 'textarea_small':
-				return $this->textarea( $value );
-			case 'taxonomy_select':
-			case 'taxonomy_radio':
-			case 'taxonomy_multicheck':
-				if ( $this->field->args( 'taxonomy' ) ) {
-					return wp_set_object_terms( $object_id, $value, $this->field->args( 'taxonomy' ) );
-				}
-			case 'multicheck':
-			case 'file_list':
-			case 'oembed':
-				// no filtering
-				return $value;
-			default:
-				// Handle repeatable fields array
-				return is_array( $value ) ? array_map( 'sanitize_text_field', $value ) : call_user_func( 'sanitize_text_field', $value );
-		}
-
-	}
-
 	/**
 	 * If repeating, loop through and re-apply sanitization method
 	 * @since  1.0.3

From b10b07a58e231c259292c6b3ff359a1b4531b34d Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Tue, 11 Mar 2014 17:14:52 -0400
Subject: [PATCH 25/71] clean up, document, and shuffle methods around

---
 helpers/cmb_Meta_Box_types.php | 303 ++++++++++++++++++++-------------
 1 file changed, 185 insertions(+), 118 deletions(-)

diff --git a/helpers/cmb_Meta_Box_types.php b/helpers/cmb_Meta_Box_types.php
index 01e960f..9ea63d2 100644
--- a/helpers/cmb_Meta_Box_types.php
+++ b/helpers/cmb_Meta_Box_types.php
@@ -28,11 +28,22 @@ public function __construct( $field ) {
 		$this->field = $field;
 	}
 
+	/**
+	 * Default fallback. Allows rendering fields via "cmb_render_$name" hook
+	 * @since  1.0.0
+	 * @param  string $name      Non-existent method name
+	 * @param  array  $arguments All arguments passed to the method
+	 */
+	public function __call( $name, $arguments ) {
+		// When a non-registered field is called, send it through an action.
+		do_action( "cmb_render_$name", $this->field->args(), $this->field->escaped_value(), $this->field->object_id, $this->field->object_type, $this );
+	}
+
 	public function render() {
 		if ( $this->field->args( 'repeatable' ) ) {
 			$this->render_repeatable_field();
 		} else {
-			echo $this->{$this->field->args( 'type' )}();
+			echo $this->{$this->field->type()}();
 		}
 	}
 
@@ -120,6 +131,90 @@ public function concat_attributes( $attrs, $attr_exclude = array() ) {
 		return $attributes;
 	}
 
+	/**
+	 * Generates html for an option element
+	 * @since  1.0.3
+	 * @param  string  $opt_label Option label
+	 * @param  string  $opt_value Option value
+	 * @param  mixed   $selected  Selected attribute if option is selected
+	 * @return string             Generated option element html
+	 */
+	public function option( $opt_label, $opt_value, $selected ) {
+		return sprintf( "\t".'<option value="%s" %s>%s</option>', $opt_value, selected( $selected, true, false ), $opt_label )."\n";
+	}
+
+	/**
+	 * Generates options html
+	 * @since  1.0.3
+	 * @param  array   $args   Optional arguments
+	 * @param  string  $method Method to generate individual option item
+	 * @return string          Concatenated html options
+	 */
+	public function concat_options( $args = array(), $method = 'list_input' ) {
+
+		$options     = (array) $this->field->args( 'options' );
+		$saved_value = $this->field->escaped_value();
+		$value       = $saved_value ? $saved_value : $this->field->args( 'default' );
+
+		$_options = ''; $i = 1;
+		foreach ( $options as $option_key => $option ) {
+
+			// Check for the "old" way
+			$opt_label = isset( $option['name'] ) ? $option['name'] : $option;
+			$opt_value = isset( $option['value'] ) ? $option['value'] : $option_key;
+			$selected  = $value == $opt_value;
+
+			if ( ! empty( $args ) ) {
+				$args['value'] = $opt_value;
+				$args['label'] = $opt_label;
+				if ( $selected )
+					$args['selected'] = 'selected';
+
+				$_options .= $this->$method( $args, $i );
+			} else {
+				$_options .= $this->option( $opt_label, $opt_value, $selected );
+			}
+			$i++;
+		}
+		return $_options;
+	}
+
+	/**
+	 * Generates html for list item with input
+	 * @since  1.0.3
+	 * @param  array  $args Override arguments
+	 * @param  int    $i    Iterator value
+	 * @return string       Gnerated list item html
+	 */
+	public function list_input( $args = array(), $i ) {
+		$args = $this->parse_args( $args, 'list_input', array(
+			'type'  => 'radio',
+			'class' => 'cmb_option',
+			'name'  => $this->_name(),
+			'id'    => $this->_id( $i ),
+			'value' => $this->field->escaped_value(),
+			'label' => '',
+		) );
+
+		return sprintf( "\t".'<li><input%s/> <label for="%s">%s</label></li>'."\n", $this->concat_attributes( $args, 'label' ), $this->_id( $i ), $args['label'] );
+	}
+
+	/**
+	 * Generates html for list item with checkbox input
+	 * @since  1.0.3
+	 * @param  array  $args Override arguments
+	 * @param  int    $i    Iterator value
+	 * @return string       Gnerated list item html
+	 */
+	public function list_input_checkbox( $args, $i ) {
+		unset( $args['selected'] );
+		$saved_value = $this->field->escaped_value();
+		if ( is_array( $saved_value ) && in_array( $args['value'], $saved_value ) ) {
+			$args['checked'] = 'checked';
+		}
+		return $this->list_input( $args, $i );
+	}
+
 	/**
 	 * Generates repeatable fields
 	 * @since  1.0.0
@@ -144,20 +239,20 @@ public function render_repeatable_field() {
 			foreach ( (array) $meta_value as $val ) {
 				$this->field->escaped_value = $val;
 				$this->open_repeat_row();
-				echo call_user_func( array( $this, $this->field->args( 'type' ) ) );
+				echo call_user_func( array( $this, $this->field->type() ) );
 				$this->close_repeat_row();
 				$this->iterator++;
 			}
 		} else {
 			$this->open_repeat_row();
-			echo call_user_func( array( $this, $this->field->args( 'type' ) ) );
+			echo call_user_func( array( $this, $this->field->type() ) );
 			$this->close_repeat_row();
 		}
 
 		$this->open_empty_row();
 		$this->field->escaped_value = '';
 		$this->iterator = $this->iterator ? $this->iterator : 1;
-		echo call_user_func( array( $this, $this->field->args( 'type' ) ) );
+		echo call_user_func( array( $this, $this->field->type() ) );
 		$this->close_repeat_row();
 
 		$this->repeat_table_close();
@@ -171,7 +266,7 @@ public function render_repeatable_field() {
 	 * @param  string $class Field's class attribute
 	 */
 	protected function repeat_table_open( $class = '' ) {
-		echo $this->_desc(), '<table id="', $this->field->args( 'id' ), '_repeat" class="cmb-repeat-table ', $class ,'"><tbody>';
+		echo $this->_desc(), '<table id="', $this->field->id(), '_repeat" class="cmb-repeat-table ', $class ,'"><tbody>';
 	}
 
 	/**
@@ -179,7 +274,7 @@ protected function repeat_table_open( $class = '' ) {
 	 * @since 1.0.0
 	 */
 	protected function repeat_table_close() {
-		echo '</tbody></table><p class="add-row"><a data-selector="', $this->field->args( 'id' ) ,'_repeat" class="add-row-button button" href="#">'. __( 'Add Row', 'cmb' ) .'</a></p>';
+		echo '</tbody></table><p class="add-row"><a data-selector="', $this->field->id() ,'_repeat" class="add-row-button button" href="#">'. __( 'Add Row', 'cmb' ) .'</a></p>';
 	}
 
 	protected function open_repeat_row() {
@@ -212,12 +307,24 @@ public function _desc( $paragraph = false ) {
 		return "\n<$tag class=\"cmb_metabox_description\">{$this->field->args( 'description' )}</$tag>\n";
 	}
 
+	/**
+	 * Generate field name attribute
+	 * @since  1.0.3
+	 * @param  string  $suffix For multi-part fields
+	 * @return string          Name attribute
+	 */
 	public function _name( $suffix = '' ) {
-		return $this->field->args( 'id' ) . ( $this->field->args( 'repeatable' ) ? '['. $this->iterator .']' : '' ) . $suffix;
+		return $this->field->args( '_name' ) . ( $this->field->args( 'repeatable' ) ? '['. $this->iterator .']' : '' ) . $suffix;
 	}
 
+	/**
+	 * Generate field id attribute
+	 * @since  1.0.3
+	 * @param  string  $suffix For multi-part fields
+	 * @return string          Id attribute
+	 */
 	public function _id( $suffix = '' ) {
-		return $this->field->args( 'id' ) . $suffix . ( $this->field->args( 'repeatable' ) ? '_'. $this->iterator .'" data-iterator="'. $this->iterator : '' );
+		return $this->field->id() . $suffix . ( $this->field->args( 'repeatable' ) ? '_'. $this->iterator .'" data-iterator="'. $this->iterator : '' );
 	}
 
 	/**
@@ -290,6 +397,25 @@ public function text_time() {
 		return $this->input( array( 'class' => 'cmb_timepicker text_time', 'desc' => $this->_desc() ) );
 	}
 
+	public function text_money() {
+		return ( ! $this->field->args( 'before' ) ? '$ ' : ' ' ) . $this->input( array( 'class' => 'cmb_text_money', 'desc' => $this->_desc() ) );
+	}
+
+	public function textarea_small() {
+		return $this->textarea( array( 'class' => 'cmb_textarea_small', 'rows' => 4 ) );
+	}
+
+	public function textarea_code() {
+		return sprintf( '<pre>%s</pre>', $this->textarea( array( 'class' => 'cmb_textarea_code' )  ) );
+	}
+
+	public function wysiwyg() {
+		$saved_value = stripslashes( html_entity_decode( $this->field->escaped_value( 'esc_html' ) ) );
+		// $id = strtolower( str_ireplace( array( '-', '_' ), '', $this->_id() ) ) . 'wpeditor';
+		wp_editor( $saved_value, $this->_id(), $this->field->args( 'options' ) );
+		echo $this->_desc( true );
+	}
+
 	public function text_date_timestamp() {
 		$meta_value = $this->field->escaped_value();
 		$value = ! empty( $meta_value ) ? date( 'm\/d\/Y', $meta_value ) : '';
@@ -301,7 +427,7 @@ public function text_datetime_timestamp( $meta_value = '' ) {
 		if ( ! $meta_value ) {
 			$meta_value = $this->field->escaped_value();
 			// This will be used if there is a select_timezone set for this field
-			$tz_offset = cmb_Meta_Box::field_timezone_offset( $this->field->object_id );
+			$tz_offset = $this->field->field_timezone_offset();
 			if ( ! empty( $tz_offset ) ) {
 				$meta_value -= $tz_offset;
 			}
@@ -357,10 +483,6 @@ public function select_timezone() {
 		return '<select name="'. $this->_name() .'" id="'. $this->_id() .'">'. wp_timezone_choice( $meta_value ) .'</select>';
 	}
 
-	public function text_money() {
-		return ( ! $this->field->args( 'before' ) ? '$ ' : ' ' ) . $this->input( array( 'class' => 'cmb_text_money', 'desc' => $this->_desc() ) );
-	}
-
 	public function colorpicker() {
 		$meta_value = $this->field->escaped_value();
 		$hex_color = '(([a-fA-F0-9]){3}){1,2}$';
@@ -372,14 +494,6 @@ public function colorpicker() {
 		return $this->input( array( 'class' => 'cmb_colorpicker cmb_text_small', 'value' => $meta_value ) );
 	}
 
-	public function textarea_small() {
-		return $this->textarea( array( 'class' => 'cmb_textarea_small', 'rows' => 4 ) );
-	}
-
-	public function textarea_code() {
-		return sprintf( '<pre>%s</pre>', $this->textarea( array( 'class' => 'cmb_textarea_code' )  ) );
-	}
-
 	public function title() {
 		$args = $this->parse_args( array(), 'title', array(
 			'class' => 'cmb_metabox_title',
@@ -391,50 +505,6 @@ public function title() {
 		return sprintf( '<%1$s%2s">%3$s</%1$s>%4$s', $args['tag'], $attrs, $this->field->args( 'name' ), $args['desc'] );
 	}
 
-	public function wysiwyg() {
-		$saved_value = stripslashes( html_entity_decode( $this->field->escaped_value( 'esc_html' ) ) );
-		// $id = strtolower( str_ireplace( array( '-', '_' ), '', $this->_id() ) ) . 'wpeditor';
-		wp_editor( $saved_value, $this->_id(), $this->field->args( 'options' ) );
-		echo $this->_desc( true );
-	}
-
-	public function option( $opt_label, $opt_value, $selected ) {
-		return sprintf( "\t".'<option value="%s" %s>%s</option>', $opt_value, selected( $selected, true, false ), $opt_label )."\n";
-	}
-
-	public function concat_options( $args = array(), $method = 'list_input' ) {
-
-		$options     = (array) $this->field->args( 'options' );
-		$saved_value = $this->field->escaped_value();
-		$value       = $saved_value ? $saved_value : $this->field->args( 'default' );
-
-		$_options = ''; $i = 1;
-		foreach ( $options as $option_key => $option ) {
-
-			// Check for the "old" way
-			$opt_label = isset( $option['name'] ) ? $option['name'] : $option;
-			$opt_value = isset( $option['value'] ) ? $option['value'] : $option_key;
-			$selected  = $value == $opt_value;
-
-			if ( ! empty( $args ) ) {
-				$args['value'] = $opt_value;
-				$args['label'] = $opt_label;
-				if ( $selected )
-					$args['selected'] = 'selected';
-
-				$_options .= $this->$method( $args, $i );
-			} else {
-				$_options .= $this->option( $opt_label, $opt_value, $selected );
-			}
-			// $_options .= $args
-			// 	? $this->list_input( $args, $opt_label, $opt_value, $selected, $i )
-			// 	: $this->option( $opt_label, $opt_value, $selected );
-
-			$i++;
-		}
-		return $_options;
-	}
-
 	public function select( $args = array() ) {
 		$args = $this->parse_args( $args, 'select', array(
 			'class'   => 'cmb_select',
@@ -463,28 +533,6 @@ public function taxonomy_select() {
 		return $this->select( array( 'options' => $options ) );
 	}
 
-	public function list_input( $args = array(), $i ) {
-		$args = $this->parse_args( $args, 'list_input', array(
-			'type'  => 'radio',
-			'class' => 'cmb_option',
-			'name'  => $this->_name(),
-			'id'    => $this->_id( $i ),
-			'value' => $this->field->escaped_value(),
-			'label' => '',
-		) );
-
-		return sprintf( "\t".'<li><input%s/> <label for="%s">%s</label></li>'."\n", $this->concat_attributes( $args, 'label' ), $this->_id( $i ), $args['label'] );
-	}
-
-	public function list_input_checkbox( $args, $i ) {
-		unset( $args['selected'] );
-		$saved_value = $this->field->escaped_value();
-		if ( is_array( $saved_value ) && in_array( $args['value'], $saved_value ) ) {
-			$args['checked'] = 'checked';
-		}
-		return $this->list_input( $args, $i );
-	}
-
 	public function radio( $args = array(), $type = 'radio' ) {
 		$args = $this->parse_args( $args, $type, array(
 			'class'   => 'cmb_radio_list',
@@ -541,7 +589,6 @@ public function taxonomy_radio() {
 		}
 
 		return $this->radio( array( 'options' => $options ), 'taxonomy_radio' );
-
 	}
 
 	public function taxonomy_radio_inline() {
@@ -589,20 +636,39 @@ public function file_list() {
 		$meta_value = $this->field->escaped_value();
 
 		$name = $this->_name();
-		echo '<input class="cmb_upload_file cmb_upload_list" type="hidden" size="45" id="', $this->_id(), '" name="', $name ,'" value="" />';
-		echo '<input class="cmb_upload_button button cmb_upload_list" type="button" value="'. __( 'Add or Upload File', 'cmb' ) .'" />', $this->_desc( true );
+
+		echo $this->input( array(
+			'type'  => 'hidden',
+			'class' => 'cmb_upload_file cmb_upload_list',
+			'size'  => 45, 'desc'  => '', 'value'  => '',
+		) ),
+		$this->input( array(
+			'type'  => 'button',
+			'class' => 'cmb_upload_button button cmb_upload_list',
+			'value'  => __( 'Add or Upload File', 'cmb' ),
+			'name'  => '', 'id'  => '',
+		) );
 
 		echo '<ul id="', $this->_id( '_status' ) ,'" class="cmb_media_status attach_list">';
 
 		if ( $meta_value && is_array( $meta_value ) ) {
 
 			foreach ( $meta_value as $id => $fullurl ) {
+				$id_input = $this->input( array(
+					'type'  => 'hidden',
+					'class' => '',
+					'value'  => $fullurl,
+					'name'  => $name .'['. $id .']',
+					'id'  => 'filelist-'. $id,
+					'desc' => '',
+				) );
+
 				if ( $this->is_valid_img_ext( $fullurl ) ) {
 					echo
 					'<li class="img_status">',
 						wp_get_attachment_image( $id, $this->field->args( 'preview_size' ) ),
 						'<p class="cmb_remove_wrapper"><a href="#" class="cmb_remove_file_button">'. __( 'Remove Image', 'cmb' ) .'</a></p>
-						<input type="hidden" id="filelist-', $id ,'" name="', $name ,'[', $id ,']" value="', $fullurl ,'" />
+						'. $id_input .'
 					</li>';
 
 				} else {
@@ -613,7 +679,7 @@ public function file_list() {
 					echo
 					'<li>',
 						__( 'File:', 'cmb' ), ' <strong>', $title, '</strong>&nbsp;&nbsp;&nbsp; (<a href="', $fullurl, '" target="_blank" rel="external">'. __( 'Download', 'cmb' ) .'</a> / <a href="#" class="cmb_remove_file_button">'. __( 'Remove', 'cmb' ) .'</a>)
-						<input type="hidden" id="filelist-', $id ,'" name="', $name ,'[', $id ,']" value="', $fullurl ,'" />
+						'. $id_input .'
 					</li>';
 				}
 			}
@@ -628,10 +694,15 @@ public function file() {
 		$input_type = ( 'url' == $allow || ( is_array( $allow ) && in_array( 'url', $allow ) ) )
 			? 'text' : 'hidden';
 
-		echo '<input class="cmb_upload_file" type="' . $input_type . '" size="45" id="', $this->_id(), '" name="', $this->_name(), '" value="', $meta_value, '" />';
-		echo '<input class="cmb_upload_button button" type="button" value="'. __( 'Add or Upload File', 'cmb' ) .'" />';
+		echo $this->input( array(
+			'type'  => $input_type,
+			'class' => 'cmb_upload_file',
+			'size'  => 45,
+			'desc'  => '',
+		) ),
+		'<input class="cmb_upload_button button" type="button" value="'. __( 'Add or Upload File', 'cmb' ) .'" />';
 
-		$_id_id = $_id_name = $this->field->args( 'id' );
+		$_id_id = $_id_name = $this->field->id();
 		$_id_name .= '_id';
 		if ( $this->field->args( 'repeatable' ) ) {
 			$_id_id .= '_' . $this->iterator;
@@ -639,22 +710,27 @@ public function file() {
 		}
 		$_id_id .= '_id';
 
-		$_id_meta = cmb_Meta_Box::get_data( $_id_id );
+		$_id_meta = $this->field->get_data( $_id_id );
 
 		// If there is no ID saved yet, try to get it from the url
 		if ( $meta_value && ! $_id_meta ) {
 			$_id_meta = cmb_Meta_Box::image_id_from_url( esc_url_raw( $meta_value ) );
 		}
 
-		echo '<input class="cmb_upload_file_id" type="hidden" id="', $_id_id, '" name="', $_id_name, '" value="', $_id_meta, '" />',
-		$this->_desc( true ),
+		echo $this->input( array(
+			'type'  => 'hidden',
+			'class' => 'cmb_upload_file_id',
+			'name'  => $_id_name,
+			'id'  => $_id_id,
+			'value'  => $_id_meta,
+		) ),
 		'<div id="', $this->_id( '_status' ) ,'" class="cmb_media_status">';
 			if ( ! empty( $meta_value ) ) {
 
 				if ( $this->is_valid_img_ext( $meta_value ) ) {
 					echo '<div class="img_status">';
 					echo '<img style="max-width: 350px; width: 100%; height: auto;" src="', $meta_value, '" alt="" />';
-					echo '<p class="cmb_remove_wrapper"><a href="#" class="cmb_remove_file_button" rel="', $this->field->args( 'id' ), '">'. __( 'Remove Image', 'cmb' ) .'</a></p>';
+					echo '<p class="cmb_remove_wrapper"><a href="#" class="cmb_remove_file_button" rel="', $this->field->id(), '">'. __( 'Remove Image', 'cmb' ) .'</a></p>';
 					echo '</div>';
 				} else {
 					// $file_ext = $this->get_file_ext( $meta_value );
@@ -662,20 +738,22 @@ public function file() {
 					for ( $i = 0; $i < count( $parts ); ++$i ) {
 						$title = $parts[$i];
 					}
-					echo __( 'File:', 'cmb' ), ' <strong>', $title, '</strong>&nbsp;&nbsp;&nbsp; (<a href="', $meta_value, '" target="_blank" rel="external">'. __( 'Download', 'cmb' ) .'</a> / <a href="#" class="cmb_remove_file_button" rel="', $this->field->args( 'id' ), '">'. __( 'Remove', 'cmb' ) .'</a>)';
+					echo __( 'File:', 'cmb' ), ' <strong>', $title, '</strong>&nbsp;&nbsp;&nbsp; (<a href="', $meta_value, '" target="_blank" rel="external">'. __( 'Download', 'cmb' ) .'</a> / <a href="#" class="cmb_remove_file_button" rel="', $this->field->id(), '">'. __( 'Remove', 'cmb' ) .'</a>)';
 				}
 			}
 		echo '</div>';
 	}
 
 	public function oembed() {
-		$meta_value = $this->field->escaped_value();
-
-		echo '<input class="cmb_oembed regular-text" type="text" name="', $this->_name(), '" id="', $this->_id(), '" value="', $meta_value, '" data-objectid="', $this->field->object_id ,'" data-objecttype="', $this->field->object_type ,'" />', $this->_desc( true );
-		echo '<p class="cmb-spinner spinner" style="display:none;"><img src="'. admin_url( '/images/wpspin_light.gif' ) .'" alt="spinner"/></p>';
-		echo '<div id="',$this->_id( '_status' ) ,'" class="cmb_media_status ui-helper-clearfix embed_wrap">';
-
-			if ( $meta_value ) {
+		echo $this->input( array(
+			'class'           => 'cmb_oembed regular-text',
+			'data-objectid'   => $this->field->object_id,
+			'data-objecttype' => $this->field->object_type
+		) ),
+		'<p class="cmb-spinner spinner" style="display:none;"><img src="'. admin_url( '/images/wpspin_light.gif' ) .'" alt="spinner"/></p>',
+		'<div id="',$this->_id( '_status' ) ,'" class="cmb_media_status ui-helper-clearfix embed_wrap">';
+
+			if ( $meta_value = $this->field->escaped_value() ) {
 				echo cmb_Meta_Box_ajax::get_oembed( $meta_value, $this->field->object_id, array(
 					'object_type' => $this->field->object_type,
 					'oembed_args' => array( 'width' => '640' ),
@@ -686,15 +764,4 @@ public function oembed() {
 		echo '</div>';
 	}
 
-	/**
-	 * Default fallback. Allows rendering fields via "cmb_render_$name" hook
-	 * @since  1.0.0
-	 * @param  string $name      Non-existent method name
-	 * @param  array  $arguments All arguments passed to the method
-	 */
-	public function __call( $name, $arguments ) {
-		// When a non-registered field is called, send it through an action.
-		do_action( "cmb_render_$name", $this->field->args(), $this->field->escaped_value(), $this->field->object_id, $this->field->object_type, $this );
-	}
-
 }

From 411a766ffd87188447584e8ef9651298f5e3f4d9 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Tue, 11 Mar 2014 17:16:37 -0400
Subject: [PATCH 26/71] Move field-specific methods from main class, and setup 
 property

---
 helpers/cmb_Meta_Box_field.php | 298 +++++++++++++++++++++++++++++----
 1 file changed, 266 insertions(+), 32 deletions(-)

diff --git a/helpers/cmb_Meta_Box_field.php b/helpers/cmb_Meta_Box_field.php
index 4661fea..768a54f 100644
--- a/helpers/cmb_Meta_Box_field.php
+++ b/helpers/cmb_Meta_Box_field.php
@@ -9,47 +9,53 @@ class cmb_Meta_Box_field {
 	/**
 	 * Metabox object id
 	 * @var   mixed
-	 * @since 1.0.0
+	 * @since 1.0.3
 	 */
 	public $object_id;
 
 	/**
 	 * Metabox object type
 	 * @var   mixed
-	 * @since 1.0.0
+	 * @since 1.0.3
 	 */
 	public $object_type;
 
 	/**
 	 * Field arguments
 	 * @var   mixed
-	 * @since 1.0.0
+	 * @since 1.0.3
 	 */
 	public $args;
 
 	/**
-	 * Field meta value
+	 * Field group arguments
 	 * @var   mixed
-	 * @since 1.0.0
+	 * @since 1.0.3
 	 */
-	public $meta;
+	public $group;
 
 	/**
-	 * An iterator value for repeatable fields
-	 * @var   integer
-	 * @since 1.0.0
+	 * Field meta value
+	 * @var   mixed
+	 * @since 1.0.3
 	 */
-	public $iterator = 0;
+	public $value;
 
-
-	public function __construct( $field_args, $object_id, $object_type ) {
-		$this->object_id   = $object_id;
-		$this->object_type = $object_type;
-		$this->args        = $this->set_field_defaults( $field_args );
+	/**
+	 * Constructs our field object
+	 * @since 1.0.3
+	 * @param array $field_args       Field arguments
+	 * @param array $group_field_args (optional) Group field arguments
+	 */
+	public function __construct( $field_args, $group_field_args = array() ) {
+		$this->object_id   = cmb_Meta_Box::get_object_id();
+		$this->object_type = cmb_Meta_Box::get_object_type();
+		$this->args        = $this->_set_field_defaults( $field_args );
+		$this->group       = ! empty( $group_field_args ) ? $group_field_args : false;
 
 		// Allow an override for the field's value
 		// (assuming no one would want to save 'cmb_no_override_val' as a value)
-		$this->value = apply_filters( 'cmb_override_meta_value', 'cmb_no_override_val', $object_id, $this->args(), $object_type, $this );
+		$this->value = apply_filters( 'cmb_override_meta_value', 'cmb_no_override_val', $this->object_id, $this->args(), $this->object_type, $this );
 
 		// If no override, get our meta
 		$this->value = 'cmb_no_override_val' === $this->value
@@ -57,14 +63,44 @@ public function __construct( $field_args, $object_id, $object_type ) {
 			: $this->value;
 	}
 
+	/**
+	 * Non-existent methods fallback to checking for field arguments of the same name
+	 * @since  1.0.3
+	 * @param  string $name     Method name
+	 * @param  array  $arguments Array of passed-in arguments
+	 * @return mixed             Value of field argument
+	 */
+	public function __call( $name, $arguments ) {
+		return $this->args( $name );
+	}
+
+	/**
+	 * Get a field argument
+	 * @since  1.0.3
+	 * @param  string $key Argument to check
+	 * @return mixed       Argument value or false if non-existent
+	 */
 	public function args( $key = '' ) {
 		return $this->_data( 'args', $key );
 	}
 
+	/**
+	 * Get Field's value
+	 * @since  1.0.3
+	 * @param  string $key If value is an array, is used to get array key->value
+	 * @return mixed       Field value or false if non-existent
+	 */
 	public function value( $key = '' ) {
 		return $this->_data( 'value', $key );
 	}
 
+	/**
+	 * Retrieve a portion of a field property
+	 * @since  1.0.3
+	 * @param  string  $var Field property to check
+	 * @param  string  $key Field property array key to check
+	 * @return mixed        Queried property value or false
+	 */
 	public function _data( $var, $key = '' ) {
 		$vars = $this->$var;
 		if ( $key ) {
@@ -79,36 +115,149 @@ public function _data( $var, $key = '' ) {
 	 * @param  string  $field_id Meta key/Option array key
 	 * @return mixed             Meta/Option value
 	 */
-	public function get_data() {
-
-		$type     = $this->object_type;
-		$id       = $this->object_id;
-		$field_id = $this->args( 'id' );
-		$single   = ! $this->args( 'multiple' );
-		$repeat   = $this->args( 'repeatable' );
+	public function get_data( $field_id = '', $args = array() ) {
+		if ( $field_id ) {
+			$args['field_id'] = $field_id;
+		} else if ( $this->group ) {
+			$args['field_id'] = $this->group['id'];
+		}
+		extract( $this->data_args( $args ) );
 
 		$data = 'options-page' === $type
 			? cmb_Meta_Box::get_option( $id, $field_id )
 			: get_metadata( $type, $id, $field_id, ( $single || $repeat ) /* If multicheck this can be multiple values */ );
 
+		if ( $this->group ) {
+			$data = isset( $data[ $this->group['count'] ][ $this->args( '_id' ) ] )
+				? $data[ $this->group['count'] ][ $this->args( '_id' ) ]
+				: false;
+		}
 		return $data;
 	}
 
+	/**
+	 * Updates metadata/option data
+	 * @since  1.0.1
+	 * @param  mixed $value  Value to update data with
+	 * @param  bool  $single Whether data is an array (add_metadata)
+	 */
+	public function update_data( $new_value, $single = true ) {
+		extract( $this->data_args( array( 'new_value' => $new_value, 'single' => $single ) ) );
+
+		$new_value = $repeat ? array_values( $new_value ) : $new_value;
+
+		if ( 'options-page' === $type )
+			return cmb_Meta_Box::update_option( $id, $field_id, $new_value, $single );
+
+		if ( ! $single )
+			return add_metadata( $type, $id, $field_id, $new_value, false );
+
+		return update_metadata( $type, $id, $field_id, $new_value );
+	}
+
+	/**
+	 * Removes/updates metadata/option data
+	 * @since  1.0.1
+	 * @param  string $old Old value
+	 */
+	public function remove_data( $old = '' ) {
+		extract( $this->data_args() );
+
+		return 'options-page' === $type
+			? cmb_Meta_Box::remove_option( $id, $field_id )
+			: delete_metadata( $type, $id, $field_id, $old );
+	}
+
+	/**
+	 * data variables for get/set data methods
+	 * @since  1.0.3
+	 * @param  array $args Override arguments
+	 * @return array       Updated arguments
+	 */
+	public function data_args( $args = array() ) {
+		return wp_parse_args( $args, array(
+			'type'     => $this->object_type,
+			'id'       => $this->object_id,
+			'field_id' => $this->id(),
+			'repeat'   => $this->args( 'repeatable' ),
+			'single'   => ! $this->args( 'multiple' ),
+		) );
+	}
+
+	/**
+	 * Checks if field has a registered validation callback
+	 * @since  1.0.1
+	 * @param  mixed $meta_value Meta value
+	 * @return mixed             Possibly validated meta value
+	 */
+	public function sanitization_cb( $meta_value ) {
+		if ( empty( $meta_value ) )
+			return $meta_value;
+
+		// Check if the field has a registered validation callback
+		$cb = $this->maybe_callback( 'sanitization_cb' );
+		if ( false === $cb ) {
+			// If requestion NO validation, return meta value
+			return $meta_value;
+		} elseif ( $cb ) {
+			// Ok, callback is good, let's run it.
+			return call_user_func( $cb, $meta_value, $this->args(), $this );
+		}
+
+		$clean = new cmb_Meta_Box_Sanitize( $this, $meta_value );
+		// Validation via 'cmb_Meta_Box_Sanitize' (with fallback filter)
+		return $clean->{$this->type()}( $meta_value );
+	}
+
+	/**
+	 * Checks if field has a callback value
+	 * @since  1.0.1
+	 * @param  string $cb Callback string
+	 * @return mixed      NULL, false for NO validation, or $cb string if it exists.
+	 */
+	public function maybe_callback( $cb ) {
+		$field_args = $this->args();
+		if ( ! isset( $field_args[ $cb ] ) )
+			return;
+
+		// Check if metabox is requesting NO validation
+		$cb = false !== $field_args[ $cb ] && 'false' !== $field_args[ $cb ] ? $field_args[ $cb ] : false;
+
+		// If requestion NO validation, return false
+		if ( ! $cb )
+			return false;
+
+		if ( is_callable( $cb ) )
+			return $cb;
+	}
+
+	/**
+	 * Determine if current type is excempt from escaping
+	 * @since  1.0.3
+	 * @return bool  True if exempt
+	 */
 	public function escaping_exception() {
 		// These types cannot be escaped
-		return in_array( $this->args( 'type' ), array(
+		return in_array( $this->type(), array(
 			'file_list',
 			'multicheck',
 			'text_datetime_timestamp_timezone',
 		) );
 	}
 
+	/**
+	 * Determine if current type cannot be repeatable
+	 * @since  1.0.3
+	 * @param  string $type Field type to check
+	 * @return bool         True if type cannot be repeatable
+	 */
 	public function repeatable_exception( $type ) {
 		// These types cannot be escaped
 		return in_array( $type, array(
-			'title',
 			'file', // Use file_list
 			'radio',
+			'title',
+			'group',
 			// @todo Ajax load wp_editor: http://wordpress.stackexchange.com/questions/51776/how-to-load-wp-editor-through-ajax-jquery
 			'wysiwyg',
 			'checkbox',
@@ -133,7 +282,7 @@ public function escaped_value( $func = 'esc_attr', $meta_value = '' ) {
 
 		$meta_value = $meta_value ? $meta_value : $this->value();
 		// Check if the field has a registered escaping callback
-		$cb = cmb_Meta_Box::maybe_callback( $this->args(), 'escape_cb' );
+		$cb = $this->maybe_callback( 'escape_cb' );
 		if ( false === $cb || $this->escaping_exception() ) {
 			// If requesting NO escaping, return meta value
 			return $meta_value;
@@ -143,7 +292,7 @@ public function escaped_value( $func = 'esc_attr', $meta_value = '' ) {
 		}
 
 		// Or custom escaping filter can be used
-		$esc = apply_filters( 'cmb_types_esc_'. $this->args( 'type' ), null, $meta_value, $this->args(), $this );
+		$esc = apply_filters( 'cmb_types_esc_'. $this->type(), null, $meta_value, $this->args(), $this );
 		if ( null !== $esc ) {
 			return $esc;
 		}
@@ -164,12 +313,88 @@ public function escaped_value( $func = 'esc_attr', $meta_value = '' ) {
 		return $this->escaped_value;
 	}
 
+	/**
+	 * Offset a time value based on timezone
+	 * @since  1.0.0
+	 * @return string Offset time string
+	 */
+	public function field_timezone_offset() {
+		return cmb_Meta_Box::timezone_offset( $this->field_timezone() );
+	}
+
+	/**
+	 * Return timezone string
+	 * @since  1.0.0
+	 * @return string Timezone string
+	 */
+	public function field_timezone() {
+
+		// Is timezone arg set?
+		if ( $this->args( 'timezone' ) ) {
+			return $this->args( 'timezone' ) ;
+		}
+		// Is there another meta key with a timezone stored as its value we should use?
+		else if ( $this->args( 'timezone_meta_key' ) ) {
+			return $this->get_data( $this->args( 'timezone_meta_key' ) );
+		}
+
+		return false;
+	}
+
+	/**
+	 * Render a field row
+	 * @since 1.0.0
+	 * @param boolean $show_names Whether field names should be visible
+	 */
+	public function render_field( $show_names = true ) {
+
+		if ( ! $this->args( 'on_front' ) )
+			continue;
+		$classes = 'cmb-type-'. sanitize_html_class( $this->type() );
+		$classes .= ' cmb_id_'. sanitize_html_class( $this->id() );
+		$classes .= $this->args( 'repeatable' ) ? ' cmb-repeat' : '';
+		// 'inline' flag, or _inline in the field type, set to true
+		$classes .= $this->args( 'inline' ) ? ' cmb-inline' : '';
+
+
+		printf( "<tr class=\"%s\">\n", $classes );
+
+		if ( 'title' == $this->type() || ! $show_names ) {
+			echo "\t<td colspan=\"2\">\n";
+			if ( ! $show_names ) {
+				printf( '<label style="display:none;" for="%s">%s</label>', $this->id(), $this->args( 'name' ) );
+			}
+		} else {
+
+			$style = 'post' == $this->object_type ? ' style="width:18%"' : '';
+			printf( '<th%s><label for="%s">%s</label></th>', $style, $this->id(), $this->args( 'name' ) );
+
+			echo "\n\t<td>\n";
+		}
+
+		echo $this->args( 'before' );
+
+		if ( isset( $_GET['jtdebug'] ) ) {
+			$val = $this->value();
+			if ( is_array( $val ) )
+				echo '<xmp>$val: '. print_r( $val, true ) .'</xmp>';
+			else
+				echo '<p>$val: '. $val .'</p>';
+		}
+		$this_type = new cmb_Meta_Box_types( $this );
+		$this_type->render();
+
+		echo $this->args( 'after' );
+
+		echo "\n\t</td>\n</tr>";
+	}
+
 	/**
 	 * Fills in empty field parameters with defaults
-	 * @since  1.0.3
-	 * @param  array $field Metabox field config array
+	 * @since 1.0.3
+	 * @param array $args Metabox field config array
 	 */
-	public function set_field_defaults( $args ) {
+	public function _set_field_defaults( $args ) {
 
 		// Set up blank or default values for empty ones
 		if ( ! isset( $args['name'] ) ) $args['name'] = '';
@@ -177,6 +402,9 @@ public function set_field_defaults( $args ) {
 		if ( ! isset( $args['before'] ) ) $args['before'] = '';
 		if ( ! isset( $args['after'] ) ) $args['after'] = '';
 		if ( ! isset( $args['protocols'] ) ) $args['protocols'] = null;
+		if ( ! isset( $args['description'] ) ) {
+			$args['description'] = isset( $args['desc'] ) ? $args['desc'] : '';
+		}
 		if ( ! isset( $args['default'] ) ) {
 			// Phase out 'std', and use 'default' instead
 			$args['default'] = isset( $args['std'] ) ? $args['std'] : '';
@@ -194,19 +422,25 @@ public function set_field_defaults( $args ) {
 		$args['on_front']   = ! ( isset( $args['on_front'] ) && ! $args['on_front'] );
 		$args['attributes'] = isset( $args['attributes'] ) && is_array( $args['attributes'] ) ? $args['attributes'] : array();
 		$args['options']    = isset( $args['options'] ) && is_array( $args['options'] ) ? $args['options'] : array();
+		$args['_id']        = $args['id'];
+		$args['_name']      = $args['id'];
 
 		if ( 'wysiwyg' == $args['type'] ) {
 			$args['id'] = strtolower( str_ireplace( array( '-', '_' ), '', $args['id'] ) ) . 'wpeditor';
 		}
 
+		if ( $this->group ) {
+			$args['id'] = $this->group['id'] .'_'. $this->group['count'] .'_'. $args['id'];
+			$args['_name'] = $this->group['id'] .'['. $this->group['count'] .']['. $args['_name'] .']';
+		}
 
 		return $args;
 	}
 
 	/**
 	 * Updates attributes array values unless they exist from the field config array
-	 * @since  1.0.3
-	 * @param  array  $attrs Array of attributes to update
+	 * @since 1.0.3
+	 * @param array $attrs Array of attributes to update
 	 */
 	public function maybe_set_attributes( $attrs = array() ) {
 		return wp_parse_args( $attrs, $this->args['attributes'] );

From 2b7db9d5a5f31f19ebe481d3ffaa5024de107303 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Tue, 11 Mar 2014 17:18:46 -0400
Subject: [PATCH 27/71] Move field-specific methods to Fields class, and add
 group render/saving methods. Also new helper functions, , and

---
 init.php | 401 +++++++++++++++++++++++++------------------------------
 1 file changed, 183 insertions(+), 218 deletions(-)

diff --git a/init.php b/init.php
index 7bbaa58..813807b 100644
--- a/init.php
+++ b/init.php
@@ -130,6 +130,13 @@ class cmb_Meta_Box {
 	 */
 	protected static $options = array();
 
+	/**
+	 * List of fields that are changed/updated on save
+	 * @var   array
+	 * @since 1.0.3
+	 */
+	protected static $updated = array();
+
 
 	/**
 	 * Get started
@@ -374,52 +381,72 @@ public static function show_form( $meta_box, $object_id = 0, $object_type = '' )
 
 		foreach ( $meta_box['fields'] as $field_args ) {
 
-			$field = new cmb_Meta_Box_field( $field_args, $object_id, $object_type );
-
-			self::$field =& $field;
+			if ( 'group' == $field_args['type'] ) {
+				self::render_group( $meta_box, $field_args );
+			} else {
+				// Render default fields
+				$field = new cmb_Meta_Box_field( $field_args );
+				$field->render_field( $meta_box['show_names'] );
+			}
+		}
+		echo '</table>';
+		do_action( 'cmb_after_table', $meta_box, $object_id, $object_type );
+		echo "\n<!-- End CMB Fields -->\n";
 
-			if ( ! $field->args( 'on_front' ) )
-				continue;
+	}
 
-			$type    = $field->args( 'type' );
-			$classes = '';
-			$classes .= $field->args( 'repeatable' ) ? ' cmb-repeat' : '';
-			// 'inline' flag, or _inline in the field type, set to true
-			$classes .= $field->args( 'inline' ) ? ' cmb-inline' : '';
+	/**
+	 * Render a repeatable group
+	 */
+	public static function render_group( $meta_box, $args ) {
+		if ( ! isset( $args['id'], $args['fields'] ) || ! is_array( $args['fields'] ) )
+			return;
+		// delete_post_meta( self::get_object_id(), '_eworship_reports' );
+		$args['count']   = 0;
+		$field_group     = new cmb_Meta_Box_field( $args );
+		$desc            = $field_group->args( 'description' );
+		$label           = $field_group->args( 'name' );
+		$group_val       = (array) $field_group->value();
+		$nrows           = count( $group_val );
+		$remove_disabled = $nrows <= 1 ? 'disabled="disabled" ' : '';
+		$remove_button   = '<tr></td><td class="remove-row" colspan="2"><button '. $remove_disabled .'data-selector="'. $field_group->id() .'_repeat" class="button remove-group-row alignright">'. __( 'Remove Group', 'cmb' ) .'</button></td></tr>';
+
+		echo '<tr><td colspan="2"><table id="', $field_group->id(), '_repeat" class="repeatable-group" style="width:100%;">';
+		if ( $desc || $label ) {
+			echo '<tr><th>';
+				if ( $label )
+					echo '<h2 class="cmb-group-name">'. $label .'</h2>';
+				if ( $desc )
+					echo '<p class="cmb_metabox_description">'. $desc .'</p>';
+			echo '</th></tr>';
+		}
 
-			echo '<tr class="cmb-type-'. sanitize_html_class( $type ) .' cmb_id_'. sanitize_html_class( $field->args( 'id' ) ) . $classes .'">';
+		foreach ( $group_val as $iterator => $field_id ) {
 
-			if ( $type == "title" ) {
-				echo '<td colspan="2">'."\n";
-			} else {
-				if ( isset( $meta_box['show_names'] ) && $meta_box['show_names'] ) {
-					$style = $object_type == 'post' ? ' style="width:18%"' : '';
-					echo '<th'. $style .'><label for="', $field->args( 'id' ), '">', $field->args( 'name' ), '</label></th>';
-				} else {
-					echo '<label style="display:none;" for="', $field->args( 'id' ), '">', $field->args( 'name' ), '</label></th>';
+			echo '<tr class="repeatable-grouping" data-iterator="0"><td>
+				<table class="cmb-nested-table" style="width: 100%;">';
+				// Render repeatable group fields
+				foreach ( array_values( $field_group->args( 'fields' ) ) as $field_args ) {
+					$field = new cmb_Meta_Box_field( $field_args, $field_group->args() );
+					$field->render_field( $meta_box['show_names'] );
 				}
-				echo "<td>\n";
-			}
+				echo $remove_button;
+				echo '</table></td>
+			</tr>';
 
-			echo $field->args( 'before' );
+			$field_group->args['count']++;
+		}
 
-			$field_type = new cmb_Meta_Box_types( $field );
-			$field_type->render();
+		echo '<tr><td><p class="add-row"><button data-selector="', $field_group->id() ,'_repeat" class="add-group-row button">'. __( 'Add Group', 'cmb' ) .'</button></p></td></tr>';
 
-			echo $field->args( 'after' );
-
-			echo "\n</td>\n</tr>";
-		}
-		echo '</table>';
-		do_action( 'cmb_after_table', $meta_box, $object_id, $object_type );
-		echo "\n<!-- End CMB Fields -->\n";
+		echo '</table></td></tr>';
 
 	}
 
 	/**
 	 * Save data from metabox
 	 */
-	public function save_post( $post_id, $post = false )  {
+	public function save_post( $post_id, $post = false ) {
 
 		$post_type = $post ? $post->post_type : get_post_type( $post_id );
 
@@ -478,51 +505,108 @@ public static function save_fields( $meta_box, $object_id, $object_type = '' ) {
 			return;
 
 		// save field ids of those that are updated
-		$updated = array();
+		self::$updated = array();
 
 		foreach ( $meta_box['fields'] as $field_args ) {
 
-			$field = new cmb_Meta_Box_field( $field_args, $object_id, $object_type );
+			if ( 'group' == $field_args['type'] ) {
+				self::save_group( $field_args );
+			} else {
+				// Save default fields
+				$field = new cmb_Meta_Box_field( $field_args );
+				self::save_field( self::sanitize_field( $field ), $field );
+			}
+
+		}
+
+		// If options page, save the updated options
+		if ( $object_type == 'options-page' )
+			self::save_option( $object_id );
+
+		do_action( "cmb_save_{$object_type}_fields", $object_id, $meta_box['id'], self::$updated, $meta_box );
 
-			self::$field =& $field;
-			$name = $field->args( 'id' );
+	}
 
-			$old = self::get_data();
-			$new = isset( $_POST[ $name ] ) ? $_POST[ $name ] : null;
+	/**
+	 * Save a repeatable group
+	 */
+	public static function save_group( $args ) {
+		if ( ! isset( $args['id'], $args['fields'], $_POST[ $args['id'] ] ) || ! is_array( $args['fields'] ) )
+			return;
 
-			if ( $field->args( 'repeatable' ) && is_array( $new ) ) {
-				// Remove empties
-				$new = array_filter( $new );
+		$field_group = new cmb_Meta_Box_field( $args );
+		$main_id     = $field_group->id();
+		$old         = $field_group->get_data();
+		$group_vals  = $_POST[ $main_id ];
+		$saved       = array();
+		// $group_vals[0]['color'] = '333';
+
+		foreach ( array_values( $args['fields'] ) as $field_args ) {
+			$field = new cmb_Meta_Box_field( $field_args );
+			$sub_id = $field->id();
+
+			foreach ( (array) $group_vals as $key => $post_vals ) {
+				// Get value
+				$new_val = isset( $post_vals[ $sub_id ] )
+					? $post_vals[ $sub_id ]
+					: false;
+				// Sanitize
+				$new_val = self::sanitize_field( $field, $new_val );
+				// Get old value
+				$old_val = isset( $old[ $key ][ $sub_id ] )
+					? $old[ $key ][ $sub_id ]
+					: false;
+
+				// Compare values and add to `$updated` array
+				if (
+					( ! empty( $new_val ) && $new_val != $old_val )
+					|| ( empty( $new_val ) && ! empty( $old_val ) )
+				)
+					self::$updated[] = $main_id .'::'. $key .'::'. $sub_id;
+
+				// Add to `$saved` array
+				$saved[ $key ][ $sub_id ] = $new_val;
 			}
+		}
 
-			// Check if this metabox field has a registered validation callback, or perform default sanitization
-			$new = self::sanitization_cb( $new );
+		$field_group->update_data( $saved, true );
+	}
 
-			if ( $field->args( 'multiple' ) && ! $field->args( 'repeatable' ) ) {
-				self::remove_data( $name );
-				if ( ! empty( $new ) ) {
-					foreach ( $new as $add_new ) {
-						$updated[] = $name;
-						self::update_data( $add_new, $name, true );
-					}
-				}
-			} elseif ( ! empty( $new ) && $new != $old  ) {
-				$updated[] = $name;
-				self::update_data( $new );
-			} elseif ( empty( $new ) ) {
-				if ( ! empty( $old ) )
-					$updated[] = $name;
-				self::remove_data( $name );
-			}
+	public static function sanitize_field( $field, $new_value = null ) {
+
+		$new_value = null !== $new_value
+			? $new_value
+			: ( isset( $_POST[ $field->id() ] ) ? $_POST[ $field->id() ] : null );
 
+		if ( $field->args( 'repeatable' ) && is_array( $new_value ) ) {
+			// Remove empties
+			$new_value = array_filter( $new_value );
 		}
 
-		// If options page, save the updated options
-		if ( $object_type == 'options-page' )
-			self::save_option( $object_id );
+		// Check if this metabox field has a registered validation callback, or perform default sanitization
+		return $field->sanitization_cb( $new_value );
+	}
 
-		do_action( "cmb_save_{$object_type}_fields", $object_id, $meta_box['id'], $updated, $meta_box );
+	public static function save_field( $new_value, $field ) {
+		$name = $field->id();
+		$old  = $field->get_data();
 
+		if ( $field->args( 'multiple' ) && ! $field->args( 'repeatable' ) && ! $field->group ) {
+			$field->remove_data();
+			if ( ! empty( $new_value ) ) {
+				foreach ( $new_value as $add_new ) {
+					self::$updated[] = $name;
+					$field->update_data( $add_new, $name, false );
+				}
+			}
+		} elseif ( ! empty( $new_value ) && $new_value != $old  ) {
+			self::$updated[] = $name;
+			$field->update_data( $new_value );
+		} elseif ( empty( $new_value ) ) {
+			if ( ! empty( $old ) )
+				self::$updated[] = $name;
+			$field->remove_data();
+		}
 	}
 
 	/**
@@ -574,39 +658,6 @@ public static function timezone_offset( $tzstring ) {
 		return 0;
 	}
 
-	/**
-	 * Offset a time value based on timezone
-	 * @since  1.0.0
-	 * @param  integer $object_id Object ID
-	 * @return string             Offset time string
-	 */
-	public static function field_timezone_offset( $object_id = 0 ) {
-
-		$tzstring = self::field_timezone( $object_id );
-
-		return self::timezone_offset( $tzstring );
-	}
-
-	/**
-	 * Return timezone string
-	 * @since  1.0.0
-	 * @param  integer $object_id Object ID
-	 * @return string             Timezone string
-	 */
-	public static function field_timezone( $object_id = 0 ) {
-		$tzstring = null;
-		if ( ! ( $object_id = self::get_object_id( $object_id ) ) )
-			return $tzstring;
-
-		if ( self::$field->args( 'timezone' ) ) {
-			return self::$field->args( 'timezone' );
-		} else if ( self::$field->args( 'timezone_meta_key' ) ) {
-			return self::$field->args( 'timezone_meta_key' );
-		}
-
-		return false;
-	}
-
 	/**
 	 * Get object id from global space if no id is provided
 	 * @since  1.0.0
@@ -784,57 +835,6 @@ public static function image_id_from_url( $img_url ) {
 		return false;
 	}
 
-	/**
-	 * Checks if field has a registered validation callback
-	 * @since  1.0.1
-	 * @param  mixed $meta_value Meta value
-	 * @param  null  $field      Field object
-	 * @return mixed             Possibly validated meta value
-	 */
-	public static function sanitization_cb( $meta_value, $field = null ) {
-		if ( empty( $meta_value ) )
-			return $meta_value;
-
-		$field = $field !== null ? $field : self::$field;
-
-		// Check if the field has a registered validation callback
-		$cb = self::maybe_callback( $field->args(), 'sanitization_cb' );
-		if ( false === $cb ) {
-			// If requestion NO validation, return meta value
-			return $meta_value;
-		} elseif ( $cb ) {
-			// Ok, callback is good, let's run it.
-			return call_user_func( $cb, $meta_value, $field->args() );
-		}
-
-		$clean = new cmb_Meta_Box_Sanitize( $field, $meta_value );
-		// Validation via 'cmb_Meta_Box_Sanitize' (with fallback filter)
-		return $clean->{$field->args( 'type' )}( $meta_value );
-	}
-
-	/**
-	 * Checks if field has a callback value
-	 * @since  1.0.1
-	 * @param  array  $field Field config array
-	 * @param  string  $cb    Callback string
-	 * @return mixed          NULL, false for NO validation, or $cb string if it exists.
-	 */
-	public static function maybe_callback( $field_args, $cb ) {
-		if ( ! isset( $field_args[ $cb ] ) )
-			return;
-
-		// Check if metabox is requesting NO validation
-		$cb = false !== $field_args[ $cb ] && 'false' !== $field_args[ $cb ] ? $field_args[ $cb ] : false;
-
-		// If requestion NO validation, return false
-		if ( ! $cb )
-			return false;
-
-		if ( is_callable( $cb ) )
-			return $cb;
-
-	}
-
 	/**
 	 * Defines the url which is used to load local resources.
 	 * This may need to be filtered for local Window installations.
@@ -871,72 +871,6 @@ public static function set_mb_defaults( $meta_box ) {
 		return wp_parse_args( $meta_box, self::$mb_defaults );
 	}
 
-	/**
-	 * Retrieves metadata/option data
-	 * @since  1.0.1
-	 * @param  string  $field_id Meta key/Option array key
-	 * @return mixed             Meta/Option value
-	 */
-	public static function get_data( $field_id = '' ) {
-
-		$type     = self::get_object_type();
-		$id       = self::get_object_id();
-		$field_id = $field_id ? $field_id : self::$field->args( 'id' );
-		$single   = ! self::$field->args( 'multiple' );
-		$repeat   = self::$field->args( 'repeatable' );
-
-		$data = 'options-page' === $type
-			? self::get_option( $id, $field_id )
-			: get_metadata( $type, $id, $field_id, ( $single || $repeat ) /* If multicheck this can be multiple values */ );
-
-		return $data;
-	}
-
-
-	/**
-	 * Updates metadata/option data
-	 * @since  1.0.1
-	 * @param  mixed   $value    Value to update data with
-	 * @param  string  $field_id Meta key/Option array key
-	 * @param  bool    $multiple Whether data is an array (add_metadata)
-	 */
-	public static function update_data( $value, $field_id = '', $multiple = false ) {
-
-		$repeat   = self::$field->args( 'repeatable' );
-		$type     = self::get_object_type();
-		$id       = self::get_object_id();
-		$field_id = $field_id ? $field_id : self::$field->args( 'id' );
-		$value    = $repeat ? array_values( $value ) : $value;
-
-		if ( 'options-page' === $type ) {
-			return self::update_option( $id, $field_id, $value );
-		} else {
-			if ( $multiple ) {
-				return add_metadata( $type, $id, $field_id, $value, false );
-			} else {
-				return update_metadata( $type, $id, $field_id, $value );
-			}
-		}
-	}
-
-	/**
-	 * Removes/updates metadata/option data
-	 * @since  1.0.1
-	 * @param  string  $field_id Meta key/Option array key
-	 * @param  string  $old      Old value
-	 */
-	public static function remove_data( $field_id = '', $old = '' ) {
-
-		$type     = self::get_object_type();
-		$id       = self::get_object_id();
-		$field_id = $field_id ? $field_id : self::$field->args( 'id' );
-
-		$data = 'options-page' === $type
-			? self::remove_option( $id, $field_id )
-			: delete_metadata( $type, $id, $field_id, $old );
-
-	}
-
 	/**
 	 * Removes an option from an option array
 	 * @since  1.0.1
@@ -978,14 +912,12 @@ public static function get_option( $option_key, $field_id = '' ) {
 	 * @param  string  $option_key Option key
 	 * @param  string  $field_id   Option array field key
 	 * @param  mixed   $value      Value to update data with
-	 * @param  object  $field      Optionally specify a field object
+	 * @param  bool    $single     Whether data should be an array
 	 * @return array               Modified options
 	 */
-	public static function update_option( $option_key, $field_id, $value, $field = null ) {
+	public static function update_option( $option_key, $field_id, $value, $single = true ) {
 
-		$field = $field !== null ? $field : self::$field;
-
-		if ( $field->args( 'multiple' ) ) {
+		if ( ! $single ) {
 			// If multiple, add to array
 			self::$options[ $option_key ][ $field_id ][] = $value;
 		} else {
@@ -1056,6 +988,39 @@ function cmb_get_option( $option_key, $field_id = '' ) {
 	return cmb_Meta_Box::get_option( $option_key, $field_id );
 }
 
+/**
+ * Get a CMB field object.
+ * @since  1.0.3
+ * @param  array  $field_args  Field arguments
+ * @param  int    $object_id   Object ID
+ * @param  string $object_type Type of object being saved. (e.g., post, user, or comment)
+ * @return object              cmb_Meta_Box_field object
+ */
+function cmb_get_field( $field_args, $object_id = 0, $object_type = 'post' ) {
+	// Default to the loop post ID
+	$object_id = $object_id ? $object_id : get_the_ID();
+	cmb_Meta_Box::set_object_id( $object_id );
+	cmb_Meta_Box::set_object_type( $object_type );
+	// Send back field object
+	return new cmb_Meta_Box_field( $field_args );
+}
+
+/**
+ * Get a field's (optionally escaped) value.
+ * @since  1.0.3
+ * @param  array  $field_args  Field arguments
+ * @param  int    $object_id   Object ID
+ * @param  string $object_type Type of object being saved. (e.g., post, user, or comment)
+ * @param  mixed $func         Escaping function (if not esc_attr()) or false for no escaping
+ * @return mixed               Maybe escaped value
+ */
+function cmb_get_field_value( $field_args, $object_id = 0, $object_type = 'post', $escape_cb = 'esc_attr' ) {
+	$field = cmb_get_field( $object_id, $field_args, $object_type );
+	if ( false === $escape_cb )
+		return $field->value();
+	return $field->escaped_value( $escape_cb );
+}
+
 /**
  * Loop and output multiple metaboxes
  * @since 1.0.0

From c4f440c43ee1e1b48b7aef8f20bb6e3f29c6a15d Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Tue, 11 Mar 2014 17:19:21 -0400
Subject: [PATCH 28/71] Handle repeatable groups

---
 js/cmb.js     | 165 ++++++++++++++++++++++++++++++++++++--------------
 js/cmb.min.js |  28 +++++----
 style.css     |  24 ++++++--
 style.min.css |   8 ++-
 4 files changed, 160 insertions(+), 65 deletions(-)

diff --git a/js/cmb.js b/js/cmb.js
index 71bc7ae..8f88a7d 100644
--- a/js/cmb.js
+++ b/js/cmb.js
@@ -63,7 +63,9 @@ window.CMB = (function(window, document, $, undefined){
 			.on( 'click', '.cmb_upload_button', cmb.handleMedia )
 			.on( 'click', '.cmb_remove_file_button', cmb.handleRemoveMedia )
 			// Repeatable content
+			.on( 'click', '.add-group-row', cmb.addGroupRow )
 			.on( 'click', '.add-row-button', cmb.addAjaxRow )
+			.on( 'click', '.remove-group-row', cmb.removeGroupRow )
 			.on( 'click', '.remove-row-button', cmb.removeAjaxRow )
 			// Ajax oEmbed display
 			.on( 'keyup paste focusout', '.cmb_oembed', cmb.maybeOembed );
@@ -173,6 +175,7 @@ window.CMB = (function(window, document, $, undefined){
 	}
 
 	cmb.handleRemoveMedia = function( event ) {
+		event.preventDefault();
 		var $self = $(this);
 		if ( $self.is( '.attach_list .cmb_remove_file_button' ) ){
 			$self.parents('li').remove();
@@ -181,8 +184,8 @@ window.CMB = (function(window, document, $, undefined){
 		cmb.formfield    = $self.attr('rel');
 		var $container   = $self.parents('.img_status');
 
-		$metabox.find('input#' + cmb.formfield).val('');
-		$metabox.find('input#' + cmb.formfield + '_id').val('');
+		cmb.metabox().find('input#' + cmb.formfield).val('');
+		cmb.metabox().find('input#' + cmb.formfield + '_id').val('');
 		if ( ! $container.length ) {
 			$self.parents('.cmb_media_status').html('');
 		} else {
@@ -191,26 +194,56 @@ window.CMB = (function(window, document, $, undefined){
 		return false;
 	}
 
-	cmb.addAjaxRow = function( event ) {
+	$.fn.cleanRow = function( prevNum, group ) {
+		var $self = $(this);
+		if ( group ) {
+			// Remove extra ajaxed rows
+			$self.find('.cmb-repeat-table .repeat-row:not(:first-child)').remove();
+		}
+		cmb.$focus = false;
+		$self.find('input:not([type="button"]),select,textarea,label').each( function(){
+
+			var $newInput = $(this);
+			var oldFor    = $newInput.attr( 'for' );
+			var $next     = $newInput.next();
+			var attrs     = {}
+			if ( oldFor ) {
+				attrs = { 'for' : oldFor.replace( '_'+ prevNum, '_'+ cmb.idNumber ) }
+			} else {
+				var oldName   = $newInput.attr( 'name' );
+				var newName   = oldName ? oldName.replace( prevNum, cmb.idNumber ) : '';
+				var oldID     = $newInput.attr( 'id' );
+				var newID     = oldID ? oldID.replace( '_'+ prevNum, '_'+ cmb.idNumber ) : '';
+				attrs = {
+					id: newID,
+					name: newName,
+					value: '',
+					'data-iterator': cmb.idNumber,
+				}
+			}
 
-		event.preventDefault();
+			$newInput
+				.removeAttr( 'checked' )
+				.removeAttr( 'selected' )
+				.removeClass( 'hasDatepicker' )
+				.attr( attrs );
 
-		var $self         = $(this);
-		var tableselector = '#'+ $self.data('selector');
-		var inputselector = tableselector.slice(1,tableselector.lastIndexOf('repeat'));
-		var $table        = $(tableselector).data('numberels', cmb.idNumber );
-		var $emptyrow     = $table.find('.empty-row');
-		cmb.idNumber      = parseInt( $emptyrow.find('[data-iterator]').data('iterator') ) + 1;
-		var $row          = $emptyrow.clone();
-		var prevNum       = cmb.idNumber - 1;
-		var $colorPicker  = $row.find( '.wp-picker-container' );
-		var $list         = $row.find( '.cmb_media_status' );
-		var $newInput, $focusInput;
+			cmb.$focus = cmb.$focus ? cmb.$focus : $newInput;
+		});
+		return this;
+	}
+
+	$.fn.newRowHousekeeping = function() {
+		var $row         = $(this);
+		var $colorPicker = $row.find( '.wp-picker-container' );
+		var $list        = $row.find( '.cmb_media_status' );
 
-		// Need to clean-up colorpicker before appending
 		if ( $colorPicker.length ) {
-			var $td = $row.find( 'td:first-child' );
-			$td.html( $td.find( 'input:text.cmb_colorpicker' ) );
+			// Need to clean-up colorpicker before appending
+			$colorPicker.each( function() {
+				var $td = $(this).parent();
+				$td.html( $td.find( 'input:text.cmb_colorpicker' ).attr('style', '') );
+			})
 		}
 
 		// Need to clean-up colorpicker before appending
@@ -218,45 +251,83 @@ window.CMB = (function(window, document, $, undefined){
 			$list.empty();
 		}
 
-		var cleanRow = function() {
+		return this;
+	}
 
-			$newInput = $(this);
-			$focusInput = $focusInput ? $focusInput : $newInput;
+	cmb.afterRowInsert = function( $row ) {
+		if ( cmb.$focus ) {
+			cmb.$focus.focus();
+		}
 
-			var oldName = $newInput.attr( 'name' );
-			var newName = oldName ? oldName.replace( prevNum, cmb.idNumber ) : '';
-			var oldID = $newInput.attr( 'id' );
-			var newID = oldID ? oldID.replace( '_'+ prevNum, '_'+ cmb.idNumber ) : '';
-			var $next = $newInput.next();
+		// Init pickers from new row
+		cmb.initPickers( $row.find('input:text.cmb_timepicker'), $row.find('input:text.cmb_datepicker'), $row.find('input:text.cmb_colorpicker') );
+	}
 
-			cmb.log( $newInput.prop('tagName'), oldName, newName, prevNum, cmb.idNumber );
-			$newInput
-				.val('')
-				.removeAttr( 'checked' )
-				.removeAttr( 'selected' )
-				.removeClass( 'hasDatepicker' )
-				.attr({
-				  id: newID,
-				  name: newName,
-				  'data-iterator': cmb.idNumber,
-				});
-			if ( $next.is('label') ) {
-				$next.attr( 'for', newID );
-			}
+	cmb.addGroupRow = function( event ) {
+
+		event.preventDefault();
+
+		var $self    = $(this);
+		var $table   = $('#'+ $self.data('selector'));
+		var $oldRow  = $table.find('.repeatable-grouping').last();
+		var prevNum  = parseInt( $oldRow.data('iterator') );
+		cmb.idNumber = prevNum + 1;
+		var $row     = $oldRow.clone();
+
+		$row.newRowHousekeeping().cleanRow( prevNum, true );
+
+		// console.log( '$row.html()', $row.html() );
+		var $newRow = $( '<tr class="repeatable-grouping" data-iterator="'+ cmb.idNumber +'">'+ $row.html() +'</tr>' );
+		$oldRow.after( $newRow );
+		// console.log( '$newRow.html()', $row.html() );
+
+		cmb.afterRowInsert( $newRow );
+
+		if ( $table.find('.repeatable-grouping').length <= 1 ) {
+			$table.find('.remove-group-row').prop('disabled', true);
+		} else {
+			$table.find('.remove-group-row').removeAttr( 'disabled' );
 		}
 
-		// cmb.log( $newInput.attr('id'), $newInput.data('iterator'));
-		$row.find('input:not([type="button"]),select,textarea').each( cleanRow );
+	}
+
+	cmb.addAjaxRow = function( event ) {
+
+		event.preventDefault();
+
+		var $self         = $(this);
+		var tableselector = '#'+ $self.data('selector');
+		var $table        = $(tableselector);
+		var $emptyrow     = $table.find('.empty-row');
+		var prevNum       = parseInt( $emptyrow.find('[data-iterator]').data('iterator') );
+		cmb.idNumber      = prevNum + 1;
+		var $row          = $emptyrow.clone();
+		var $colorPicker  = $row.find( '.wp-picker-container' );
+		var $list         = $row.find( '.cmb_media_status' );
+
+		$row.newRowHousekeeping().cleanRow( prevNum );
 
 		$emptyrow.removeClass('empty-row').addClass('repeat-row');
 		$emptyrow.after( $row );
-		if ( $focusInput ) {
-			$focusInput.focus();
-		}
 
-		// Init pickers from new row
-		cmb.initPickers( $row.find('input:text.cmb_timepicker'), $row.find('input:text.cmb_datepicker'), $row.find('input:text.cmb_colorpicker') );
+		cmb.afterRowInsert( $row );
+	}
 
+	cmb.removeGroupRow = function( event ) {
+		event.preventDefault();
+		var $self   = $(this);
+		var $table  = $('#'+ $self.data('selector'));
+		var $parent = $self.parents('.repeatable-grouping');
+		var noRows  = $table.find('.repeatable-grouping').length;
+
+		if ( noRows > 1 ) {
+			$parent.remove();
+			if ( noRows < 3 ) {
+				$table.find('.remove-group-row').prop('disabled', true);
+			} else {
+				$table.find('.remove-group-row').prop('disabled', false);
+			}
+		}
 	}
 
 	cmb.removeAjaxRow = function( event ) {
diff --git a/js/cmb.min.js b/js/cmb.min.js
index aa7b112..dc1a2e6 100644
--- a/js/cmb.min.js
+++ b/js/cmb.min.js
@@ -1,7 +1,7 @@
 window.CMB=(function(c,a,d,f){var b=c.cmb_l10;var e={formfield:"",idNumber:false,file_frames:{},};e.metabox=function(){if(e.$metabox){return e.$metabox;
 }e.$metabox=d("table.cmb_metabox");return e.$metabox;};e.init=function(){e.log(b);var g=e.metabox();if(b.new_admin_style){g.find(".cmb-spinner img").hide();
 }e.initPickers(g.find("input:text.cmb_timepicker"),g.find("input:text.cmb_datepicker"),g.find("input:text.cmb_colorpicker"));d("#ui-datepicker-div").wrap('<div class="cmb_element" />');
-d(".cmb_metabox").on("change",".cmb_upload_file",function(){e.formfield=d(this).attr("id");d("#"+e.formfield+"_id").val("");}).on("click",".cmb_upload_button",e.handleMedia).on("click",".cmb_remove_file_button",e.handleRemoveMedia).on("click",".add-row-button",e.addAjaxRow).on("click",".remove-row-button",e.removeAjaxRow).on("keyup paste focusout",".cmb_oembed",e.maybeOembed);
+d(".cmb_metabox").on("change",".cmb_upload_file",function(){e.formfield=d(this).attr("id");d("#"+e.formfield+"_id").val("");}).on("click",".cmb_upload_button",e.handleMedia).on("click",".cmb_remove_file_button",e.handleRemoveMedia).on("click",".add-group-row",e.addGroupRow).on("click",".add-row-button",e.addAjaxRow).on("click",".remove-group-row",e.removeGroupRow).on("click",".remove-row-button",e.removeAjaxRow).on("keyup paste focusout",".cmb_oembed",e.maybeOembed);
 setTimeout(e.resizeoEmbeds,500);d(c).on("resize",e.resizeoEmbeds);};e.handleMedia=function(h){h.preventDefault();var m=e.metabox();var n=d(this);e.formfield=n.prev("input").attr("id");
 var g=d("#"+e.formfield);var o=g.attr("name");var i=true;var l=true;var j=n.hasClass("cmb_upload_list");if(e.formfield in e.file_frames){e.file_frames[e.formfield].open();
 return;}e.file_frames[e.formfield]=wp.media.frames.file_frame=wp.media({title:m.find("label[for="+e.formfield+"]").text(),button:{text:b.upload_file},multiple:j?true:false});
@@ -11,16 +11,22 @@ var k={list:function(q){l=q.toJSON();g.val(l.url);d("#"+e.formfield+"_id").val(l
 if(l.type&&l.type==="image"){i='<div class="img_status"><img style="max-width: 350px; width: 100%; height: auto;" src="'+l.url+'" alt="'+l.filename+'" title="'+l.filename+'" /><p><a href="#" class="cmb_remove_file_button" rel="'+e.formfield+'">'+b.remove_image+"</a></p></div>";
 }else{i=b.file+" <strong>"+l.filename+'</strong>&nbsp;&nbsp;&nbsp; (<a href="'+l.url+'" target="_blank" rel="external">'+b.download+'</a> / <a href="#" class="cmb_remove_file_button" rel="'+e.formfield+'">'+b.remove_file+"</a>)";
 }g.siblings(".cmb_media_status").slideDown().html(i);}};e.file_frames[e.formfield].on("select",function(){var q=e.file_frames[e.formfield].state().get("selection");
-var p=j?"list":"single";k[p](q);});e.file_frames[e.formfield].open();};e.handleRemoveMedia=function(g){var i=d(this);if(i.is(".attach_list .cmb_remove_file_button")){i.parents("li").remove();
-return false;}e.formfield=i.attr("rel");var h=i.parents(".img_status");$metabox.find("input#"+e.formfield).val("");$metabox.find("input#"+e.formfield+"_id").val("");
-if(!h.length){i.parents(".cmb_media_status").html("");}else{h.html("");}return false;};e.addAjaxRow=function(i){i.preventDefault();var q=d(this);var s="#"+q.data("selector");
-var g=s.slice(1,s.lastIndexOf("repeat"));var t=d(s).data("numberels",e.idNumber);var k=t.find(".empty-row");e.idNumber=parseInt(k.find("[data-iterator]").data("iterator"))+1;
-var n=k.clone();var m=e.idNumber-1;var r=n.find(".wp-picker-container");var l=n.find(".cmb_media_status");var p,h;if(r.length){var j=n.find("td:first-child");
-j.html(j.find("input:text.cmb_colorpicker"));}if(l.length){l.empty();}var o=function(){p=d(this);h=h?h:p;var x=p.attr("name");var v=x?x.replace(m,e.idNumber):"";
-var y=p.attr("id");var w=y?y.replace("_"+m,"_"+e.idNumber):"";var u=p.next();e.log(p.prop("tagName"),x,v,m,e.idNumber);p.val("").removeAttr("checked").removeAttr("selected").removeClass("hasDatepicker").attr({id:w,name:v,"data-iterator":e.idNumber,});
-if(u.is("label")){u.attr("for",w);}};n.find('input:not([type="button"]),select,textarea').each(o);k.removeClass("empty-row").addClass("repeat-row");k.after(n);
-if(h){h.focus();}e.initPickers(n.find("input:text.cmb_timepicker"),n.find("input:text.cmb_datepicker"),n.find("input:text.cmb_colorpicker"));};e.removeAjaxRow=function(h){h.preventDefault();
-var j=d(this);var i=j.parents("tr");var g=j.parents(".cmb-repeat-table");if(g.find("tr").length>1){if(i.hasClass("empty-row")){i.prev().addClass("empty-row").removeClass("repeat-row");
+var p=j?"list":"single";k[p](q);});e.file_frames[e.formfield].open();};e.handleRemoveMedia=function(g){g.preventDefault();var i=d(this);if(i.is(".attach_list .cmb_remove_file_button")){i.parents("li").remove();
+return false;}e.formfield=i.attr("rel");var h=i.parents(".img_status");e.metabox().find("input#"+e.formfield).val("");e.metabox().find("input#"+e.formfield+"_id").val("");
+if(!h.length){i.parents(".cmb_media_status").html("");}else{h.html("");}return false;};d.fn.cleanRow=function(g,h){var i=d(this);if(h){i.find(".cmb-repeat-table .repeat-row:not(:first-child)").remove();
+}e.$focus=false;i.find('input:not([type="button"]),select,textarea,label').each(function(){var m=d(this);var j=m.attr("for");var l=m.next();var o={};if(j){o={"for":j.replace("_"+g,"_"+e.idNumber)};
+}else{var p=m.attr("name");var k=p?p.replace(g,e.idNumber):"";var q=m.attr("id");var n=q?q.replace("_"+g,"_"+e.idNumber):"";o={id:n,name:k,value:"","data-iterator":e.idNumber,};
+}m.removeAttr("checked").removeAttr("selected").removeClass("hasDatepicker").attr(o);e.$focus=e.$focus?e.$focus:m;});return this;};d.fn.newRowHousekeeping=function(){var g=d(this);
+var i=g.find(".wp-picker-container");var h=g.find(".cmb_media_status");if(i.length){i.each(function(){var j=d(this).parent();j.html(j.find("input:text.cmb_colorpicker").attr("style",""));
+});}if(h.length){h.empty();}return this;};e.afterRowInsert=function(g){if(e.$focus){e.$focus.focus();}e.initPickers(g.find("input:text.cmb_timepicker"),g.find("input:text.cmb_datepicker"),g.find("input:text.cmb_colorpicker"));
+};e.addGroupRow=function(l){l.preventDefault();var m=d(this);var h=d("#"+m.data("selector"));var j=h.find(".repeatable-grouping").last();var i=parseInt(j.data("iterator"));
+e.idNumber=i+1;var g=j.clone();g.newRowHousekeeping().cleanRow(i,true);var k=d('<tr class="repeatable-grouping" data-iterator="'+e.idNumber+'">'+g.html()+"</tr>");
+j.after(k);e.afterRowInsert(k);if(h.find(".repeatable-grouping").length<=1){h.find(".remove-group-row").prop("disabled",true);}else{h.find(".remove-group-row").removeAttr("disabled");
+}};e.addAjaxRow=function(g){g.preventDefault();var l=d(this);var m="#"+l.data("selector");var o=d(m);var h=o.find(".empty-row");var j=parseInt(h.find("[data-iterator]").data("iterator"));
+e.idNumber=j+1;var k=h.clone();var n=k.find(".wp-picker-container");var i=k.find(".cmb_media_status");k.newRowHousekeeping().cleanRow(j);h.removeClass("empty-row").addClass("repeat-row");
+h.after(k);e.afterRowInsert(k);};e.removeGroupRow=function(i){i.preventDefault();var k=d(this);var h=d("#"+k.data("selector"));var j=k.parents(".repeatable-grouping");
+var g=h.find(".repeatable-grouping").length;if(g>1){j.remove();if(g<3){h.find(".remove-group-row").prop("disabled",true);}else{h.find(".remove-group-row").prop("disabled",false);
+}}};e.removeAjaxRow=function(h){h.preventDefault();var j=d(this);var i=j.parents("tr");var g=j.parents(".cmb-repeat-table");if(g.find("tr").length>1){if(i.hasClass("empty-row")){i.prev().addClass("empty-row").removeClass("repeat-row");
 }j.parents(".cmb-repeat-table tr").remove();}};e.initPickers=function(h,i,g){e.initTimePickers(h);e.initDatePickers(i);e.initColorPickers(g);};e.initTimePickers=function(g){if(!g.length){return;
 }g.timePicker({startTime:"00:00",endTime:"23:59",show24Hours:false,separator:":",step:30});};e.initDatePickers=function(g){if(!g.length){return;}g.datepicker("destroy");
 g.datepicker();};e.initColorPickers=function(g){if(!g.length){return;}if(typeof jQuery.wp==="object"&&typeof jQuery.wp.wpColorPicker==="function"){g.wpColorPicker();
diff --git a/style.css b/style.css
index 95809cb..d01ce21 100644
--- a/style.css
+++ b/style.css
@@ -5,17 +5,33 @@ table.cmb_metabox {
 	clear: both;
 }
 
-table.cmb_metabox tr:first-of-type td, table.cmb_metabox tr:first-of-type th {
-	border:0;
+table.cmb_metabox tr:first-of-type td, table.cmb_metabox tr:first-of-type th, .post-php table.cmb_metabox .repeatable-group td, .post-new-php table.cmb_metabox .repeatable-group td, .post-php table.cmb_metabox .repeatable-group th, .post-new-php table.cmb_metabox .repeatable-group th, .post-php table.cmb_metabox .repeatable-group:first-of-type, .post-new-php table.cmb_metabox .repeatable-group:first-of-type {
+	border: 0;
 }
 
-.post-php table.cmb_metabox td, .post-new-php table.cmb_metabox td, .post-php table.cmb_metabox th, .post-new-php table.cmb_metabox th {
+.post-php table.cmb_metabox td, .post-new-php table.cmb_metabox td, .post-php table.cmb_metabox th, .post-new-php table.cmb_metabox th, .post-php table.cmb_metabox .repeatable-group, .post-new-php table.cmb_metabox .repeatable-group, .post-php table.cmb_metabox .repeatable-group, .post-new-php table.cmb_metabox .repeatable-group {
 	border-top: 1px solid #E9E9E9;
 }
 
+.repeatable-group th {
+	padding: 5px;
+}
+
+.repeatable-group .cmb_upload_button {
+	float: right;
+}
+
+#poststuff .repeatable-group h2 {
+	margin: 0;
+}
+
 .post-php table.cmb_metabox th, .post-new-php table.cmb_metabox th {
 	text-align: right;
-	font-weight:bold
+	font-weight:bold;
+}
+
+.post-php table.cmb_metabox table th, .post-new-php table.cmb_metabox table th {
+	text-align: left;
 }
 
 table.cmb_metabox th label {
diff --git a/style.min.css b/style.min.css
index c9cb667..fd5407d 100644
--- a/style.min.css
+++ b/style.min.css
@@ -1,5 +1,7 @@
-table.cmb_metabox{clear:both}table.cmb_metabox tr:first-of-type td,table.cmb_metabox tr:first-of-type th{border:0}.post-php table.cmb_metabox td,.post-new-php table.cmb_metabox td,.post-php table.cmb_metabox th,.post-new-php table.cmb_metabox th{border-top:1px solid #e9e9e9}
-.post-php table.cmb_metabox th,.post-new-php table.cmb_metabox th{text-align:right;font-weight:bold}table.cmb_metabox th label{margin-top:5px;display:block}
+table.cmb_metabox{clear:both}table.cmb_metabox tr:first-of-type td,table.cmb_metabox tr:first-of-type th,.post-php table.cmb_metabox .repeatable-group td,.post-new-php table.cmb_metabox .repeatable-group td,.post-php table.cmb_metabox .repeatable-group th,.post-new-php table.cmb_metabox .repeatable-group th,.post-php table.cmb_metabox .repeatable-group:first-of-type,.post-new-php table.cmb_metabox .repeatable-group:first-of-type{border:0}
+.post-php table.cmb_metabox td,.post-new-php table.cmb_metabox td,.post-php table.cmb_metabox th,.post-new-php table.cmb_metabox th,.post-php table.cmb_metabox .repeatable-group,.post-new-php table.cmb_metabox .repeatable-group,.post-php table.cmb_metabox .repeatable-group,.post-new-php table.cmb_metabox .repeatable-group{border-top:1px solid #e9e9e9}
+.repeatable-group th{padding:5px}.repeatable-group .cmb_upload_button{float:right}#poststuff .repeatable-group h2{margin:0}.post-php table.cmb_metabox th,.post-new-php table.cmb_metabox th{text-align:right;font-weight:bold}
+.post-php table.cmb_metabox table th,.post-new-php table.cmb_metabox table th{text-align:left}table.cmb_metabox th label{margin-top:5px;display:block}
 p.cmb_metabox_description{color:#AAA;font-style:italic;margin:2px 0!important}span.cmb_metabox_description{color:#AAA;font-style:italic}table.cmb_metabox input,table.cmb_metabox textarea{font-size:14px;padding:5px}
 table.cmb_metabox input[type=text],table.cmb_metabox textarea{width:97%}table.cmb_metabox textarea.cmb_textarea_code{font-family:Consolas,Monaco,monospace;line-height:16px}
 table.cmb_metabox input.cmb_text_small{width:100px;margin-right:15px}table.cmb_metabox input.cmb_timepicker{width:100px;margin-right:15px}table.cmb_metabox input.cmb_text_money{width:90px;margin-right:15px}
@@ -9,7 +11,7 @@ table.cmb_metabox input:focus,table.cmb_metabox textarea:focus{background:#fffff
 .cmb-inline ul{padding:4px 0 0 0}.cmb-inline li{display:inline-block;padding-right:18px}table.cmb_metabox input[type="radio"]{margin:0 5px 0 0;padding:0}
 table.cmb_metabox input[type="checkbox"]{margin:0 5px 0 0;padding:0}table.cmb_metabox .mceLayout{border:1px solid #dfdfdf!important}
 table.cmb_metabox .mceIframeContainer{background:#FFF}table.cmb_metabox .meta_mce{width:97%}table.cmb_metabox .meta_mce textarea{width:100%}table.cmb_metabox .cmb_media_status{margin:10px 0 0 0}
-table.cmb_metabox .cmb_media_status .img_status{display:inline-block}table.cmb_metabox .cmb-type-file_list .cmb_media_status .img_status{clear:none;float:left;margin-right:10px;width:auto}
+table.cmb_metabox .cmb_media_status .img_status{clear:none;float:left;display:inline-block;margin-right:10px;width:auto}table.cmb_metabox .cmb-type-file_list .cmb_media_status .img_status{clear:none;float:left;margin-right:10px;width:auto}
 table.cmb_metabox .cmb_media_status .img_status,table.cmb_metabox .cmb_media_status .embed_status{position:relative}table.cmb_metabox .cmb_media_status .img_status img,table.cmb_metabox .cmb_media_status .embed_status{border:1px solid #dfdfdf;background:#fafafa;max-width:350px;padding:5px;-moz-border-radius:2px;border-radius:2px}
 table.cmb_metabox .cmb_media_status .embed_status{float:left;max-width:800px}table.cmb_metabox .cmb_media_status .img_status .cmb_remove_file_button,table.cmb_metabox .cmb_media_status .embed_status .cmb_remove_file_button{text-indent:-9999px;background:url(images/ico-delete.png);width:16px;height:16px;position:absolute;top:-5px;left:-5px}
 table.cmb_metabox .attach_list li{clear:both;display:inline-block;margin-bottom:25px;width:100%}table.cmb_metabox .attach_list li img{float:left;margin-right:10px}

From 6aaabe825b8a67a86a170b3a0c3ee21e8867b221 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Wed, 12 Mar 2014 14:21:25 -0400
Subject: [PATCH 29/71] clean whitespace

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

diff --git a/helpers/cmb_Meta_Box_Sanitize.php b/helpers/cmb_Meta_Box_Sanitize.php
index 436b586..b675fb9 100644
--- a/helpers/cmb_Meta_Box_Sanitize.php
+++ b/helpers/cmb_Meta_Box_Sanitize.php
@@ -154,9 +154,9 @@ public function text_email( $value ) {
 	 * @return string       Empty string or validated money value
 	 */
 	public function text_money( $value ) {
-		
+
 		global $wp_locale;
-		
+
 		$search = array( $wp_locale->number_format['thousands_sep'], $wp_locale->number_format['decimal_point'] );
 		$replace = array( '', '.' );
 

From 68f642b4ab0362bc013cd55d69985d49175b065b Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Wed, 12 Mar 2014 14:22:30 -0400
Subject: [PATCH 30/71] Reorder code execution, and add `id()` method

---
 helpers/cmb_Meta_Box_field.php | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/helpers/cmb_Meta_Box_field.php b/helpers/cmb_Meta_Box_field.php
index 768a54f..e61a48c 100644
--- a/helpers/cmb_Meta_Box_field.php
+++ b/helpers/cmb_Meta_Box_field.php
@@ -50,8 +50,8 @@ class cmb_Meta_Box_field {
 	public function __construct( $field_args, $group_field_args = array() ) {
 		$this->object_id   = cmb_Meta_Box::get_object_id();
 		$this->object_type = cmb_Meta_Box::get_object_type();
-		$this->args        = $this->_set_field_defaults( $field_args );
 		$this->group       = ! empty( $group_field_args ) ? $group_field_args : false;
+		$this->args        = $this->_set_field_defaults( $field_args );
 
 		// Allow an override for the field's value
 		// (assuming no one would want to save 'cmb_no_override_val' as a value)
@@ -74,6 +74,17 @@ public function __call( $name, $arguments ) {
 		return $this->args( $name );
 	}
 
+	/**
+	 * Retrieves the field id
+	 * @since  1.0.3
+	 * @param  boolean $raw Whether to retrieve pre-modidifed id
+	 * @return string       Field id
+	 */
+	public function id( $raw = false ) {
+		$id = $raw ? '_id' : 'id';
+		return $this->args( $id );
+	}
+
 	/**
 	 * Get a field argument
 	 * @since  1.0.3
@@ -425,15 +436,16 @@ public function _set_field_defaults( $args ) {
 		$args['_id']        = $args['id'];
 		$args['_name']      = $args['id'];
 
-		if ( 'wysiwyg' == $args['type'] ) {
-			$args['id'] = strtolower( str_ireplace( array( '-', '_' ), '', $args['id'] ) ) . 'wpeditor';
-		}
-
 		if ( $this->group ) {
 			$args['id'] = $this->group['id'] .'_'. $this->group['count'] .'_'. $args['id'];
 			$args['_name'] = $this->group['id'] .'['. $this->group['count'] .']['. $args['_name'] .']';
 		}
 
+		if ( 'wysiwyg' == $args['type'] ) {
+			$args['id'] = strtolower( str_ireplace( array( '-', '_' ), 'zx', $args['id'] ) ) . 'wpeditor';
+			$args['options']['textarea_name'] = $args['_name'];
+		}
+
 		return $args;
 	}
 

From 652be3ca46fad24ed91b29d695509158304be024 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Wed, 12 Mar 2014 14:24:01 -0400
Subject: [PATCH 31/71] Clean up repeatable fields methods, and Make wysiwyg
 field work with repeatable (kinda).

---
 helpers/cmb_Meta_Box_types.php | 173 ++++++++++++++++++---------------
 1 file changed, 97 insertions(+), 76 deletions(-)

diff --git a/helpers/cmb_Meta_Box_types.php b/helpers/cmb_Meta_Box_types.php
index 9ea63d2..c49eaa3 100644
--- a/helpers/cmb_Meta_Box_types.php
+++ b/helpers/cmb_Meta_Box_types.php
@@ -39,14 +39,26 @@ public function __call( $name, $arguments ) {
 		do_action( "cmb_render_$name", $this->field->args(), $this->field->escaped_value(), $this->field->object_id, $this->field->object_type, $this );
 	}
 
+	/**
+	 * Render a field (and handle repeatable)
+	 * @since  1.0.3
+	 */
 	public function render() {
 		if ( $this->field->args( 'repeatable' ) ) {
 			$this->render_repeatable_field();
 		} else {
-			echo $this->{$this->field->type()}();
+			$this->_render();
 		}
 	}
 
+	/**
+	 * Render a field type
+	 * @since  1.0.3
+	 */
+	protected function _render() {
+		echo $this->{$this->field->type()}();
+	}
+
 	/**
 	 * Checks if we can get a post object, and if so, uses `get_the_terms` which utilizes caching
 	 * @since  1.0.2
@@ -122,7 +134,7 @@ public function parse_args( $args, $element, $defaults ) {
 	 * @param  array  $attr_exclude Attributes that should NOT be concatenated
 	 * @return string               String of attributes for form element
 	 */
-	public function concat_attributes( $attrs, $attr_exclude = array() ) {
+	public function concat_attrs( $attrs, $attr_exclude = array() ) {
 		$attributes = '';
 		foreach ( $attrs as $attr => $val ) {
 			if ( ! in_array( $attr, (array) $attr_exclude, true ) )
@@ -196,7 +208,7 @@ public function list_input( $args = array(), $i ) {
 			'label' => '',
 		) );
 
-		return sprintf( "\t".'<li><input%s/> <label for="%s">%s</label></li>'."\n", $this->concat_attributes( $args, 'label' ), $this->_id( $i ), $args['label'] );
+		return sprintf( "\t".'<li><input%s/> <label for="%s">%s</label></li>'."\n", $this->concat_attrs( $args, 'label' ), $args['id'], $args['label'] );
 	}
 
 	/**
@@ -216,95 +228,101 @@ public function list_input_checkbox( $args, $i ) {
 	}
 
 	/**
-	 * Generates repeatable fields
+	 * Generates repeatable field table markup
 	 * @since  1.0.0
 	 */
 	public function render_repeatable_field() {
-		$meta_value = $this->field->escaped_value();
+		$table_id = $this->field->id() .'_repeat';
 
+		$this->_desc( true, true );
+		?>
+
+		<table id="<?php echo $table_id; ?>" class="cmb-repeat-table widefat">
+			<tbody>
+				<?php $this->repeatable_rows(); ?>
+			</tbody>
+		</table>
+		<p class="add-row">
+			<a data-selector="<?php echo $table_id; ?>" class="add-row-button button" href="#"><?php _e( 'Add Row', 'cmb' ); ?></a>
+		</p>
+
+		<?php
+		// reset iterator
+		$this->iterator = 0;
+	}
+
+	/**
+	 * Generates repeatable field rows
+	 * @since  1.0.3
+	 */
+	public function repeatable_rows() {
+		$meta_value = $this->field->escaped_value();
 		// check for default content
-		$default = $this->field->args( 'default' );
+		$default    = $this->field->args( 'default' );
+
 		// check for saved data
-		if ( !empty( $meta_value ) ) {
+		if ( ! empty( $meta_value ) ) {
 			$meta_value = is_array( $meta_value ) ? array_filter( $meta_value ) : $meta_value;
 			$meta_value = ! empty( $meta_value ) ? $meta_value : $default;
 		} else {
 			$meta_value = $default;
 		}
 
-		$class = 'widefat';
-		$this->repeat_table_open();
-
-		if ( !empty( $meta_value ) ) {
+		// Loop value array and add a row
+		if ( ! empty( $meta_value ) ) {
 			foreach ( (array) $meta_value as $val ) {
 				$this->field->escaped_value = $val;
-				$this->open_repeat_row();
-				echo call_user_func( array( $this, $this->field->type() ) );
-				$this->close_repeat_row();
+				$this->repeat_row();
 				$this->iterator++;
 			}
 		} else {
-			$this->open_repeat_row();
-			echo call_user_func( array( $this, $this->field->type() ) );
-			$this->close_repeat_row();
+			// Otherwise add one row
+			$this->repeat_row();
 		}
 
-		$this->open_empty_row();
+		// Then add an empty row
 		$this->field->escaped_value = '';
 		$this->iterator = $this->iterator ? $this->iterator : 1;
-		echo call_user_func( array( $this, $this->field->type() ) );
-		$this->close_repeat_row();
-
-		$this->repeat_table_close();
-		// reset iterator
-		$this->iterator = 0;
-	}
-
-	/**
-	 * Generates repeatable field opening table markup for repeatable fields
-	 * @since  1.0.0
-	 * @param  string $class Field's class attribute
-	 */
-	protected function repeat_table_open( $class = '' ) {
-		echo $this->_desc(), '<table id="', $this->field->id(), '_repeat" class="cmb-repeat-table ', $class ,'"><tbody>';
+		$this->repeat_row( 'empty-row' );
 	}
 
 	/**
-	 * Generates repeatable field closing table markup for repeatable fields
-	 * @since 1.0.0
+	 * Generates a repeatable row's markup
+	 * @since  1.0.3
+	 * @param  string  $class Repeatable table row's class
 	 */
-	protected function repeat_table_close() {
-		echo '</tbody></table><p class="add-row"><a data-selector="', $this->field->id() ,'_repeat" class="add-row-button button" href="#">'. __( 'Add Row', 'cmb' ) .'</a></p>';
-	}
+	protected function repeat_row( $class = 'repeat-row' ) {
+		?>
 
-	protected function open_repeat_row() {
-		echo '<tr class="repeat-row">';
-		echo '<td>';
-	}
+		<tr class="<?php echo $class; ?>">
+			<td>
+				<?php $this->_render(); ?>
+			</td>
+			<td class="remove-row">
+				<a class="button remove-row-button" href="#"><?php _e( 'Remove', 'cmb' ); ?></a>
+			</td>
+		</tr>
 
-	protected function open_empty_row() {
-		echo '<tr class="empty-row">';
-		echo '<td>';
-	}
-
-	protected function close_repeat_row() {
-		echo '</td><td class="remove-row"><a class="button remove-row-button" href="#">'. __( 'Remove', 'cmb' ) .'</a></td>';
-		echo '</tr>';
+		<?php
 	}
 
 	/**
 	 * Generates description markup
 	 * @since  1.0.0
 	 * @param  boolean $paragraph Paragraph tag or span
+	 * @param  boolean $echo      Whether to echo description or only return it
 	 * @return string             Field's description markup
 	 */
-	public function _desc( $paragraph = false ) {
+	public function _desc( $paragraph = false, $echo = false ) {
 		// Prevent description from printing multiple times for repeatable fields
 		if ( $this->field->args( 'repeatable' ) || $this->iterator > 0 ) {
 			return '';
 		}
 		$tag = $paragraph ? 'p' : 'span';
-		return "\n<$tag class=\"cmb_metabox_description\">{$this->field->args( 'description' )}</$tag>\n";
+		$desc = "\n<$tag class=\"cmb_metabox_description\">{$this->field->args( 'description' )}</$tag>\n";
+		if ( $echo )
+			echo $desc;
+		return $desc;
 	}
 
 	/**
@@ -343,7 +361,7 @@ public function input( $args = array() ) {
 			'desc'  => $this->_desc( true ),
 		) );
 
-		return sprintf( '<input%s/>%s', $this->concat_attributes( $args, 'desc' ), $args['desc'] );
+		return sprintf( '<input%s/>%s', $this->concat_attrs( $args, 'desc' ), $args['desc'] );
 	}
 
 	/**
@@ -362,7 +380,7 @@ public function textarea( $args = array() ) {
 			'value' => $this->field->escaped_value( 'esc_textarea' ),
 			'desc'  => $this->_desc( true ),
 		) );
-		return sprintf( '<textarea%s>%s</textarea>%s', $this->concat_attributes( $args, array( 'desc', 'value' ) ), $args['value'], $args['desc'] );
+		return sprintf( '<textarea%s>%s</textarea>%s', $this->concat_attrs( $args, array( 'desc', 'value' ) ), $args['value'], $args['desc'] );
 	}
 
 	/**
@@ -409,11 +427,16 @@ public function textarea_code() {
 		return sprintf( '<pre>%s</pre>', $this->textarea( array( 'class' => 'cmb_textarea_code' )  ) );
 	}
 
-	public function wysiwyg() {
-		$saved_value = stripslashes( html_entity_decode( $this->field->escaped_value( 'esc_html' ) ) );
-		// $id = strtolower( str_ireplace( array( '-', '_' ), '', $this->_id() ) ) . 'wpeditor';
-		wp_editor( $saved_value, $this->_id(), $this->field->args( 'options' ) );
-		echo $this->_desc( true );
+	public function wysiwyg( $args = array() ) {
+		extract( $this->parse_args( $args, 'input', array(
+			'id'      => $this->_id(),
+			'value'   => stripslashes( html_entity_decode( $this->field->escaped_value( 'esc_html' ) ) ),
+			'desc'    => $this->_desc( true ),
+			'options' => $this->field->args( 'options' ),
+		) ) );
+
+		wp_editor( $value, $id, $options );
+		echo $desc;
 	}
 
 	public function text_date_timestamp() {
@@ -495,14 +518,14 @@ public function colorpicker() {
 	}
 
 	public function title() {
-		$args = $this->parse_args( array(), 'title', array(
-			'class' => 'cmb_metabox_title',
+		extract( $this->parse_args( array(), 'title', array(
 			'tag'   => $this->field->object_type == 'post' ? 'h5' : 'h3',
+			'class' => 'cmb_metabox_title',
+			'name'  => $this->field->args( 'name' ),
 			'desc'  => $this->_desc( true ),
-		) );
+		) ) );
 
-		$attrs = $this->concat_attributes( $args, array( 'desc', 'tag' ) );
-		return sprintf( '<%1$s%2s">%3$s</%1$s>%4$s', $args['tag'], $attrs, $this->field->args( 'name' ), $args['desc'] );
+		return sprintf( '<%1$s class="%2$s">%3$s</%1$s>%4$s', $tag, $class, $name, $desc );
 	}
 
 	public function select( $args = array() ) {
@@ -514,7 +537,7 @@ public function select( $args = array() ) {
 			'options' => $this->concat_options(),
 		) );
 
-		$attrs = $this->concat_attributes( $args, array( 'desc', 'options' ) );
+		$attrs = $this->concat_attrs( $args, array( 'desc', 'options' ) );
 		return sprintf( '<select%s>%s</select>%s', $attrs, $args['options'], $args['desc'] );
 	}
 
@@ -534,14 +557,13 @@ public function taxonomy_select() {
 	}
 
 	public function radio( $args = array(), $type = 'radio' ) {
-		$args = $this->parse_args( $args, $type, array(
+		extract( $this->parse_args( $args, $type, array(
 			'class'   => 'cmb_radio_list',
-			'desc'    => $this->_desc( true ),
 			'options' => $this->concat_options( array( 'label' => 'test' ) ),
-		) );
+			'desc'    => $this->_desc( true ),
+		) ) );
 
-		$attrs = $this->concat_attributes( $args, array( 'desc', 'options' ) );
-		return sprintf( '<ul%s>%s</ul>%s', $attrs, $args['options'], $args['desc'] );
+		return sprintf( '<ul class="%s">%s</ul>%s', $class, $options, $desc );
 	}
 
 	public function radio_inline() {
@@ -656,11 +678,10 @@ public function file_list() {
 			foreach ( $meta_value as $id => $fullurl ) {
 				$id_input = $this->input( array(
 					'type'  => 'hidden',
-					'class' => '',
-					'value'  => $fullurl,
+					'value' => $fullurl,
 					'name'  => $name .'['. $id .']',
-					'id'  => 'filelist-'. $id,
-					'desc' => '',
+					'id'    => 'filelist-'. $id,
+					'desc'  => '', 'class' => '',
 				) );
 
 				if ( $this->is_valid_img_ext( $fullurl ) ) {
@@ -721,8 +742,8 @@ public function file() {
 			'type'  => 'hidden',
 			'class' => 'cmb_upload_file_id',
 			'name'  => $_id_name,
-			'id'  => $_id_id,
-			'value'  => $_id_meta,
+			'id'    => $_id_id,
+			'value' => $_id_meta,
 		) ),
 		'<div id="', $this->_id( '_status' ) ,'" class="cmb_media_status">';
 			if ( ! empty( $meta_value ) ) {

From dfb12bbadbaccab7fecedbc9b30bfe5df836e760 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Wed, 12 Mar 2014 14:28:08 -0400
Subject: [PATCH 32/71] Clean up repeatable field group methods

---
 init.php | 53 ++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 17 deletions(-)

diff --git a/init.php b/init.php
index 813807b..7261cf1 100644
--- a/init.php
+++ b/init.php
@@ -409,7 +409,6 @@ public static function render_group( $meta_box, $args ) {
 		$group_val       = (array) $field_group->value();
 		$nrows           = count( $group_val );
 		$remove_disabled = $nrows <= 1 ? 'disabled="disabled" ' : '';
-		$remove_button   = '<tr></td><td class="remove-row" colspan="2"><button '. $remove_disabled .'data-selector="'. $field_group->id() .'_repeat" class="button remove-group-row alignright">'. __( 'Remove Group', 'cmb' ) .'</button></td></tr>';
 
 		echo '<tr><td colspan="2"><table id="', $field_group->id(), '_repeat" class="repeatable-group" style="width:100%;">';
 		if ( $desc || $label ) {
@@ -421,20 +420,13 @@ public static function render_group( $meta_box, $args ) {
 			echo '</th></tr>';
 		}
 
-		foreach ( $group_val as $iterator => $field_id ) {
+		if ( ! empty( $group_val ) ) {
 
-			echo '<tr class="repeatable-grouping" data-iterator="0"><td>
-				<table class="cmb-nested-table" style="width: 100%;">';
-				// Render repeatable group fields
-				foreach ( array_values( $field_group->args( 'fields' ) ) as $field_args ) {
-					$field = new cmb_Meta_Box_field( $field_args, $field_group->args() );
-					$field->render_field( $meta_box['show_names'] );
-				}
-				echo $remove_button;
-				echo '</table></td>
-			</tr>';
-
-			$field_group->args['count']++;
+			foreach ( $group_val as $iterator => $field_id ) {
+				self::render_group_row( $field_group, $remove_disabled, $meta_box['show_names'] );
+			}
+		} else {
+			self::render_group_row( $field_group, $remove_disabled, $meta_box['show_names'] );
 		}
 
 		echo '<tr><td><p class="add-row"><button data-selector="', $field_group->id() ,'_repeat" class="add-group-row button">'. __( 'Add Group', 'cmb' ) .'</button></p></td></tr>';
@@ -443,6 +435,31 @@ public static function render_group( $meta_box, $args ) {
 
 	}
 
+	public static function render_group_row( $field_group, $remove_disabled, $show_names ) {
+
+		echo '
+		<tr class="repeatable-grouping" data-iterator="'. $field_group->count() .'">
+			<td>
+				<table class="cmb-nested-table" style="width: 100%;">';
+				// Render repeatable group fields
+				foreach ( array_values( $field_group->args( 'fields' ) ) as $field_args ) {
+					$field = new cmb_Meta_Box_field( $field_args, $field_group->args() );
+					$field->render_field( $show_names );
+				}
+				echo '
+					<tr>
+						<td class="remove-row" colspan="2">
+							<button '. $remove_disabled .'data-selector="'. $field_group->id() .'_repeat" class="button remove-group-row alignright">'. __( 'Remove Group', 'cmb' ) .'</button>
+						</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+		';
+
+		$field_group->args['count']++;
+	}
+
 	/**
 	 * Save data from metabox
 	 */
@@ -541,9 +558,9 @@ public static function save_group( $args ) {
 		$saved       = array();
 		// $group_vals[0]['color'] = '333';
 
-		foreach ( array_values( $args['fields'] ) as $field_args ) {
+		foreach ( array_values( $field_group->fields() ) as $field_args ) {
 			$field = new cmb_Meta_Box_field( $field_args );
-			$sub_id = $field->id();
+			$sub_id = $field->id( true );
 
 			foreach ( (array) $group_vals as $key => $post_vals ) {
 				// Get value
@@ -567,7 +584,9 @@ public static function save_group( $args ) {
 				// Add to `$saved` array
 				$saved[ $key ][ $sub_id ] = $new_val;
 			}
+			$saved[ $key ] = array_filter( $saved[ $key ] );
 		}
+		$saved = array_filter( $saved );
 
 		$field_group->update_data( $saved, true );
 	}
@@ -576,7 +595,7 @@ public static function sanitize_field( $field, $new_value = null ) {
 
 		$new_value = null !== $new_value
 			? $new_value
-			: ( isset( $_POST[ $field->id() ] ) ? $_POST[ $field->id() ] : null );
+			: ( isset( $_POST[ $field->id( true ) ] ) ? $_POST[ $field->id() ] : null );
 
 		if ( $field->args( 'repeatable' ) && is_array( $new_value ) ) {
 			// Remove empties

From 77ecd1b05fb25aa0fe3686c123faeee9d419319c Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Wed, 12 Mar 2014 14:29:11 -0400
Subject: [PATCH 33/71] Make JS concessions for wysiwyg repeatable. Still needs
 testing/bug fixing

---
 js/cmb.js     | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 js/cmb.min.js | 26 +++++++++++-------
 2 files changed, 90 insertions(+), 10 deletions(-)

diff --git a/js/cmb.js b/js/cmb.js
index 8f88a7d..0828317 100644
--- a/js/cmb.js
+++ b/js/cmb.js
@@ -194,6 +194,30 @@ window.CMB = (function(window, document, $, undefined){
 		return false;
 	}
 
+	// src: http://www.benalman.com/projects/jquery-replacetext-plugin/
+	$.fn.replaceText = function(b, a, c) {
+		return this.each(function() {
+			var f = this.firstChild, g, e, d = [];
+			if (f) {
+				do {
+					if (f.nodeType === 3) {
+						g = f.nodeValue;
+						e = g.replace(b, a);
+						if (e !== g) {
+							if (!c && /</.test(e)) {
+								$(f).before(e);
+								d.push(f)
+							} else {
+								f.nodeValue = e
+							}
+						}
+					}
+				} while (f = f.nextSibling)
+			}
+			d.length && $(d).remove()
+		})
+	}
+
 	$.fn.cleanRow = function( prevNum, group ) {
 		var $self = $(this);
 		if ( group ) {
@@ -201,9 +225,11 @@ window.CMB = (function(window, document, $, undefined){
 			$self.find('.cmb-repeat-table .repeat-row:not(:first-child)').remove();
 		}
 		cmb.$focus = false;
+		cmb.neweditor_id = [];
 		$self.find('input:not([type="button"]),select,textarea,label').each( function(){
 
 			var $newInput = $(this);
+			var isEditor  = $newInput.hasClass( 'wp-editor-area' );
 			var oldFor    = $newInput.attr( 'for' );
 			var $next     = $newInput.next();
 			var attrs     = {}
@@ -217,17 +243,36 @@ window.CMB = (function(window, document, $, undefined){
 				attrs = {
 					id: newID,
 					name: newName,
-					value: '',
+					// value: '',
 					'data-iterator': cmb.idNumber,
 				}
 			}
 
 			$newInput
+				.val('')
 				.removeAttr( 'checked' )
 				.removeAttr( 'selected' )
 				.removeClass( 'hasDatepicker' )
 				.attr( attrs );
 
+			// wysiwyg field
+			if ( isEditor ) {
+				// Get new wysiwyg ID
+				newID = newID ? oldID.replace( 'zx'+ prevNum, 'zx'+ cmb.idNumber ) : '';
+				// Empty the contents
+				$newInput.html('');
+				// Get wysiwyg field
+				var $wysiwyg = $newInput.parents( '.cmb-type-wysiwyg' );
+				// Remove extra mce divs
+				$wysiwyg.find('.mce-tinymce:not(:first-child)').remove();
+				// Replace id instances
+				var html = $wysiwyg.html().replace( new RegExp( oldID, 'g' ), newID );
+				// Update field html
+				$wysiwyg.html( html );
+				// Save ids for later to re-init tinymce
+				cmb.neweditor_id.push( { 'id': newID, 'old': oldID } );
+			}
+
 			cmb.$focus = cmb.$focus ? cmb.$focus : $newInput;
 		});
 		return this;
@@ -258,6 +303,33 @@ window.CMB = (function(window, document, $, undefined){
 		if ( cmb.$focus ) {
 			cmb.$focus.focus();
 		}
+		// Need to re-init wp_editor instances
+		if ( cmb.neweditor_id.length ) {
+			var i;
+			for ( i = cmb.neweditor_id.length - 1; i >= 0; i-- ) {
+				var id = cmb.neweditor_id[i].id;
+				var old = cmb.neweditor_id[i].old;
+
+				if ( typeof( tinyMCEPreInit.mceInit[ id ] ) === 'undefined' ) {
+					var newSettings = jQuery.extend( {}, tinyMCEPreInit.mceInit[ old ] );
+					for ( var prop in newSettings )
+						if ( 'string' === typeof( newSettings[prop] ) )
+							newSettings[prop] = newSettings[prop].replace( new RegExp( old, 'g' ), id );
+					tinyMCEPreInit.mceInit[ id ] = newSettings;
+				}
+				if ( typeof( tinyMCEPreInit.qtInit[ id ] ) === 'undefined' ) {
+					var newQTS = jQuery.extend( {}, tinyMCEPreInit.qtInit[ old ] );
+					for ( var prop in newQTS )
+						if ( 'string' === typeof( newQTS[prop] ) )
+							newQTS[prop] = newQTS[prop].replace( new RegExp( old, 'g' ), id );
+					tinyMCEPreInit.qtInit[ id ] = newQTS;
+				}
+				tinyMCE.init({
+					id : tinyMCEPreInit.mceInit[ id ],
+				});
+
+			};
+		}
 
 		// Init pickers from new row
 		cmb.initPickers( $row.find('input:text.cmb_timepicker'), $row.find('input:text.cmb_datepicker'), $row.find('input:text.cmb_colorpicker') );
diff --git a/js/cmb.min.js b/js/cmb.min.js
index dc1a2e6..3d692e3 100644
--- a/js/cmb.min.js
+++ b/js/cmb.min.js
@@ -13,15 +13,23 @@ if(l.type&&l.type==="image"){i='<div class="img_status"><img style="max-width: 3
 }g.siblings(".cmb_media_status").slideDown().html(i);}};e.file_frames[e.formfield].on("select",function(){var q=e.file_frames[e.formfield].state().get("selection");
 var p=j?"list":"single";k[p](q);});e.file_frames[e.formfield].open();};e.handleRemoveMedia=function(g){g.preventDefault();var i=d(this);if(i.is(".attach_list .cmb_remove_file_button")){i.parents("li").remove();
 return false;}e.formfield=i.attr("rel");var h=i.parents(".img_status");e.metabox().find("input#"+e.formfield).val("");e.metabox().find("input#"+e.formfield+"_id").val("");
-if(!h.length){i.parents(".cmb_media_status").html("");}else{h.html("");}return false;};d.fn.cleanRow=function(g,h){var i=d(this);if(h){i.find(".cmb-repeat-table .repeat-row:not(:first-child)").remove();
-}e.$focus=false;i.find('input:not([type="button"]),select,textarea,label').each(function(){var m=d(this);var j=m.attr("for");var l=m.next();var o={};if(j){o={"for":j.replace("_"+g,"_"+e.idNumber)};
-}else{var p=m.attr("name");var k=p?p.replace(g,e.idNumber):"";var q=m.attr("id");var n=q?q.replace("_"+g,"_"+e.idNumber):"";o={id:n,name:k,value:"","data-iterator":e.idNumber,};
-}m.removeAttr("checked").removeAttr("selected").removeClass("hasDatepicker").attr(o);e.$focus=e.$focus?e.$focus:m;});return this;};d.fn.newRowHousekeeping=function(){var g=d(this);
-var i=g.find(".wp-picker-container");var h=g.find(".cmb_media_status");if(i.length){i.each(function(){var j=d(this).parent();j.html(j.find("input:text.cmb_colorpicker").attr("style",""));
-});}if(h.length){h.empty();}return this;};e.afterRowInsert=function(g){if(e.$focus){e.$focus.focus();}e.initPickers(g.find("input:text.cmb_timepicker"),g.find("input:text.cmb_datepicker"),g.find("input:text.cmb_colorpicker"));
-};e.addGroupRow=function(l){l.preventDefault();var m=d(this);var h=d("#"+m.data("selector"));var j=h.find(".repeatable-grouping").last();var i=parseInt(j.data("iterator"));
-e.idNumber=i+1;var g=j.clone();g.newRowHousekeeping().cleanRow(i,true);var k=d('<tr class="repeatable-grouping" data-iterator="'+e.idNumber+'">'+g.html()+"</tr>");
-j.after(k);e.afterRowInsert(k);if(h.find(".repeatable-grouping").length<=1){h.find(".remove-group-row").prop("disabled",true);}else{h.find(".remove-group-row").removeAttr("disabled");
+if(!h.length){i.parents(".cmb_media_status").html("");}else{h.html("");}return false;};d.fn.replaceText=function(g,h,i){return this.each(function(){var k=this.firstChild,j,l,m=[];
+if(k){do{if(k.nodeType===3){j=k.nodeValue;l=j.replace(g,h);if(l!==j){if(!i&&/</.test(l)){d(k).before(l);m.push(k);}else{k.nodeValue=l;}}}}while(k=k.nextSibling);
+}m.length&&d(m).remove();});};d.fn.cleanRow=function(g,h){var i=d(this);if(h){i.find(".cmb-repeat-table .repeat-row:not(:first-child)").remove();}e.$focus=false;
+e.neweditor_id=[];i.find('input:not([type="button"]),select,textarea,label').each(function(){var s=d(this);var k=s.hasClass("wp-editor-area");var l=s.attr("for");
+var n=s.next();var t={};if(l){t={"for":l.replace("_"+g,"_"+e.idNumber)};}else{var j=s.attr("name");var r=j?j.replace(g,e.idNumber):"";var p=s.attr("id");
+var q=p?p.replace("_"+g,"_"+e.idNumber):"";t={id:q,name:r,"data-iterator":e.idNumber,};}s.val("").removeAttr("checked").removeAttr("selected").removeClass("hasDatepicker").attr(t);
+if(k){q=q?p.replace("zx"+g,"zx"+e.idNumber):"";s.html("");var m=s.parents(".cmb-type-wysiwyg");m.find(".mce-tinymce:not(:first-child)").remove();var o=m.html().replace(new RegExp(p,"g"),q);
+m.html(o);e.neweditor_id.push({id:q,old:p});}e.$focus=e.$focus?e.$focus:s;});return this;};d.fn.newRowHousekeeping=function(){var g=d(this);var i=g.find(".wp-picker-container");
+var h=g.find(".cmb_media_status");if(i.length){i.each(function(){var j=d(this).parent();j.html(j.find("input:text.cmb_colorpicker").attr("style",""));});
+}if(h.length){h.empty();}return this;};e.afterRowInsert=function(j){if(e.$focus){e.$focus.focus();}if(e.neweditor_id.length){var l;for(l=e.neweditor_id.length-1;
+l>=0;l--){var n=e.neweditor_id[l].id;var k=e.neweditor_id[l].old;if(typeof(tinyMCEPreInit.mceInit[n])==="undefined"){var h=jQuery.extend({},tinyMCEPreInit.mceInit[k]);
+for(var m in h){if("string"===typeof(h[m])){h[m]=h[m].replace(new RegExp(k,"g"),n);}}tinyMCEPreInit.mceInit[n]=h;}if(typeof(tinyMCEPreInit.qtInit[n])==="undefined"){var g=jQuery.extend({},tinyMCEPreInit.qtInit[k]);
+for(var m in g){if("string"===typeof(g[m])){g[m]=g[m].replace(new RegExp(k,"g"),n);}}tinyMCEPreInit.qtInit[n]=g;}tinyMCE.init({id:tinyMCEPreInit.mceInit[n],});
+}}e.initPickers(j.find("input:text.cmb_timepicker"),j.find("input:text.cmb_datepicker"),j.find("input:text.cmb_colorpicker"));};e.addGroupRow=function(l){l.preventDefault();
+var m=d(this);var h=d("#"+m.data("selector"));var j=h.find(".repeatable-grouping").last();var i=parseInt(j.data("iterator"));e.idNumber=i+1;var g=j.clone();
+g.newRowHousekeeping().cleanRow(i,true);var k=d('<tr class="repeatable-grouping" data-iterator="'+e.idNumber+'">'+g.html()+"</tr>");j.after(k);e.afterRowInsert(k);
+if(h.find(".repeatable-grouping").length<=1){h.find(".remove-group-row").prop("disabled",true);}else{h.find(".remove-group-row").removeAttr("disabled");
 }};e.addAjaxRow=function(g){g.preventDefault();var l=d(this);var m="#"+l.data("selector");var o=d(m);var h=o.find(".empty-row");var j=parseInt(h.find("[data-iterator]").data("iterator"));
 e.idNumber=j+1;var k=h.clone();var n=k.find(".wp-picker-container");var i=k.find(".cmb_media_status");k.newRowHousekeeping().cleanRow(j);h.removeClass("empty-row").addClass("repeat-row");
 h.after(k);e.afterRowInsert(k);};e.removeGroupRow=function(i){i.preventDefault();var k=d(this);var h=d("#"+k.data("selector"));var j=k.parents(".repeatable-grouping");

From f3a89f16c1ce3038b3c540702e36b057b0d07f7d Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Wed, 12 Mar 2014 16:09:55 -0400
Subject: [PATCH 34/71] JS should check for "wp" var before using

---
 js/cmb.js     | 3 +++
 js/cmb.min.js | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/js/cmb.js b/js/cmb.js
index 0828317..a1c1c68 100644
--- a/js/cmb.js
+++ b/js/cmb.js
@@ -79,6 +79,9 @@ window.CMB = (function(window, document, $, undefined){
 
 	cmb.handleMedia = function(event) {
 
+		if ( typeof wp === 'undefined' )
+			return;
+
 		event.preventDefault();
 
 		var $metabox     = cmb.metabox();
diff --git a/js/cmb.min.js b/js/cmb.min.js
index 3d692e3..b5d2b97 100644
--- a/js/cmb.min.js
+++ b/js/cmb.min.js
@@ -2,9 +2,9 @@ window.CMB=(function(c,a,d,f){var b=c.cmb_l10;var e={formfield:"",idNumber:false
 }e.$metabox=d("table.cmb_metabox");return e.$metabox;};e.init=function(){e.log(b);var g=e.metabox();if(b.new_admin_style){g.find(".cmb-spinner img").hide();
 }e.initPickers(g.find("input:text.cmb_timepicker"),g.find("input:text.cmb_datepicker"),g.find("input:text.cmb_colorpicker"));d("#ui-datepicker-div").wrap('<div class="cmb_element" />');
 d(".cmb_metabox").on("change",".cmb_upload_file",function(){e.formfield=d(this).attr("id");d("#"+e.formfield+"_id").val("");}).on("click",".cmb_upload_button",e.handleMedia).on("click",".cmb_remove_file_button",e.handleRemoveMedia).on("click",".add-group-row",e.addGroupRow).on("click",".add-row-button",e.addAjaxRow).on("click",".remove-group-row",e.removeGroupRow).on("click",".remove-row-button",e.removeAjaxRow).on("keyup paste focusout",".cmb_oembed",e.maybeOembed);
-setTimeout(e.resizeoEmbeds,500);d(c).on("resize",e.resizeoEmbeds);};e.handleMedia=function(h){h.preventDefault();var m=e.metabox();var n=d(this);e.formfield=n.prev("input").attr("id");
-var g=d("#"+e.formfield);var o=g.attr("name");var i=true;var l=true;var j=n.hasClass("cmb_upload_list");if(e.formfield in e.file_frames){e.file_frames[e.formfield].open();
-return;}e.file_frames[e.formfield]=wp.media.frames.file_frame=wp.media({title:m.find("label[for="+e.formfield+"]").text(),button:{text:b.upload_file},multiple:j?true:false});
+setTimeout(e.resizeoEmbeds,500);d(c).on("resize",e.resizeoEmbeds);};e.handleMedia=function(h){if(typeof wp==="undefined"){return;}h.preventDefault();var m=e.metabox();
+var n=d(this);e.formfield=n.prev("input").attr("id");var g=d("#"+e.formfield);var o=g.attr("name");var i=true;var l=true;var j=n.hasClass("cmb_upload_list");
+if(e.formfield in e.file_frames){e.file_frames[e.formfield].open();return;}e.file_frames[e.formfield]=wp.media.frames.file_frame=wp.media({title:m.find("label[for="+e.formfield+"]").text(),button:{text:b.upload_file},multiple:j?true:false});
 var k={list:function(q){l=q.toJSON();g.val(l.url);d("#"+e.formfield+"_id").val(l.id);var p=[];d(l).each(function(){if(this.type&&this.type==="image"){i='<li class="img_status"><img width="50" height="50" src="'+this.url+'" class="attachment-50x50" alt="'+this.filename+'"><p><a href="#" class="cmb_remove_file_button" rel="'+e.formfield+"["+this.id+']">'+b.remove_image+'</a></p><input type="hidden" id="filelist-'+this.id+'" name="'+o+"["+this.id+']" value="'+this.url+'"></li>';
 }else{i="<li>"+b.file+" <strong>"+this.filename+'</strong>&nbsp;&nbsp;&nbsp; (<a href="'+this.url+'" target="_blank" rel="external">'+b.download+'</a> / <a href="#" class="cmb_remove_file_button" rel="'+e.formfield+"["+this.id+']">'+b.remove_file+'</a>)<input type="hidden" id="filelist-'+this.id+'" name="'+o+"["+this.id+']" value="'+this.url+'"></li>';
 }p.push(i);});d(p).each(function(){g.siblings(".cmb_media_status").slideDown().append(this);});},single:function(p){l=p.first().toJSON();g.val(l.url);d("#"+e.formfield+"_id").val(l.id);

From d692c2bc0888753afd80af78224a306997cd9d01 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Wed, 12 Mar 2014 17:23:55 -0400
Subject: [PATCH 35/71] More specific selectors, and remove "widefat" class

---
 helpers/cmb_Meta_Box_types.php |  2 +-
 style.css                      | 18 ++++++++++++++++--
 style.min.css                  |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/helpers/cmb_Meta_Box_types.php b/helpers/cmb_Meta_Box_types.php
index c49eaa3..e2ac74c 100644
--- a/helpers/cmb_Meta_Box_types.php
+++ b/helpers/cmb_Meta_Box_types.php
@@ -237,7 +237,7 @@ public function render_repeatable_field() {
 		$this->_desc( true, true );
 		?>
 
-		<table id="<?php echo $table_id; ?>" class="cmb-repeat-table widefat">
+		<table id="<?php echo $table_id; ?>" class="cmb-repeat-table">
 			<tbody>
 				<?php $this->repeatable_rows(); ?>
 			</tbody>
diff --git a/style.css b/style.css
index d01ce21..8f3f096 100644
--- a/style.css
+++ b/style.css
@@ -5,11 +5,25 @@ table.cmb_metabox {
 	clear: both;
 }
 
-table.cmb_metabox tr:first-of-type td, table.cmb_metabox tr:first-of-type th, .post-php table.cmb_metabox .repeatable-group td, .post-new-php table.cmb_metabox .repeatable-group td, .post-php table.cmb_metabox .repeatable-group th, .post-new-php table.cmb_metabox .repeatable-group th, .post-php table.cmb_metabox .repeatable-group:first-of-type, .post-new-php table.cmb_metabox .repeatable-group:first-of-type {
+table.cmb_metabox > tr:first-of-type > td,
+table.cmb_metabox > tr:first-of-type > th,
+.post-php table.cmb_metabox .cmb-nested-table td,
+.post-new-php table.cmb_metabox .cmb-nested-table td,
+.post-php table.cmb_metabox .repeatable-group th,
+.post-new-php table.cmb_metabox .repeatable-group th,
+.post-php table.cmb_metabox .repeatable-group:first-of-type,
+.post-new-php table.cmb_metabox .repeatable-group:first-of-type {
 	border: 0;
 }
 
-.post-php table.cmb_metabox td, .post-new-php table.cmb_metabox td, .post-php table.cmb_metabox th, .post-new-php table.cmb_metabox th, .post-php table.cmb_metabox .repeatable-group, .post-new-php table.cmb_metabox .repeatable-group, .post-php table.cmb_metabox .repeatable-group, .post-new-php table.cmb_metabox .repeatable-group {
+.post-php table.cmb_metabox td,
+.post-new-php table.cmb_metabox td,
+.post-php table.cmb_metabox th,
+.post-new-php table.cmb_metabox th,
+.post-php table.cmb_metabox .repeatable-group,
+.post-new-php table.cmb_metabox .repeatable-group,
+.post-php table.cmb_metabox .repeatable-group,
+.post-new-php table.cmb_metabox .repeatable-group {
 	border-top: 1px solid #E9E9E9;
 }
 
diff --git a/style.min.css b/style.min.css
index fd5407d..e9cb838 100644
--- a/style.min.css
+++ b/style.min.css
@@ -1,4 +1,4 @@
-table.cmb_metabox{clear:both}table.cmb_metabox tr:first-of-type td,table.cmb_metabox tr:first-of-type th,.post-php table.cmb_metabox .repeatable-group td,.post-new-php table.cmb_metabox .repeatable-group td,.post-php table.cmb_metabox .repeatable-group th,.post-new-php table.cmb_metabox .repeatable-group th,.post-php table.cmb_metabox .repeatable-group:first-of-type,.post-new-php table.cmb_metabox .repeatable-group:first-of-type{border:0}
+table.cmb_metabox{clear:both}table.cmb_metabox>tr:first-of-type>td,table.cmb_metabox>tr:first-of-type>th,.post-php table.cmb_metabox .cmb-nested-table td,.post-new-php table.cmb_metabox .cmb-nested-table td,.post-php table.cmb_metabox .repeatable-group th,.post-new-php table.cmb_metabox .repeatable-group th,.post-php table.cmb_metabox .repeatable-group:first-of-type,.post-new-php table.cmb_metabox .repeatable-group:first-of-type{border:0}
 .post-php table.cmb_metabox td,.post-new-php table.cmb_metabox td,.post-php table.cmb_metabox th,.post-new-php table.cmb_metabox th,.post-php table.cmb_metabox .repeatable-group,.post-new-php table.cmb_metabox .repeatable-group,.post-php table.cmb_metabox .repeatable-group,.post-new-php table.cmb_metabox .repeatable-group{border-top:1px solid #e9e9e9}
 .repeatable-group th{padding:5px}.repeatable-group .cmb_upload_button{float:right}#poststuff .repeatable-group h2{margin:0}.post-php table.cmb_metabox th,.post-new-php table.cmb_metabox th{text-align:right;font-weight:bold}
 .post-php table.cmb_metabox table th,.post-new-php table.cmb_metabox table th{text-align:left}table.cmb_metabox th label{margin-top:5px;display:block}

From 1b97275679639d2c0946200a2574e4cb20c33126 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Wed, 12 Mar 2014 22:22:44 -0400
Subject: [PATCH 36/71] __call method now takes a parameter to check for array
 keys, and set some group field defaults

---
 helpers/cmb_Meta_Box_field.php | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/helpers/cmb_Meta_Box_field.php b/helpers/cmb_Meta_Box_field.php
index e61a48c..d51cc80 100644
--- a/helpers/cmb_Meta_Box_field.php
+++ b/helpers/cmb_Meta_Box_field.php
@@ -71,7 +71,8 @@ public function __construct( $field_args, $group_field_args = array() ) {
 	 * @return mixed             Value of field argument
 	 */
 	public function __call( $name, $arguments ) {
-		return $this->args( $name );
+		$key = isset( $arguments[0] ) ? $arguments[0] : false;
+		return $this->args( $name, $key );
 	}
 
 	/**
@@ -89,10 +90,15 @@ public function id( $raw = false ) {
 	 * Get a field argument
 	 * @since  1.0.3
 	 * @param  string $key Argument to check
+	 * @param  string $key Sub argument to check
 	 * @return mixed       Argument value or false if non-existent
 	 */
-	public function args( $key = '' ) {
-		return $this->_data( 'args', $key );
+	public function args( $key = '', $_key = '' ) {
+		$vars = $this->_data( 'args', $key );
+		if ( $_key ) {
+			return isset( $vars[ $_key ] ) ? $vars[ $_key ] : false;
+		}
+		return $vars;
 	}
 
 	/**
@@ -433,6 +439,12 @@ public function _set_field_defaults( $args ) {
 		$args['on_front']   = ! ( isset( $args['on_front'] ) && ! $args['on_front'] );
 		$args['attributes'] = isset( $args['attributes'] ) && is_array( $args['attributes'] ) ? $args['attributes'] : array();
 		$args['options']    = isset( $args['options'] ) && is_array( $args['options'] ) ? $args['options'] : array();
+
+		$args['options']    = 'group' == $args['type'] ? wp_parse_args( $args['options'], array(
+			'add_button'    => __( 'Add Group', 'cmb' ),
+			'remove_button' => __( 'Remove Group', 'cmb' ),
+		) ) : $args['options'];
+
 		$args['_id']        = $args['id'];
 		$args['_name']      = $args['id'];
 

From f7a8e816d8fb96ef3e5b32a1adaea8ff1a016d1f Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Wed, 12 Mar 2014 22:23:17 -0400
Subject: [PATCH 37/71] Use new field group options for button text

---
 init.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.php b/init.php
index 7261cf1..b4da635 100644
--- a/init.php
+++ b/init.php
@@ -429,7 +429,7 @@ public static function render_group( $meta_box, $args ) {
 			self::render_group_row( $field_group, $remove_disabled, $meta_box['show_names'] );
 		}
 
-		echo '<tr><td><p class="add-row"><button data-selector="', $field_group->id() ,'_repeat" class="add-group-row button">'. __( 'Add Group', 'cmb' ) .'</button></p></td></tr>';
+		echo '<tr><td><p class="add-row"><button data-selector="', $field_group->id() ,'_repeat" class="add-group-row button">'. $field_group->options( 'add_button' ) .'</button></p></td></tr>';
 
 		echo '</table></td></tr>';
 
@@ -449,7 +449,7 @@ public static function render_group_row( $field_group, $remove_disabled, $show_n
 				echo '
 					<tr>
 						<td class="remove-row" colspan="2">
-							<button '. $remove_disabled .'data-selector="'. $field_group->id() .'_repeat" class="button remove-group-row alignright">'. __( 'Remove Group', 'cmb' ) .'</button>
+							<button '. $remove_disabled .'data-selector="'. $field_group->id() .'_repeat" class="button remove-group-row alignright">'. $field_group->options( 'remove_button' ) .'</button>
 						</td>
 					</tr>
 				</table>

From b15ff4ec8d25deec59d3dca896275f5599d67e3e Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Wed, 12 Mar 2014 22:24:23 -0400
Subject: [PATCH 38/71] Use new field group options for button text

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

diff --git a/init.php b/init.php
index b4da635..29e21e4 100644
--- a/init.php
+++ b/init.php
@@ -401,7 +401,7 @@ public static function show_form( $meta_box, $object_id = 0, $object_type = '' )
 	public static function render_group( $meta_box, $args ) {
 		if ( ! isset( $args['id'], $args['fields'] ) || ! is_array( $args['fields'] ) )
 			return;
-		// delete_post_meta( self::get_object_id(), '_eworship_reports' );
+
 		$args['count']   = 0;
 		$field_group     = new cmb_Meta_Box_field( $args );
 		$desc            = $field_group->args( 'description' );

From 6c2ee4dc709bbbe736d96be2df89d65e6ffc4d14 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Wed, 12 Mar 2014 22:24:48 -0400
Subject: [PATCH 39/71] Use our already created variable

---
 js/cmb.js     | 3 +--
 js/cmb.min.js | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/js/cmb.js b/js/cmb.js
index a1c1c68..6e612e3 100644
--- a/js/cmb.js
+++ b/js/cmb.js
@@ -53,8 +53,7 @@ window.CMB = (function(window, document, $, undefined){
 		// Wrap date picker in class to narrow the scope of jQuery UI CSS and prevent conflicts
 		$("#ui-datepicker-div").wrap('<div class="cmb_element" />');
 
-
-		$('.cmb_metabox')
+		$metabox
 			.on( 'change', '.cmb_upload_file', function() {
 				cmb.formfield = $(this).attr('id');
 				$('#' + cmb.formfield + '_id').val('');
diff --git a/js/cmb.min.js b/js/cmb.min.js
index b5d2b97..45803bb 100644
--- a/js/cmb.min.js
+++ b/js/cmb.min.js
@@ -1,7 +1,7 @@
 window.CMB=(function(c,a,d,f){var b=c.cmb_l10;var e={formfield:"",idNumber:false,file_frames:{},};e.metabox=function(){if(e.$metabox){return e.$metabox;
 }e.$metabox=d("table.cmb_metabox");return e.$metabox;};e.init=function(){e.log(b);var g=e.metabox();if(b.new_admin_style){g.find(".cmb-spinner img").hide();
 }e.initPickers(g.find("input:text.cmb_timepicker"),g.find("input:text.cmb_datepicker"),g.find("input:text.cmb_colorpicker"));d("#ui-datepicker-div").wrap('<div class="cmb_element" />');
-d(".cmb_metabox").on("change",".cmb_upload_file",function(){e.formfield=d(this).attr("id");d("#"+e.formfield+"_id").val("");}).on("click",".cmb_upload_button",e.handleMedia).on("click",".cmb_remove_file_button",e.handleRemoveMedia).on("click",".add-group-row",e.addGroupRow).on("click",".add-row-button",e.addAjaxRow).on("click",".remove-group-row",e.removeGroupRow).on("click",".remove-row-button",e.removeAjaxRow).on("keyup paste focusout",".cmb_oembed",e.maybeOembed);
+g.on("change",".cmb_upload_file",function(){e.formfield=d(this).attr("id");d("#"+e.formfield+"_id").val("");}).on("click",".cmb_upload_button",e.handleMedia).on("click",".cmb_remove_file_button",e.handleRemoveMedia).on("click",".add-group-row",e.addGroupRow).on("click",".add-row-button",e.addAjaxRow).on("click",".remove-group-row",e.removeGroupRow).on("click",".remove-row-button",e.removeAjaxRow).on("keyup paste focusout",".cmb_oembed",e.maybeOembed);
 setTimeout(e.resizeoEmbeds,500);d(c).on("resize",e.resizeoEmbeds);};e.handleMedia=function(h){if(typeof wp==="undefined"){return;}h.preventDefault();var m=e.metabox();
 var n=d(this);e.formfield=n.prev("input").attr("id");var g=d("#"+e.formfield);var o=g.attr("name");var i=true;var l=true;var j=n.hasClass("cmb_upload_list");
 if(e.formfield in e.file_frames){e.file_frames[e.formfield].open();return;}e.file_frames[e.formfield]=wp.media.frames.file_frame=wp.media({title:m.find("label[for="+e.formfield+"]").text(),button:{text:b.upload_file},multiple:j?true:false});

From 0b9d1717630641c9e99db66d95543348d25ccae3 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Fri, 14 Mar 2014 13:38:50 -0400
Subject: [PATCH 40/71] Fix saving of 'file' type attachment ids

---
 helpers/cmb_Meta_Box_Sanitize.php | 105 ++++++++++++++++++++++--------
 1 file changed, 79 insertions(+), 26 deletions(-)

diff --git a/helpers/cmb_Meta_Box_Sanitize.php b/helpers/cmb_Meta_Box_Sanitize.php
index b675fb9..8f31e80 100644
--- a/helpers/cmb_Meta_Box_Sanitize.php
+++ b/helpers/cmb_Meta_Box_Sanitize.php
@@ -77,7 +77,6 @@ public function default_sanitization( $value ) {
 				// We'll fallback to 'sanitize_text_field'
 				return is_array( $value ) ? array_map( 'sanitize_text_field', $value ) : call_user_func( 'sanitize_text_field', $value );
 		}
-
 	}
 
 	/**
@@ -263,40 +262,67 @@ public function textarea_code( $value, $repeat = false ) {
 	}
 
 	/**
-	 * Sanitize code textareas
-	 * @since  1.0.2
-	 * @param  string $value  Meta value
-	 * @return string        Sanitized data
+	 * Peforms saving of `file` attachement's ID
+	 * @since  1.0.3
+	 * @param  string $value File url
 	 */
-	public function file( $value ) {
-		$args = $this->field->args();
-		$id = $this->field->id();
-		$_id_name = $id .'_id';
-		// get _id old value
-		$_id_old = $this->field->get_data( $_id_name );
-
-		// If specified NOT to save the file ID
-		if ( isset( $args['save_id'] ) && ! $args['save_id'] ) {
-			$_new_id = '';
+	public function _save_file_id( $value ) {
+		$group      = $this->field->group;
+		$args       = $this->field->args();
+		$args['id'] = $args['_id'] . '_id';
+
+		unset( $args['_id'], $args['_name'] );
+		// And get new field object
+		$field      = new cmb_Meta_Box_field( $args, $group );
+		$id_key     = $field->_id();
+		$id_val_old = $field->escaped_value( 'absint' );
+
+		if ( $group ) {
+			// Check group $_POST data
+			$i       = $group->index;
+			$base_id = $group->_id();
+			$id_val  = isset( $_POST[ $base_id ][ $i ][ $id_key ] ) ? absint( $_POST[ $base_id ][ $i ][ $id_key ] ) : 0;
+
 		} else {
-			// otherwise get the file ID
-			$_new_id = isset( $_POST[ $_id_name ] ) ? $_POST[ $_id_name ] : null;
+			// Check standard $_POST data
+			$id_val = isset( $_POST[ $field->id() ] ) ? $_POST[ $field->id() ] : null;
 
-			// If there is no ID saved yet, try to get it from the url
-			if ( isset( $_POST[ $id ] ) && $_POST[ $id ] && ! $_new_id ) {
-				$_new_id = cmb_Meta_Box::image_id_from_url( esc_url_raw( $_POST[ $id ] ) );
-			}
+		}
 
+		// If there is no ID saved yet, try to get it from the url
+		if ( $value && ! $id_val ) {
+			$id_val = $this->_image_id_from_url( $value );
 		}
 
-		if ( $_new_id && $_new_id != $_id_old ) {
-			$updated = cmb_Meta_Box::update_data( $_new_id, $_id_name );
-		} elseif ( '' == $_new_id && $_id_old ) {
-			cmb_Meta_Box::remove_data( $_id_name, $old );
+		if ( $group ) {
+			return array(
+				'attach_id' => $id_val,
+				'field_id'  => $id_key
+			);
 		}
 
-		return $this->default_sanitization( $value );
+		if ( $id_val && $id_val != $id_val_old ) {
+			return $field->update_data( $id_val );
+		} elseif ( empty( $id_val ) && $id_val_old ) {
+			return $field->remove_data( $old );
+		}
+	}
 
+	/**
+	 * Handles saving of attachment post ID and sanitizing file url
+	 * @since  1.0.3
+	 * @param  string $value File url
+	 * @return string        Sanitized url
+	 */
+	public function file( $value ) {
+		// If NOT specified to NOT save the file ID
+		if ( $this->field->args( 'save_id' ) ) {
+			$id_value = $this->_save_file_id( $value );
+		}
+		$clean = $this->text_url( $value );
+
+		// Return an array with url/id if saving a group field
+		return $this->field->group ? array_merge( array( 'url' => $clean), $id_value ) : $clean;
 	}
 
 	/**
@@ -317,4 +343,31 @@ public function _check_repeat( $value, $method, $repeat ) {
 		return $new_value;
 	}
 
+	/**
+	 * Utility method that attempts to get an attachment's ID by it's url
+	 * @since  1.0.0
+	 * @param  string  $img_url Attachment url
+	 * @return mixed            Attachment ID or false
+	 */
+	public function _image_id_from_url( $img_url ) {
+		global $wpdb;
+
+		$img_url = esc_url_raw( $img_url );
+		// Get just the file name
+		if ( false !== strpos( $img_url, '/' ) ) {
+			$explode = explode( '/', $img_url );
+			$img_url = end( $explode );
+		}
+
+		// And search for a fuzzy match of the file name
+		$attachment = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE guid LIKE '%%%s%%' LIMIT 1;", $img_url ) );
+
+		// If we found an attachement ID, return it
+		if ( !empty( $attachment ) && is_array( $attachment ) )
+			return $attachment[0];
+
+		// No luck
+		return false;
+	}
+
 }

From d14380411e442d36540a23f5cd0ecd9babe2c3a0 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Fri, 14 Mar 2014 13:40:27 -0400
Subject: [PATCH 41/71] Class now takes a group field as an object vs args
 array

---
 helpers/cmb_Meta_Box_field.php | 43 +++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/helpers/cmb_Meta_Box_field.php b/helpers/cmb_Meta_Box_field.php
index d51cc80..349f0f0 100644
--- a/helpers/cmb_Meta_Box_field.php
+++ b/helpers/cmb_Meta_Box_field.php
@@ -28,7 +28,7 @@ class cmb_Meta_Box_field {
 	public $args;
 
 	/**
-	 * Field group arguments
+	 * Field group object
 	 * @var   mixed
 	 * @since 1.0.3
 	 */
@@ -44,13 +44,13 @@ class cmb_Meta_Box_field {
 	/**
 	 * Constructs our field object
 	 * @since 1.0.3
-	 * @param array $field_args       Field arguments
-	 * @param array $group_field_args (optional) Group field arguments
+	 * @param array $field_args  Field arguments
+	 * @param array $group_field (optional) Group field object
 	 */
-	public function __construct( $field_args, $group_field_args = array() ) {
+	public function __construct( $field_args, $group_field = null ) {
 		$this->object_id   = cmb_Meta_Box::get_object_id();
 		$this->object_type = cmb_Meta_Box::get_object_type();
-		$this->group       = ! empty( $group_field_args ) ? $group_field_args : false;
+		$this->group       = ! empty( $group_field ) ? $group_field : false;
 		$this->args        = $this->_set_field_defaults( $field_args );
 
 		// Allow an override for the field's value
@@ -136,7 +136,7 @@ public function get_data( $field_id = '', $args = array() ) {
 		if ( $field_id ) {
 			$args['field_id'] = $field_id;
 		} else if ( $this->group ) {
-			$args['field_id'] = $this->group['id'];
+			$args['field_id'] = $this->group->id();
 		}
 		extract( $this->data_args( $args ) );
 
@@ -145,8 +145,8 @@ public function get_data( $field_id = '', $args = array() ) {
 			: get_metadata( $type, $id, $field_id, ( $single || $repeat ) /* If multicheck this can be multiple values */ );
 
 		if ( $this->group ) {
-			$data = isset( $data[ $this->group['count'] ][ $this->args( '_id' ) ] )
-				? $data[ $this->group['count'] ][ $this->args( '_id' ) ]
+			$data = isset( $data[ $this->group->args( 'count' ) ][ $this->args( '_id' ) ] )
+				? $data[ $this->group->args( 'count' ) ][ $this->args( '_id' ) ]
 				: false;
 		}
 		return $data;
@@ -361,25 +361,24 @@ public function field_timezone() {
 	/**
 	 * Render a field row
 	 * @since 1.0.0
-	 * @param boolean $show_names Whether field names should be visible
 	 */
-	public function render_field( $show_names = true ) {
+	public function render_field() {
 
 		if ( ! $this->args( 'on_front' ) )
 			continue;
-		$classes = 'cmb-type-'. sanitize_html_class( $this->type() );
-		$classes .= ' cmb_id_'. sanitize_html_class( $this->id() );
-		$classes .= $this->args( 'repeatable' ) ? ' cmb-repeat' : '';
-		// 'inline' flag, or _inline in the field type, set to true
-		$classes .= $this->args( 'inline' ) ? ' cmb-inline' : '';
 
+		$classes    = 'cmb-type-'. sanitize_html_class( $this->type() );
+		$classes   .= ' cmb_id_'. sanitize_html_class( $this->id() );
+		$classes   .= $this->args( 'repeatable' ) ? ' cmb-repeat' : '';
+		// 'inline' flag, or _inline in the field type, set to true
+		$classes   .= $this->args( 'inline' ) ? ' cmb-inline' : '';
 
 		printf( "<tr class=\"%s\">\n", $classes );
 
-		if ( 'title' == $this->type() || ! $show_names ) {
+		if ( 'title' == $this->type() || ! $this->args( 'show_names' ) ) {
 			echo "\t<td colspan=\"2\">\n";
-			if ( ! $show_names ) {
-				printf( '<label style="display:none;" for="%s">%s</label>', $this->id(), $this->args( 'name' ) );
+			if ( ! $this->args( 'show_names' ) ) {
+				printf( "\n<label style=\"display:none;\" for=\"%s\">%s</label>\n", $this->id(), $this->args( 'name' ) );
 			}
 		} else {
 
@@ -432,7 +431,7 @@ public function _set_field_defaults( $args ) {
 		// 'cmb_std_filter' deprectated, use 'cmb_default_filter' instead
 		$args['default']    = apply_filters( 'cmb_std_filter', $args['default'], $args, $this->object_type, $this->object_type );
 		$args['allow']      = 'file' == $args['type'] && ! isset( $args['allow'] ) ? array( 'url', 'attachment' ) : array();
-		$args['save_id']    = 'file' == $args['type'] && ! isset( $args['save_id'] );
+		$args['save_id']    = 'file' == $args['type'] && ! ( isset( $args['save_id'] ) && ! $args['save_id'] );
 		$args['multiple']   = isset( $args['multiple'] ) ? $args['multiple'] : ( 'multicheck' == $args['type'] ? true : false );
 		$args['repeatable'] = isset( $args['repeatable'] ) && $args['repeatable'] && ! $this->repeatable_exception( $args['type'] );
 		$args['inline']     = isset( $args['inline'] ) && $args['inline'] || false !== stripos( $args['type'], '_inline' );
@@ -449,8 +448,8 @@ public function _set_field_defaults( $args ) {
 		$args['_name']      = $args['id'];
 
 		if ( $this->group ) {
-			$args['id'] = $this->group['id'] .'_'. $this->group['count'] .'_'. $args['id'];
-			$args['_name'] = $this->group['id'] .'['. $this->group['count'] .']['. $args['_name'] .']';
+			$args['id'] = $this->group->args( 'id' ) .'_'. $this->group->args( 'count' ) .'_'. $args['id'];
+			$args['_name'] = $this->group->args( 'id' ) .'['. $this->group->args( 'count' ) .']['. $args['_name'] .']';
 		}
 
 		if ( 'wysiwyg' == $args['type'] ) {
@@ -467,7 +466,7 @@ public function _set_field_defaults( $args ) {
 	 * @param array $attrs Array of attributes to update
 	 */
 	public function maybe_set_attributes( $attrs = array() ) {
-		return wp_parse_args( $attrs, $this->args['attributes'] );
+		return wp_parse_args( $this->args['attributes'], $attrs );
 	}
 
 }

From 659f7ca0ce7fd97d5e76c1dc2005ab7c35fa5b01 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Fri, 14 Mar 2014 13:41:30 -0400
Subject: [PATCH 42/71] Fix saving of 'file' type attachment ids

---
 helpers/cmb_Meta_Box_types.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/helpers/cmb_Meta_Box_types.php b/helpers/cmb_Meta_Box_types.php
index e2ac74c..d37882c 100644
--- a/helpers/cmb_Meta_Box_types.php
+++ b/helpers/cmb_Meta_Box_types.php
@@ -723,27 +723,27 @@ public function file() {
 		) ),
 		'<input class="cmb_upload_button button" type="button" value="'. __( 'Add or Upload File', 'cmb' ) .'" />';
 
-		$_id_id = $_id_name = $this->field->id();
-		$_id_name .= '_id';
-		if ( $this->field->args( 'repeatable' ) ) {
-			$_id_id .= '_' . $this->iterator;
-			$_id_name .= '['. $this->iterator .']';
-		}
-		$_id_id .= '_id';
+		// Reset field args for attachment ID
+		$args = $this->field->args();
+		$args['id'] = $args['_id'] . '_id';
+		unset( $args['_id'], $args['_name'] );
 
-		$_id_meta = $this->field->get_data( $_id_id );
+		// And get new field object
+		$this->field = new cmb_Meta_Box_field( $args, $this->field->group );
+
+		// Get ID value
+		$_id_value = $this->field->escaped_value( 'absint' );
 
 		// If there is no ID saved yet, try to get it from the url
-		if ( $meta_value && ! $_id_meta ) {
-			$_id_meta = cmb_Meta_Box::image_id_from_url( esc_url_raw( $meta_value ) );
+		if ( $meta_value && ! $_id_value ) {
+			$_id_value = cmb_Meta_Box::image_id_from_url( esc_url_raw( $meta_value ) );
 		}
 
 		echo $this->input( array(
 			'type'  => 'hidden',
 			'class' => 'cmb_upload_file_id',
-			'name'  => $_id_name,
-			'id'    => $_id_id,
-			'value' => $_id_meta,
+			'value' => $_id_value,
+			'desc'  => '',
 		) ),
 		'<div id="', $this->_id( '_status' ) ,'" class="cmb_media_status">';
 			if ( ! empty( $meta_value ) ) {

From ddcc18b9b10d11e78650859e3a3dc677cb740653 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Fri, 14 Mar 2014 13:43:07 -0400
Subject: [PATCH 43/71] show_names is now a field param, and Fix saving of
 'file' type attachment ids

---
 init.php | 105 ++++++++++++++++++++++++++-----------------------------
 1 file changed, 49 insertions(+), 56 deletions(-)

diff --git a/init.php b/init.php
index 29e21e4..24f4e8d 100644
--- a/init.php
+++ b/init.php
@@ -137,7 +137,6 @@ class cmb_Meta_Box {
 	 */
 	protected static $updated = array();
 
-
 	/**
 	 * Get started
 	 */
@@ -382,11 +381,17 @@ public static function show_form( $meta_box, $object_id = 0, $object_type = '' )
 		foreach ( $meta_box['fields'] as $field_args ) {
 
 			if ( 'group' == $field_args['type'] ) {
-				self::render_group( $meta_box, $field_args );
+
+				if ( ! isset( $field_args['show_names'] ) ) {
+					$field_args['show_names'] = $meta_box['show_names'];
+				}
+				self::render_group( $field_args );
 			} else {
+
+				$field_args['show_names'] = $meta_box['show_names'];
 				// Render default fields
 				$field = new cmb_Meta_Box_field( $field_args );
-				$field->render_field( $meta_box['show_names'] );
+				$field->render_field();
 			}
 		}
 		echo '</table>';
@@ -398,7 +403,7 @@ public static function show_form( $meta_box, $object_id = 0, $object_type = '' )
 	/**
 	 * Render a repeatable group
 	 */
-	public static function render_group( $meta_box, $args ) {
+	public static function render_group( $args ) {
 		if ( ! isset( $args['id'], $args['fields'] ) || ! is_array( $args['fields'] ) )
 			return;
 
@@ -423,10 +428,10 @@ public static function render_group( $meta_box, $args ) {
 		if ( ! empty( $group_val ) ) {
 
 			foreach ( $group_val as $iterator => $field_id ) {
-				self::render_group_row( $field_group, $remove_disabled, $meta_box['show_names'] );
+				self::render_group_row( $field_group, $remove_disabled );
 			}
 		} else {
-			self::render_group_row( $field_group, $remove_disabled, $meta_box['show_names'] );
+			self::render_group_row( $field_group, $remove_disabled );
 		}
 
 		echo '<tr><td><p class="add-row"><button data-selector="', $field_group->id() ,'_repeat" class="add-group-row button">'. $field_group->options( 'add_button' ) .'</button></p></td></tr>';
@@ -435,7 +440,7 @@ public static function render_group( $meta_box, $args ) {
 
 	}
 
-	public static function render_group_row( $field_group, $remove_disabled, $show_names ) {
+	public static function render_group_row( $field_group, $remove_disabled ) {
 
 		echo '
 		<tr class="repeatable-grouping" data-iterator="'. $field_group->count() .'">
@@ -443,8 +448,9 @@ public static function render_group_row( $field_group, $remove_disabled, $show_n
 				<table class="cmb-nested-table" style="width: 100%;">';
 				// Render repeatable group fields
 				foreach ( array_values( $field_group->args( 'fields' ) ) as $field_args ) {
-					$field = new cmb_Meta_Box_field( $field_args, $field_group->args() );
-					$field->render_field( $show_names );
+					$field_args['show_names'] = $field_group->args( 'show_names' );
+					$field = new cmb_Meta_Box_field( $field_args, $field_group );
+					$field->render_field();
 				}
 				echo '
 					<tr>
@@ -551,43 +557,56 @@ public static function save_group( $args ) {
 		if ( ! isset( $args['id'], $args['fields'], $_POST[ $args['id'] ] ) || ! is_array( $args['fields'] ) )
 			return;
 
-		$field_group = new cmb_Meta_Box_field( $args );
-		$main_id     = $field_group->id();
-		$old         = $field_group->get_data();
-		$group_vals  = $_POST[ $main_id ];
-		$saved       = array();
-		// $group_vals[0]['color'] = '333';
+		$field_group        = new cmb_Meta_Box_field( $args );
+		$base_id            = $field_group->id();
+		$old                = $field_group->get_data();
+		$group_vals         = $_POST[ $base_id ];
+		$saved              = array();
+		$is_updated         = false;
+		$field_group->index = 0;
 
+		// $group_vals[0]['color'] = '333';
 		foreach ( array_values( $field_group->fields() ) as $field_args ) {
-			$field = new cmb_Meta_Box_field( $field_args );
+			$field = new cmb_Meta_Box_field( $field_args, $field_group );
 			$sub_id = $field->id( true );
 
-			foreach ( (array) $group_vals as $key => $post_vals ) {
+			foreach ( (array) $group_vals as $field_group->index => $post_vals ) {
+
 				// Get value
-				$new_val = isset( $post_vals[ $sub_id ] )
-					? $post_vals[ $sub_id ]
+				$new_val = isset( $group_vals[ $field_group->index ][ $sub_id ] )
+					? $group_vals[ $field_group->index ][ $sub_id ]
 					: false;
+
 				// Sanitize
-				$new_val = self::sanitize_field( $field, $new_val );
+				$new_val = self::sanitize_field( $field, $new_val, $field_group->index );
+
+				if ( 'file' == $field->type() && is_array( $new_val ) ) {
+					// Add image ID to the array stack
+					$saved[ $field_group->index ][ $new_val['field_id'] ] = $new_val['attach_id'];
+					// Reset var to url string
+					$new_val = $new_val['url'];
+				}
+
 				// Get old value
-				$old_val = isset( $old[ $key ][ $sub_id ] )
-					? $old[ $key ][ $sub_id ]
+				$old_val = isset( $old[ $field_group->index ][ $sub_id ] )
+					? $old[ $field_group->index ][ $sub_id ]
 					: false;
 
+				$is_updated = ( ! empty( $new_val ) && $new_val != $old_val );
+				$is_removed = ( empty( $new_val ) && ! empty( $old_val ) );
 				// Compare values and add to `$updated` array
-				if (
-					( ! empty( $new_val ) && $new_val != $old_val )
-					|| ( empty( $new_val ) && ! empty( $old_val ) )
-				)
-					self::$updated[] = $main_id .'::'. $key .'::'. $sub_id;
+				if ( $is_updated || $is_removed )
+					self::$updated[] = $base_id .'::'. $field_group->index .'::'. $sub_id;
 
 				// Add to `$saved` array
-				$saved[ $key ][ $sub_id ] = $new_val;
+				$saved[ $field_group->index ][ $sub_id ] = $new_val;
+
 			}
-			$saved[ $key ] = array_filter( $saved[ $key ] );
+			$saved[ $field_group->index ] = array_filter( $saved[ $field_group->index ] );
 		}
 		$saved = array_filter( $saved );
 
+		// wp_die( '<xmp>'. print_r( $saved, true ) .'</xmp>' );
 		$field_group->update_data( $saved, true );
 	}
 
@@ -595,7 +614,7 @@ public static function sanitize_field( $field, $new_value = null ) {
 
 		$new_value = null !== $new_value
 			? $new_value
-			: ( isset( $_POST[ $field->id( true ) ] ) ? $_POST[ $field->id() ] : null );
+			: ( isset( $_POST[ $field->id( true ) ] ) ? $_POST[ $field->id( true ) ] : null );
 
 		if ( $field->args( 'repeatable' ) && is_array( $new_value ) ) {
 			// Remove empties
@@ -828,32 +847,6 @@ public static function nonce() {
 		return basename( __FILE__ );
 	}
 
-	/**
-	 * Utility method that attempts to get an attachment's ID by it's url
-	 * @since  1.0.0
-	 * @param  string  $img_url Attachment url
-	 * @return mixed            Attachment ID or false
-	 */
-	public static function image_id_from_url( $img_url ) {
-		global $wpdb;
-
-		// Get just the file name
-		if ( false !== strpos( $img_url, '/' ) ) {
-			$explode = explode( '/', $img_url );
-			$img_url = end( $explode );
-		}
-
-		// And search for a fuzzy match of the file name
-		$attachment = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE guid LIKE '%%%s%%' LIMIT 1;", $img_url ) );
-
-		// If we found an attachement ID, return it
-		if ( !empty( $attachment ) && is_array( $attachment ) )
-			return $attachment[0];
-
-		// No luck
-		return false;
-	}
-
 	/**
 	 * Defines the url which is used to load local resources.
 	 * This may need to be filtered for local Window installations.

From dd6d76b6da54262824084f65eca3ecadeb52b722 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Fri, 14 Mar 2014 13:43:24 -0400
Subject: [PATCH 44/71] show_names is now a field param, and Fix saving of
 'file' type attachment ids

---
 init.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/init.php b/init.php
index 24f4e8d..63f1c01 100644
--- a/init.php
+++ b/init.php
@@ -606,7 +606,6 @@ public static function save_group( $args ) {
 		}
 		$saved = array_filter( $saved );
 
-		// wp_die( '<xmp>'. print_r( $saved, true ) .'</xmp>' );
 		$field_group->update_data( $saved, true );
 	}
 

From 239e9c1ad92fa95ed1bc6ef07979cc7c9f04c0f0 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Fri, 14 Mar 2014 13:43:50 -0400
Subject: [PATCH 45/71] Fix styling of first row item (no top border)

---
 style.css     | 2 ++
 style.min.css | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/style.css b/style.css
index 8f3f096..f69322e 100644
--- a/style.css
+++ b/style.css
@@ -7,6 +7,8 @@ table.cmb_metabox {
 
 table.cmb_metabox > tr:first-of-type > td,
 table.cmb_metabox > tr:first-of-type > th,
+table.cmb_metabox tbody > tr:first-of-type > td,
+table.cmb_metabox tbody > tr:first-of-type > th,
 .post-php table.cmb_metabox .cmb-nested-table td,
 .post-new-php table.cmb_metabox .cmb-nested-table td,
 .post-php table.cmb_metabox .repeatable-group th,
diff --git a/style.min.css b/style.min.css
index e9cb838..e047903 100644
--- a/style.min.css
+++ b/style.min.css
@@ -1,4 +1,4 @@
-table.cmb_metabox{clear:both}table.cmb_metabox>tr:first-of-type>td,table.cmb_metabox>tr:first-of-type>th,.post-php table.cmb_metabox .cmb-nested-table td,.post-new-php table.cmb_metabox .cmb-nested-table td,.post-php table.cmb_metabox .repeatable-group th,.post-new-php table.cmb_metabox .repeatable-group th,.post-php table.cmb_metabox .repeatable-group:first-of-type,.post-new-php table.cmb_metabox .repeatable-group:first-of-type{border:0}
+table.cmb_metabox{clear:both}table.cmb_metabox>tr:first-of-type>td,table.cmb_metabox>tr:first-of-type>th,table.cmb_metabox tbody>tr:first-of-type>td,table.cmb_metabox tbody>tr:first-of-type>th,.post-php table.cmb_metabox .cmb-nested-table td,.post-new-php table.cmb_metabox .cmb-nested-table td,.post-php table.cmb_metabox .repeatable-group th,.post-new-php table.cmb_metabox .repeatable-group th,.post-php table.cmb_metabox .repeatable-group:first-of-type,.post-new-php table.cmb_metabox .repeatable-group:first-of-type{border:0}
 .post-php table.cmb_metabox td,.post-new-php table.cmb_metabox td,.post-php table.cmb_metabox th,.post-new-php table.cmb_metabox th,.post-php table.cmb_metabox .repeatable-group,.post-new-php table.cmb_metabox .repeatable-group,.post-php table.cmb_metabox .repeatable-group,.post-new-php table.cmb_metabox .repeatable-group{border-top:1px solid #e9e9e9}
 .repeatable-group th{padding:5px}.repeatable-group .cmb_upload_button{float:right}#poststuff .repeatable-group h2{margin:0}.post-php table.cmb_metabox th,.post-new-php table.cmb_metabox th{text-align:right;font-weight:bold}
 .post-php table.cmb_metabox table th,.post-new-php table.cmb_metabox table th{text-align:left}table.cmb_metabox th label{margin-top:5px;display:block}

From 50498379f0deb0d6f7fd332fbc6610ac57d4e3ad Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Fri, 14 Mar 2014 14:24:56 -0400
Subject: [PATCH 46/71] Fixes wysiwyg saving issue (using crazy id)

---
 helpers/cmb_Meta_Box_field.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/helpers/cmb_Meta_Box_field.php b/helpers/cmb_Meta_Box_field.php
index 349f0f0..94152c4 100644
--- a/helpers/cmb_Meta_Box_field.php
+++ b/helpers/cmb_Meta_Box_field.php
@@ -192,13 +192,14 @@ public function remove_data( $old = '' ) {
 	 * @return array       Updated arguments
 	 */
 	public function data_args( $args = array() ) {
-		return wp_parse_args( $args, array(
+		$args = wp_parse_args( $args, array(
 			'type'     => $this->object_type,
 			'id'       => $this->object_id,
-			'field_id' => $this->id(),
+			'field_id' => $this->id( true ),
 			'repeat'   => $this->args( 'repeatable' ),
 			'single'   => ! $this->args( 'multiple' ),
 		) );
+		return $args;
 	}
 
 	/**

From deb2c4d2fdafcf378799b97f315718bfaf56a092 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Fri, 14 Mar 2014 15:14:08 -0400
Subject: [PATCH 47/71] Better handling of labels in sidebar. Closes #477

---
 helpers/cmb_Meta_Box_field.php | 13 +++++++++----
 init.php                       |  3 +++
 style.css                      | 22 ++++++++++++++++++++--
 style.min.css                  |  1 +
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/helpers/cmb_Meta_Box_field.php b/helpers/cmb_Meta_Box_field.php
index 94152c4..d295059 100644
--- a/helpers/cmb_Meta_Box_field.php
+++ b/helpers/cmb_Meta_Box_field.php
@@ -373,18 +373,23 @@ public function render_field() {
 		$classes   .= $this->args( 'repeatable' ) ? ' cmb-repeat' : '';
 		// 'inline' flag, or _inline in the field type, set to true
 		$classes   .= $this->args( 'inline' ) ? ' cmb-inline' : '';
+		$is_side    = 'side' === $this->args( 'context' );
 
 		printf( "<tr class=\"%s\">\n", $classes );
 
-		if ( 'title' == $this->type() || ! $this->args( 'show_names' ) ) {
+		if ( 'title' == $this->type() || ! $this->args( 'show_names' ) || $is_side ) {
 			echo "\t<td colspan=\"2\">\n";
-			if ( ! $this->args( 'show_names' ) ) {
-				printf( "\n<label style=\"display:none;\" for=\"%s\">%s</label>\n", $this->id(), $this->args( 'name' ) );
+
+			if ( ! $this->args( 'show_names' ) || $is_side ) {
+				$style = ! $is_side ? ' style="display:none;"' : '';
+				printf( "\n<label%s for=\"%s\">%s</label>\n", $style, $this->id(), $this->args( 'name' ) );
 			}
 		} else {
 
 			$style = 'post' == $this->object_type ? ' style="width:18%"' : '';
-			printf( '<th%s><label for="%s">%s</label></th>', $style, $this->id(), $this->args( 'name' ) );
+			// $tag   = 'side' !== $this->args( 'context' ) ? 'th' : 'p';
+			$tag   = 'th';
+			printf( '<%1$s%2$s><label for="%3$s">%4$s</label></%1$s>', $tag, $style, $this->id(), $this->args( 'name' ) );
 
 			echo "\n\t<td>\n";
 		}
diff --git a/init.php b/init.php
index 63f1c01..da4716f 100644
--- a/init.php
+++ b/init.php
@@ -380,6 +380,8 @@ public static function show_form( $meta_box, $object_id = 0, $object_type = '' )
 
 		foreach ( $meta_box['fields'] as $field_args ) {
 
+			$field_args['context'] = $meta_box['context'];
+
 			if ( 'group' == $field_args['type'] ) {
 
 				if ( ! isset( $field_args['show_names'] ) ) {
@@ -449,6 +451,7 @@ public static function render_group_row( $field_group, $remove_disabled ) {
 				// Render repeatable group fields
 				foreach ( array_values( $field_group->args( 'fields' ) ) as $field_args ) {
 					$field_args['show_names'] = $field_group->args( 'show_names' );
+					$field_args['context'] = $field_group->args( 'context' );
 					$field = new cmb_Meta_Box_field( $field_args, $field_group );
 					$field->render_field();
 				}
diff --git a/style.css b/style.css
index f69322e..e4a3339 100644
--- a/style.css
+++ b/style.css
@@ -233,14 +233,32 @@ table.cmb_metabox .attach_list li img {
 /**
  * Sidebar placement adjustments
  */
-.inner-sidebar table.cmb_metabox input[type=text], #side-sortables table.cmb_metabox input[type=text], table.cmb_metabox textarea {
+.inner-sidebar table.cmb_metabox input[type=text],
+#side-sortables table.cmb_metabox input[type=text],
+table.cmb_metabox textarea {
 	width: 95%;
 }
 
-.inner-sidebar table.cmb_metabox .cmb_media_status .img_status img, #side-sortables table.cmb_metabox .cmb_media_status .img_status img, .inner-sidebar table.cmb_metabox .cmb_media_status .embed_status img, #side-sortables table.cmb_metabox .cmb_media_status .embed_status img {
+.inner-sidebar table.cmb_metabox .cmb_media_status .img_status img,
+#side-sortables table.cmb_metabox .cmb_media_status .img_status img,
+.inner-sidebar table.cmb_metabox .cmb_media_status .embed_status img,
+#side-sortables table.cmb_metabox .cmb_media_status .embed_status img {
 	width: 90%;
 }
 
+.inner-sidebar table.cmb_metabox label,
+#side-sortables table.cmb_metabox label {
+	display: block;
+	font-weight: bold;
+	padding: 0 0 5px;
+}
+
+.inner-sidebar table.cmb_metabox .cmb_metabox_description,
+#side-sortables table.cmb_metabox .cmb_metabox_description {
+	display: block;
+	padding: 7px 0 0;
+}
+
 .postbox table.cmb_metabox .cmb-spinner {
 	float: left;
 }
diff --git a/style.min.css b/style.min.css
index e047903..a6b6422 100644
--- a/style.min.css
+++ b/style.min.css
@@ -16,6 +16,7 @@ table.cmb_metabox .cmb_media_status .img_status,table.cmb_metabox .cmb_media_sta
 table.cmb_metabox .cmb_media_status .embed_status{float:left;max-width:800px}table.cmb_metabox .cmb_media_status .img_status .cmb_remove_file_button,table.cmb_metabox .cmb_media_status .embed_status .cmb_remove_file_button{text-indent:-9999px;background:url(images/ico-delete.png);width:16px;height:16px;position:absolute;top:-5px;left:-5px}
 table.cmb_metabox .attach_list li{clear:both;display:inline-block;margin-bottom:25px;width:100%}table.cmb_metabox .attach_list li img{float:left;margin-right:10px}
 .inner-sidebar table.cmb_metabox input[type=text],#side-sortables table.cmb_metabox input[type=text],table.cmb_metabox textarea{width:95%}.inner-sidebar table.cmb_metabox .cmb_media_status .img_status img,#side-sortables table.cmb_metabox .cmb_media_status .img_status img,.inner-sidebar table.cmb_metabox .cmb_media_status .embed_status img,#side-sortables table.cmb_metabox .cmb_media_status .embed_status img{width:90%}
+.inner-sidebar table.cmb_metabox label,#side-sortables table.cmb_metabox label{display:block;font-weight:bold;padding:0 0 5px}.inner-sidebar table.cmb_metabox .cmb_metabox_description,#side-sortables table.cmb_metabox .cmb_metabox_description{display:block;padding:7px 0 0}
 .postbox table.cmb_metabox .cmb-spinner{float:left}table.cmb_metabox .wp-color-result,table.cmb_metabox .wp-picker-input-wrap{vertical-align:middle}table.cmb_metabox .wp-color-result,table.cmb_metabox .wp-picker-container{margin:0 10px 0 0}
 div.time-picker{position:absolute;height:191px;width:6em;overflow:auto;background:#fff;border:1px solid #aaa;z-index:99;margin:0}div.time-picker-12hours{width:8em}
 div.time-picker ul{list-style-type:none;margin:0;padding:0}div.time-picker li{cursor:pointer;height:10px;font:14px/1 Helvetica,Arial,sans-serif;padding:4px 3px}

From 004983bce49334c36352f5c48d286ec342084f0c Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Mon, 17 Mar 2014 16:48:38 -0400
Subject: [PATCH 48/71] Fix title type display in sidebar

---
 helpers/cmb_Meta_Box_field.php | 2 +-
 style.css                      | 6 ++++++
 style.min.css                  | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/helpers/cmb_Meta_Box_field.php b/helpers/cmb_Meta_Box_field.php
index d295059..988c377 100644
--- a/helpers/cmb_Meta_Box_field.php
+++ b/helpers/cmb_Meta_Box_field.php
@@ -381,7 +381,7 @@ public function render_field() {
 			echo "\t<td colspan=\"2\">\n";
 
 			if ( ! $this->args( 'show_names' ) || $is_side ) {
-				$style = ! $is_side ? ' style="display:none;"' : '';
+				$style = ! $is_side || 'title' == $this->type() ? ' style="display:none;"' : '';
 				printf( "\n<label%s for=\"%s\">%s</label>\n", $style, $this->id(), $this->args( 'name' ) );
 			}
 		} else {
diff --git a/style.css b/style.css
index e4a3339..e2360e8 100644
--- a/style.css
+++ b/style.css
@@ -259,6 +259,12 @@ table.cmb_metabox textarea {
 	padding: 7px 0 0;
 }
 
+.inner-sidebar table.cmb_metabox .cmb_metabox_title,
+#side-sortables table.cmb_metabox .cmb_metabox_title {
+	font-size: 1.2em;
+	font-style: italic;
+}
+
 .postbox table.cmb_metabox .cmb-spinner {
 	float: left;
 }
diff --git a/style.min.css b/style.min.css
index a6b6422..3350681 100644
--- a/style.min.css
+++ b/style.min.css
@@ -17,7 +17,8 @@ table.cmb_metabox .cmb_media_status .embed_status{float:left;max-width:800px}tab
 table.cmb_metabox .attach_list li{clear:both;display:inline-block;margin-bottom:25px;width:100%}table.cmb_metabox .attach_list li img{float:left;margin-right:10px}
 .inner-sidebar table.cmb_metabox input[type=text],#side-sortables table.cmb_metabox input[type=text],table.cmb_metabox textarea{width:95%}.inner-sidebar table.cmb_metabox .cmb_media_status .img_status img,#side-sortables table.cmb_metabox .cmb_media_status .img_status img,.inner-sidebar table.cmb_metabox .cmb_media_status .embed_status img,#side-sortables table.cmb_metabox .cmb_media_status .embed_status img{width:90%}
 .inner-sidebar table.cmb_metabox label,#side-sortables table.cmb_metabox label{display:block;font-weight:bold;padding:0 0 5px}.inner-sidebar table.cmb_metabox .cmb_metabox_description,#side-sortables table.cmb_metabox .cmb_metabox_description{display:block;padding:7px 0 0}
-.postbox table.cmb_metabox .cmb-spinner{float:left}table.cmb_metabox .wp-color-result,table.cmb_metabox .wp-picker-input-wrap{vertical-align:middle}table.cmb_metabox .wp-color-result,table.cmb_metabox .wp-picker-container{margin:0 10px 0 0}
+.inner-sidebar table.cmb_metabox .cmb_metabox_title,#side-sortables table.cmb_metabox .cmb_metabox_title{font-size:1.2em;font-style:italic}.postbox table.cmb_metabox .cmb-spinner{float:left}
+table.cmb_metabox .wp-color-result,table.cmb_metabox .wp-picker-input-wrap{vertical-align:middle}table.cmb_metabox .wp-color-result,table.cmb_metabox .wp-picker-container{margin:0 10px 0 0}
 div.time-picker{position:absolute;height:191px;width:6em;overflow:auto;background:#fff;border:1px solid #aaa;z-index:99;margin:0}div.time-picker-12hours{width:8em}
 div.time-picker ul{list-style-type:none;margin:0;padding:0}div.time-picker li{cursor:pointer;height:10px;font:14px/1 Helvetica,Arial,sans-serif;padding:4px 3px}
 div.time-picker li.selected{background:#0063ce;color:#fff}.cmb_element .ui-helper-hidden{display:none}.cmb_element .ui-helper-hidden-accessible{position:absolute!important;clip:rect(1px 1px 1px 1px);clip:rect(1px,1px,1px,1px)}

From 16620ce3b5dac8a95c6c65cf3d47bdca73d0d5d7 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Thu, 20 Mar 2014 11:43:47 -0400
Subject: [PATCH 49/71] Update readme to include 3rd party resources

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

diff --git a/readme.md b/readme.md
index a81024d..dc67774 100644
--- a/readme.md
+++ b/readme.md
@@ -25,6 +25,10 @@ New in version 1.0.0:
 * [Github project page](https://github.com/webdevstudios/Custom-Metaboxes-and-Fields-for-WordPress)
 * [Documentation (GitHub wiki)](https://github.com/webdevstudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki)
 
+#### 3rd Party Resources
+* [CMB Attached Posts Field](https://github.com/coreymcollins/cmb-attached-posts): Custom field type for attaching posts to a page.
+
+
 ##### Field Types:
 * text (optionally repeatable)
 * text small (optionally repeatable)

From a602aa2c32b251ae3aba598faef81decaedffa2e Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Thu, 20 Mar 2014 12:02:27 -0400
Subject: [PATCH 50/71] Add resources from
 [mustardBees](https://github.com/mustardBees)

---
 readme.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index dc67774..db4cf4b 100644
--- a/readme.md
+++ b/readme.md
@@ -26,7 +26,13 @@ New in version 1.0.0:
 * [Documentation (GitHub wiki)](https://github.com/webdevstudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki)
 
 #### 3rd Party Resources
-* [CMB Attached Posts Field](https://github.com/coreymcollins/cmb-attached-posts): Custom field type for attaching posts to a page.
+* [CMB Attached Posts Field](https://github.com/coreymcollins/cmb-attached-posts) from [coreymcollins](https://github.com/coreymcollins): Custom field type for attaching posts to a page.
+* [CMB Field Type: Google Maps](https://github.com/mustardBees/cmb_field_map) from [mustardBees](https://github.com/mustardBees): Custom field type for Google Maps.
+	> The `pw_map` field stores the latitude/longitude values which you can then use to display a map in your theme.
+* [CMB Field Type: Select2](https://github.com/mustardBees/cmb-field-select2) from [mustardBees](https://github.com/mustardBees): Custom field types which use the [Select2](http://ivaynberg.github.io/select2/) script:
+
+	> 1. The `pw_select field` acts much like the default select field. However, it adds typeahead-style search allowing you to quickly make a selection from a large list
+	> 2. The `pw_multiselect` field allows you to select multiple values with typeahead-style search. The values can be dragged and dropped to reorder
 
 
 ##### Field Types:

From 208f14baaefe6b638b354adf86bd8658de4388a4 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Mon, 24 Mar 2014 13:18:36 -0400
Subject: [PATCH 51/71] Fix sidebar styling of list labels

---
 helpers/cmb_Meta_Box_types.php | 8 ++++----
 style.css                      | 6 ++++++
 style.min.css                  | 6 +++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/helpers/cmb_Meta_Box_types.php b/helpers/cmb_Meta_Box_types.php
index d37882c..51cc6fa 100644
--- a/helpers/cmb_Meta_Box_types.php
+++ b/helpers/cmb_Meta_Box_types.php
@@ -558,7 +558,7 @@ public function taxonomy_select() {
 
 	public function radio( $args = array(), $type = 'radio' ) {
 		extract( $this->parse_args( $args, $type, array(
-			'class'   => 'cmb_radio_list',
+			'class'   => 'cmb_radio_list cmb_list',
 			'options' => $this->concat_options( array( 'label' => 'test' ) ),
 			'desc'    => $this->_desc( true ),
 		) ) );
@@ -571,7 +571,7 @@ public function radio_inline() {
 	}
 
 	public function multicheck( $type = 'checkbox' ) {
-		return $this->radio( array( 'class' => 'cmb_checkbox_list', 'options' => $this->concat_options( array( 'type' => 'checkbox', 'name' => $this->_name() .'[]' ), 'list_input_checkbox' ) ), $type );
+		return $this->radio( array( 'class' => 'cmb_checkbox_list cmb_list', 'options' => $this->concat_options( array( 'type' => 'checkbox', 'name' => $this->_name() .'[]' ), 'list_input_checkbox' ) ), $type );
 	}
 
 	public function multicheck_inline() {
@@ -580,7 +580,7 @@ public function multicheck_inline() {
 
 	public function checkbox() {
 		$meta_value = $this->field->escaped_value();
-		$args = array( 'type' => 'checkbox', 'class' => 'cmb_option', 'value' => 'on', 'desc' => '' );
+		$args = array( 'type' => 'checkbox', 'class' => 'cmb_option cmb_list', 'value' => 'on', 'desc' => '' );
 		if ( ! empty( $meta_value ) ) {
 			$args['checked'] = 'checked';
 		}
@@ -647,7 +647,7 @@ public function taxonomy_multicheck() {
 			}
 		}
 
-		return $this->radio( array( 'class' => 'cmb_checkbox_list', 'options' => $options ), 'taxonomy_multicheck' );
+		return $this->radio( array( 'class' => 'cmb_checkbox_list cmb_list', 'options' => $options ), 'taxonomy_multicheck' );
 	}
 
 	public function taxonomy_multicheck_inline() {
diff --git a/style.css b/style.css
index e2360e8..7e144e5 100644
--- a/style.css
+++ b/style.css
@@ -253,6 +253,12 @@ table.cmb_metabox textarea {
 	padding: 0 0 5px;
 }
 
+.inner-sidebar table.cmb_metabox .cmb_list label,
+#side-sortables table.cmb_metabox .cmb_list label {
+	display: inline;
+	font-weight: normal;
+}
+
 .inner-sidebar table.cmb_metabox .cmb_metabox_description,
 #side-sortables table.cmb_metabox .cmb_metabox_description {
 	display: block;
diff --git a/style.min.css b/style.min.css
index 3350681..4ad20ad 100644
--- a/style.min.css
+++ b/style.min.css
@@ -16,9 +16,9 @@ table.cmb_metabox .cmb_media_status .img_status,table.cmb_metabox .cmb_media_sta
 table.cmb_metabox .cmb_media_status .embed_status{float:left;max-width:800px}table.cmb_metabox .cmb_media_status .img_status .cmb_remove_file_button,table.cmb_metabox .cmb_media_status .embed_status .cmb_remove_file_button{text-indent:-9999px;background:url(images/ico-delete.png);width:16px;height:16px;position:absolute;top:-5px;left:-5px}
 table.cmb_metabox .attach_list li{clear:both;display:inline-block;margin-bottom:25px;width:100%}table.cmb_metabox .attach_list li img{float:left;margin-right:10px}
 .inner-sidebar table.cmb_metabox input[type=text],#side-sortables table.cmb_metabox input[type=text],table.cmb_metabox textarea{width:95%}.inner-sidebar table.cmb_metabox .cmb_media_status .img_status img,#side-sortables table.cmb_metabox .cmb_media_status .img_status img,.inner-sidebar table.cmb_metabox .cmb_media_status .embed_status img,#side-sortables table.cmb_metabox .cmb_media_status .embed_status img{width:90%}
-.inner-sidebar table.cmb_metabox label,#side-sortables table.cmb_metabox label{display:block;font-weight:bold;padding:0 0 5px}.inner-sidebar table.cmb_metabox .cmb_metabox_description,#side-sortables table.cmb_metabox .cmb_metabox_description{display:block;padding:7px 0 0}
-.inner-sidebar table.cmb_metabox .cmb_metabox_title,#side-sortables table.cmb_metabox .cmb_metabox_title{font-size:1.2em;font-style:italic}.postbox table.cmb_metabox .cmb-spinner{float:left}
-table.cmb_metabox .wp-color-result,table.cmb_metabox .wp-picker-input-wrap{vertical-align:middle}table.cmb_metabox .wp-color-result,table.cmb_metabox .wp-picker-container{margin:0 10px 0 0}
+.inner-sidebar table.cmb_metabox label,#side-sortables table.cmb_metabox label{display:block;font-weight:bold;padding:0 0 5px}.inner-sidebar table.cmb_metabox .cmb_list label,#side-sortables table.cmb_metabox .cmb_list label{display:inline;font-weight:normal}
+.inner-sidebar table.cmb_metabox .cmb_metabox_description,#side-sortables table.cmb_metabox .cmb_metabox_description{display:block;padding:7px 0 0}.inner-sidebar table.cmb_metabox .cmb_metabox_title,#side-sortables table.cmb_metabox .cmb_metabox_title{font-size:1.2em;font-style:italic}
+.postbox table.cmb_metabox .cmb-spinner{float:left}table.cmb_metabox .wp-color-result,table.cmb_metabox .wp-picker-input-wrap{vertical-align:middle}table.cmb_metabox .wp-color-result,table.cmb_metabox .wp-picker-container{margin:0 10px 0 0}
 div.time-picker{position:absolute;height:191px;width:6em;overflow:auto;background:#fff;border:1px solid #aaa;z-index:99;margin:0}div.time-picker-12hours{width:8em}
 div.time-picker ul{list-style-type:none;margin:0;padding:0}div.time-picker li{cursor:pointer;height:10px;font:14px/1 Helvetica,Arial,sans-serif;padding:4px 3px}
 div.time-picker li.selected{background:#0063ce;color:#fff}.cmb_element .ui-helper-hidden{display:none}.cmb_element .ui-helper-hidden-accessible{position:absolute!important;clip:rect(1px 1px 1px 1px);clip:rect(1px,1px,1px,1px)}

From bac4b0f8a82dd723d680f944470e353f8bc67115 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Mon, 24 Mar 2014 13:19:17 -0400
Subject: [PATCH 52/71] Fix default setting for non-escaped field-types

---
 helpers/cmb_Meta_Box_field.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helpers/cmb_Meta_Box_field.php b/helpers/cmb_Meta_Box_field.php
index 988c377..b449387 100644
--- a/helpers/cmb_Meta_Box_field.php
+++ b/helpers/cmb_Meta_Box_field.php
@@ -303,7 +303,7 @@ public function escaped_value( $func = 'esc_attr', $meta_value = '' ) {
 		$cb = $this->maybe_callback( 'escape_cb' );
 		if ( false === $cb || $this->escaping_exception() ) {
 			// If requesting NO escaping, return meta value
-			return $meta_value;
+			return ! empty( $meta_value ) ? $meta_value : $this->args( 'default' );
 		} elseif ( $cb ) {
 			// Ok, callback is good, let's run it.
 			return call_user_func( $cb, $meta_value, $this->args(), $this );

From 8202eb5ba0a86045d84c8d625882830d54141c16 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Mon, 24 Mar 2014 13:55:05 -0400
Subject: [PATCH 53/71] Fix multicheck not saving properly. Using add_metadata
 is not very helpful in our situation

---
 helpers/cmb_Meta_Box_field.php |  3 ++-
 init.php                       | 23 ++++++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/helpers/cmb_Meta_Box_field.php b/helpers/cmb_Meta_Box_field.php
index b449387..3a7280b 100644
--- a/helpers/cmb_Meta_Box_field.php
+++ b/helpers/cmb_Meta_Box_field.php
@@ -438,7 +438,8 @@ public function _set_field_defaults( $args ) {
 		$args['default']    = apply_filters( 'cmb_std_filter', $args['default'], $args, $this->object_type, $this->object_type );
 		$args['allow']      = 'file' == $args['type'] && ! isset( $args['allow'] ) ? array( 'url', 'attachment' ) : array();
 		$args['save_id']    = 'file' == $args['type'] && ! ( isset( $args['save_id'] ) && ! $args['save_id'] );
-		$args['multiple']   = isset( $args['multiple'] ) ? $args['multiple'] : ( 'multicheck' == $args['type'] ? true : false );
+		// $args['multiple']   = isset( $args['multiple'] ) ? $args['multiple'] : ( 'multicheck' == $args['type'] ? true : false );
+		$args['multiple']   = isset( $args['multiple'] ) ? $args['multiple'] : false;
 		$args['repeatable'] = isset( $args['repeatable'] ) && $args['repeatable'] && ! $this->repeatable_exception( $args['type'] );
 		$args['inline']     = isset( $args['inline'] ) && $args['inline'] || false !== stripos( $args['type'], '_inline' );
 		$args['on_front']   = ! ( isset( $args['on_front'] ) && ! $args['on_front'] );
diff --git a/init.php b/init.php
index da4716f..1467535 100644
--- a/init.php
+++ b/init.php
@@ -631,21 +631,22 @@ public static function save_field( $new_value, $field ) {
 		$name = $field->id();
 		$old  = $field->get_data();
 
-		if ( $field->args( 'multiple' ) && ! $field->args( 'repeatable' ) && ! $field->group ) {
-			$field->remove_data();
-			if ( ! empty( $new_value ) ) {
-				foreach ( $new_value as $add_new ) {
-					self::$updated[] = $name;
-					$field->update_data( $add_new, $name, false );
-				}
-			}
-		} elseif ( ! empty( $new_value ) && $new_value != $old  ) {
+		// if ( $field->args( 'multiple' ) && ! $field->args( 'repeatable' ) && ! $field->group ) {
+		// 	$field->remove_data();
+		// 	if ( ! empty( $new_value ) ) {
+		// 		foreach ( $new_value as $add_new ) {
+		// 			self::$updated[] = $name;
+		// 			$field->update_data( $add_new, $name, false );
+		// 		}
+		// 	}
+		// } else
+		if ( ! empty( $new_value ) && $new_value != $old  ) {
 			self::$updated[] = $name;
-			$field->update_data( $new_value );
+			return $field->update_data( $new_value );
 		} elseif ( empty( $new_value ) ) {
 			if ( ! empty( $old ) )
 				self::$updated[] = $name;
-			$field->remove_data();
+			return $field->remove_data();
 		}
 	}
 

From 8f7da54cac0db0e608aac732364ef0e12d9a1ec8 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Wed, 26 Mar 2014 15:04:04 -0400
Subject: [PATCH 54/71] Resolve issue where we only get the first character of
 the label/value. Props @mustardBees. Closes #486

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

diff --git a/helpers/cmb_Meta_Box_types.php b/helpers/cmb_Meta_Box_types.php
index 51cc6fa..3439c79 100644
--- a/helpers/cmb_Meta_Box_types.php
+++ b/helpers/cmb_Meta_Box_types.php
@@ -172,8 +172,8 @@ public function concat_options( $args = array(), $method = 'list_input' ) {
 		foreach ( $options as $option_key => $option ) {
 
 			// Check for the "old" way
-			$opt_label = isset( $option['name'] ) ? $option['name'] : $option;
-			$opt_value = isset( $option['value'] ) ? $option['value'] : $option_key;
+			$opt_label = is_array( $option ) && array_key_exists( 'name', $option ) ? $option['name'] : $option;
+			$opt_value = is_array( $option ) && array_key_exists( 'value', $option ) ? $option['value'] : $option_key;
 			$selected  = $value == $opt_value;
 
 			if ( ! empty( $args ) ) {

From f6e320f199148b6b1f892c87e25d2686c48f7056 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Fri, 28 Mar 2014 16:45:00 -0400
Subject: [PATCH 55/71] Add triggers when rows have been added/removed

---
 js/cmb.js     |  4 ++++
 js/cmb.min.js | 13 +++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/js/cmb.js b/js/cmb.js
index 6e612e3..c0be6d6 100644
--- a/js/cmb.js
+++ b/js/cmb.js
@@ -363,6 +363,7 @@ window.CMB = (function(window, document, $, undefined){
 			$table.find('.remove-group-row').removeAttr( 'disabled' );
 		}
 
+		$table.trigger( 'cmb_add_row', $newRow );
 	}
 
 	cmb.addAjaxRow = function( event ) {
@@ -385,6 +386,7 @@ window.CMB = (function(window, document, $, undefined){
 		$emptyrow.after( $row );
 
 		cmb.afterRowInsert( $row );
+		$table.trigger( 'cmb_add_row', $row );
 	}
 
 	cmb.removeGroupRow = function( event ) {
@@ -401,6 +403,7 @@ window.CMB = (function(window, document, $, undefined){
 			} else {
 				$table.find('.remove-group-row').prop('disabled', false);
 			}
+			$table.trigger( 'cmb_remove_row' );
 		}
 	}
 
@@ -417,6 +420,7 @@ window.CMB = (function(window, document, $, undefined){
 				$parent.prev().addClass( 'empty-row' ).removeClass('repeat-row');
 			}
 			$self.parents('.cmb-repeat-table tr').remove();
+			$table.trigger( 'cmb_remove_row' );
 		}
 	}
 
diff --git a/js/cmb.min.js b/js/cmb.min.js
index 45803bb..36c10a2 100644
--- a/js/cmb.min.js
+++ b/js/cmb.min.js
@@ -30,12 +30,13 @@ for(var m in g){if("string"===typeof(g[m])){g[m]=g[m].replace(new RegExp(k,"g"),
 var m=d(this);var h=d("#"+m.data("selector"));var j=h.find(".repeatable-grouping").last();var i=parseInt(j.data("iterator"));e.idNumber=i+1;var g=j.clone();
 g.newRowHousekeeping().cleanRow(i,true);var k=d('<tr class="repeatable-grouping" data-iterator="'+e.idNumber+'">'+g.html()+"</tr>");j.after(k);e.afterRowInsert(k);
 if(h.find(".repeatable-grouping").length<=1){h.find(".remove-group-row").prop("disabled",true);}else{h.find(".remove-group-row").removeAttr("disabled");
-}};e.addAjaxRow=function(g){g.preventDefault();var l=d(this);var m="#"+l.data("selector");var o=d(m);var h=o.find(".empty-row");var j=parseInt(h.find("[data-iterator]").data("iterator"));
-e.idNumber=j+1;var k=h.clone();var n=k.find(".wp-picker-container");var i=k.find(".cmb_media_status");k.newRowHousekeeping().cleanRow(j);h.removeClass("empty-row").addClass("repeat-row");
-h.after(k);e.afterRowInsert(k);};e.removeGroupRow=function(i){i.preventDefault();var k=d(this);var h=d("#"+k.data("selector"));var j=k.parents(".repeatable-grouping");
-var g=h.find(".repeatable-grouping").length;if(g>1){j.remove();if(g<3){h.find(".remove-group-row").prop("disabled",true);}else{h.find(".remove-group-row").prop("disabled",false);
-}}};e.removeAjaxRow=function(h){h.preventDefault();var j=d(this);var i=j.parents("tr");var g=j.parents(".cmb-repeat-table");if(g.find("tr").length>1){if(i.hasClass("empty-row")){i.prev().addClass("empty-row").removeClass("repeat-row");
-}j.parents(".cmb-repeat-table tr").remove();}};e.initPickers=function(h,i,g){e.initTimePickers(h);e.initDatePickers(i);e.initColorPickers(g);};e.initTimePickers=function(g){if(!g.length){return;
+}h.trigger("cmb_add_row",k);};e.addAjaxRow=function(g){g.preventDefault();var l=d(this);var m="#"+l.data("selector");var o=d(m);var h=o.find(".empty-row");
+var j=parseInt(h.find("[data-iterator]").data("iterator"));e.idNumber=j+1;var k=h.clone();var n=k.find(".wp-picker-container");var i=k.find(".cmb_media_status");
+k.newRowHousekeeping().cleanRow(j);h.removeClass("empty-row").addClass("repeat-row");h.after(k);e.afterRowInsert(k);o.trigger("cmb_add_row",k);};e.removeGroupRow=function(i){i.preventDefault();
+var k=d(this);var h=d("#"+k.data("selector"));var j=k.parents(".repeatable-grouping");var g=h.find(".repeatable-grouping").length;if(g>1){j.remove();if(g<3){h.find(".remove-group-row").prop("disabled",true);
+}else{h.find(".remove-group-row").prop("disabled",false);}h.trigger("cmb_remove_row");}};e.removeAjaxRow=function(h){h.preventDefault();var j=d(this);var i=j.parents("tr");
+var g=j.parents(".cmb-repeat-table");if(g.find("tr").length>1){if(i.hasClass("empty-row")){i.prev().addClass("empty-row").removeClass("repeat-row");}j.parents(".cmb-repeat-table tr").remove();
+g.trigger("cmb_remove_row");}};e.initPickers=function(h,i,g){e.initTimePickers(h);e.initDatePickers(i);e.initColorPickers(g);};e.initTimePickers=function(g){if(!g.length){return;
 }g.timePicker({startTime:"00:00",endTime:"23:59",show24Hours:false,separator:":",step:30});};e.initDatePickers=function(g){if(!g.length){return;}g.datepicker("destroy");
 g.datepicker();};e.initColorPickers=function(g){if(!g.length){return;}if(typeof jQuery.wp==="object"&&typeof jQuery.wp.wpColorPicker==="function"){g.wpColorPicker();
 }else{g.each(function(h){d(this).after('<div id="picker-'+h+'" style="z-index: 1000; background: #EEE; border: 1px solid #CCC; position: absolute; display: block;"></div>');

From ee70de35405cb09c408efa6de487e5b44ae64b4b Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Tue, 1 Apr 2014 15:58:21 -0400
Subject: [PATCH 56/71] Add sortable option to repeatable groups and fix the
 removing of data when adding a new row

---
 init.php      |  5 ++-
 js/cmb.js     | 89 ++++++++++++++++++++++++++++++++++++++++++++++++---
 js/cmb.min.js | 47 +++++++++++++++------------
 style.css     |  6 ++++
 style.min.css | 17 +++++-----
 5 files changed, 130 insertions(+), 34 deletions(-)

diff --git a/init.php b/init.php
index 1467535..a875f2c 100644
--- a/init.php
+++ b/init.php
@@ -275,6 +275,8 @@ public function register_scripts() {
 			'file'            => 'File:',
 			'download'        => 'Download',
 			'ajaxurl'         => admin_url( '/admin-ajax.php' ),
+			'up_arrow'        => '[ ↑ ]&nbsp;',
+			'down_arrow'      => '&nbsp;[ ↓ ]',
 		) );
 
 		wp_register_style( 'cmb-styles', CMB_META_BOX_URL . 'style'. $min .'.css', $styles );
@@ -413,11 +415,12 @@ public static function render_group( $args ) {
 		$field_group     = new cmb_Meta_Box_field( $args );
 		$desc            = $field_group->args( 'description' );
 		$label           = $field_group->args( 'name' );
+		$sortable        = $field_group->options( 'sortable' ) ? ' sortable' : '';
 		$group_val       = (array) $field_group->value();
 		$nrows           = count( $group_val );
 		$remove_disabled = $nrows <= 1 ? 'disabled="disabled" ' : '';
 
-		echo '<tr><td colspan="2"><table id="', $field_group->id(), '_repeat" class="repeatable-group" style="width:100%;">';
+		echo '<tr><td colspan="2"><table id="', $field_group->id(), '_repeat" class="repeatable-group'. $sortable .'" style="width:100%;">';
 		if ( $desc || $label ) {
 			echo '<tr><th>';
 				if ( $label )
diff --git a/js/cmb.js b/js/cmb.js
index c0be6d6..6f8b4d9 100644
--- a/js/cmb.js
+++ b/js/cmb.js
@@ -39,6 +39,7 @@ window.CMB = (function(window, document, $, undefined){
 		cmb.log( l10n );
 
 		var $metabox = cmb.metabox();
+		var $repeatGroup = $metabox.find('.repeatable-group');
 
 		// hide our spinner gif if we're on a MP6 dashboard
 		if ( l10n.new_admin_style ) {
@@ -69,6 +70,16 @@ window.CMB = (function(window, document, $, undefined){
 			// Ajax oEmbed display
 			.on( 'keyup paste focusout', '.cmb_oembed', cmb.maybeOembed );
 
+		if ( $repeatGroup.length ) {
+			$repeatGroup
+				.filter('.sortable').each( function() {
+					// Add sorting arrows
+					$(this).find( '.remove-group-row' ).before( '<a class="shift-rows move-up alignleft" href="#">'+ l10n.up_arrow +'</a> <a class="shift-rows move-down alignleft" href="#">'+ l10n.down_arrow +'</a>' )
+				})
+				.on( 'click', '.shift-rows', cmb.shiftRows )
+				.on( 'cmb_add_row', cmb.emptyValue );
+		}
+
 		// on pageload
 		setTimeout( cmb.resizeoEmbeds, 500);
 		// and on window resize
@@ -222,14 +233,18 @@ window.CMB = (function(window, document, $, undefined){
 
 	$.fn.cleanRow = function( prevNum, group ) {
 		var $self = $(this);
+		var $inputs = $self.find('input:not([type="button"]), select, textarea, label');
 		if ( group ) {
 			// Remove extra ajaxed rows
 			$self.find('.cmb-repeat-table .repeat-row:not(:first-child)').remove();
 		}
 		cmb.$focus = false;
 		cmb.neweditor_id = [];
-		$self.find('input:not([type="button"]),select,textarea,label').each( function(){
 
+		$inputs.filter(':checked').removeAttr( 'checked' );
+		$inputs.filter(':selected').removeAttr( 'selected' );
+
+		$inputs.each( function(){
 			var $newInput = $(this);
 			var isEditor  = $newInput.hasClass( 'wp-editor-area' );
 			var oldFor    = $newInput.attr( 'for' );
@@ -251,11 +266,8 @@ window.CMB = (function(window, document, $, undefined){
 			}
 
 			$newInput
-				.val('')
-				.removeAttr( 'checked' )
-				.removeAttr( 'selected' )
 				.removeClass( 'hasDatepicker' )
-				.attr( attrs );
+				.attr( attrs ).val('');
 
 			// wysiwyg field
 			if ( isEditor ) {
@@ -277,6 +289,7 @@ window.CMB = (function(window, document, $, undefined){
 
 			cmb.$focus = cmb.$focus ? cmb.$focus : $newInput;
 		});
+
 		return this;
 	}
 
@@ -366,6 +379,10 @@ window.CMB = (function(window, document, $, undefined){
 		$table.trigger( 'cmb_add_row', $newRow );
 	}
 
+	cmb.emptyValue = function( event, row ) {
+		$('input:not([type="button"]), textarea', row).val('');
+	}
+
 	cmb.addAjaxRow = function( event ) {
 
 		event.preventDefault();
@@ -424,6 +441,68 @@ window.CMB = (function(window, document, $, undefined){
 		}
 	}
 
+	cmb.shiftRows = function( event ) {
+
+		event.preventDefault();
+
+		var $self     = $(this);
+		var $parent   = $self.parents( '.repeatable-grouping' );
+		var toReplace = 'input:not([type="button"]),select,textarea,.cmb_media_status';
+		var $goto     = $self.hasClass( 'move-up' ) ? $parent.prev( '.repeatable-grouping' ) : $parent.next( '.repeatable-grouping' );
+
+		if ( ! $goto.length )
+			return;
+
+		var inputVals = [];
+		// Loop this items fields
+		$parent.find( toReplace ).each( function( index ) {
+			var $element = $(this);
+			var val;
+			if ( $element.hasClass('cmb_media_status') ) {
+				// special case for image previews
+				val = $element.html()
+			} else if ( 'checkbox' === $element.attr('type') ) {
+				val = $element.is(':checked');
+				cmb.log( 'checked', val );
+			} else if ( 'select' === $element.prop('tagName') ) {
+				val = $element.is(':selected');
+				cmb.log( 'checked', val );
+			} else {
+				val = $element.val();
+			}
+			// Get all the current values per element
+			inputVals.push( { val: val, $: $element } );
+		});
+		// And swap them all
+		$goto.find( toReplace ).each( function( index ) {
+			var $element = $(this);
+			var val;
+
+			if ( $element.hasClass('cmb_media_status') ) {
+				// special case for image previews
+				val = $element.html();
+				$element.html( inputVals[ index ]['val'] )
+				inputVals[ index ]['$'].html( val );
+
+			}
+			// handle checkbox swapping
+			else if ( 'checkbox' === $element.attr('type') ) {
+				inputVals[ index ]['$'].prop( 'checked', $element.is(':checked') );
+				$element.prop( 'checked', inputVals[ index ]['val'] );
+			}
+			// handle select swapping
+			else if ( 'select' === $element.prop('tagName') ) {
+				inputVals[ index ]['$'].prop( 'selected', $element.is(':selected') );
+				$element.prop( 'selected', inputVals[ index ]['val'] );
+			}
+			// handle normal input swapping
+			else {
+				inputVals[ index ]['$'].val( $element.val() );
+				$element.val( inputVals[ index ]['val'] )
+			}
+		});
+	}
+
 	/**
 	 * @todo make work, always
 	 */
diff --git a/js/cmb.min.js b/js/cmb.min.js
index 36c10a2..0053512 100644
--- a/js/cmb.min.js
+++ b/js/cmb.min.js
@@ -1,10 +1,11 @@
 window.CMB=(function(c,a,d,f){var b=c.cmb_l10;var e={formfield:"",idNumber:false,file_frames:{},};e.metabox=function(){if(e.$metabox){return e.$metabox;
-}e.$metabox=d("table.cmb_metabox");return e.$metabox;};e.init=function(){e.log(b);var g=e.metabox();if(b.new_admin_style){g.find(".cmb-spinner img").hide();
+}e.$metabox=d("table.cmb_metabox");return e.$metabox;};e.init=function(){e.log(b);var g=e.metabox();var h=g.find(".repeatable-group");if(b.new_admin_style){g.find(".cmb-spinner img").hide();
 }e.initPickers(g.find("input:text.cmb_timepicker"),g.find("input:text.cmb_datepicker"),g.find("input:text.cmb_colorpicker"));d("#ui-datepicker-div").wrap('<div class="cmb_element" />');
 g.on("change",".cmb_upload_file",function(){e.formfield=d(this).attr("id");d("#"+e.formfield+"_id").val("");}).on("click",".cmb_upload_button",e.handleMedia).on("click",".cmb_remove_file_button",e.handleRemoveMedia).on("click",".add-group-row",e.addGroupRow).on("click",".add-row-button",e.addAjaxRow).on("click",".remove-group-row",e.removeGroupRow).on("click",".remove-row-button",e.removeAjaxRow).on("keyup paste focusout",".cmb_oembed",e.maybeOembed);
-setTimeout(e.resizeoEmbeds,500);d(c).on("resize",e.resizeoEmbeds);};e.handleMedia=function(h){if(typeof wp==="undefined"){return;}h.preventDefault();var m=e.metabox();
-var n=d(this);e.formfield=n.prev("input").attr("id");var g=d("#"+e.formfield);var o=g.attr("name");var i=true;var l=true;var j=n.hasClass("cmb_upload_list");
-if(e.formfield in e.file_frames){e.file_frames[e.formfield].open();return;}e.file_frames[e.formfield]=wp.media.frames.file_frame=wp.media({title:m.find("label[for="+e.formfield+"]").text(),button:{text:b.upload_file},multiple:j?true:false});
+if(h.length){h.filter(".sortable").each(function(){d(this).find(".remove-group-row").before('<a class="shift-rows move-up alignleft" href="#">'+b.up_arrow+'</a> <a class="shift-rows move-down alignleft" href="#">'+b.down_arrow+"</a>");
+}).on("click",".shift-rows",e.shiftRows).on("cmb_add_row",e.emptyValue);}setTimeout(e.resizeoEmbeds,500);d(c).on("resize",e.resizeoEmbeds);};e.handleMedia=function(h){if(typeof wp==="undefined"){return;
+}h.preventDefault();var m=e.metabox();var n=d(this);e.formfield=n.prev("input").attr("id");var g=d("#"+e.formfield);var o=g.attr("name");var i=true;var l=true;
+var j=n.hasClass("cmb_upload_list");if(e.formfield in e.file_frames){e.file_frames[e.formfield].open();return;}e.file_frames[e.formfield]=wp.media.frames.file_frame=wp.media({title:m.find("label[for="+e.formfield+"]").text(),button:{text:b.upload_file},multiple:j?true:false});
 var k={list:function(q){l=q.toJSON();g.val(l.url);d("#"+e.formfield+"_id").val(l.id);var p=[];d(l).each(function(){if(this.type&&this.type==="image"){i='<li class="img_status"><img width="50" height="50" src="'+this.url+'" class="attachment-50x50" alt="'+this.filename+'"><p><a href="#" class="cmb_remove_file_button" rel="'+e.formfield+"["+this.id+']">'+b.remove_image+'</a></p><input type="hidden" id="filelist-'+this.id+'" name="'+o+"["+this.id+']" value="'+this.url+'"></li>';
 }else{i="<li>"+b.file+" <strong>"+this.filename+'</strong>&nbsp;&nbsp;&nbsp; (<a href="'+this.url+'" target="_blank" rel="external">'+b.download+'</a> / <a href="#" class="cmb_remove_file_button" rel="'+e.formfield+"["+this.id+']">'+b.remove_file+'</a>)<input type="hidden" id="filelist-'+this.id+'" name="'+o+"["+this.id+']" value="'+this.url+'"></li>';
 }p.push(i);});d(p).each(function(){g.siblings(".cmb_media_status").slideDown().append(this);});},single:function(p){l=p.first().toJSON();g.val(l.url);d("#"+e.formfield+"_id").val(l.id);
@@ -15,30 +16,36 @@ var p=j?"list":"single";k[p](q);});e.file_frames[e.formfield].open();};e.handleR
 return false;}e.formfield=i.attr("rel");var h=i.parents(".img_status");e.metabox().find("input#"+e.formfield).val("");e.metabox().find("input#"+e.formfield+"_id").val("");
 if(!h.length){i.parents(".cmb_media_status").html("");}else{h.html("");}return false;};d.fn.replaceText=function(g,h,i){return this.each(function(){var k=this.firstChild,j,l,m=[];
 if(k){do{if(k.nodeType===3){j=k.nodeValue;l=j.replace(g,h);if(l!==j){if(!i&&/</.test(l)){d(k).before(l);m.push(k);}else{k.nodeValue=l;}}}}while(k=k.nextSibling);
-}m.length&&d(m).remove();});};d.fn.cleanRow=function(g,h){var i=d(this);if(h){i.find(".cmb-repeat-table .repeat-row:not(:first-child)").remove();}e.$focus=false;
-e.neweditor_id=[];i.find('input:not([type="button"]),select,textarea,label').each(function(){var s=d(this);var k=s.hasClass("wp-editor-area");var l=s.attr("for");
-var n=s.next();var t={};if(l){t={"for":l.replace("_"+g,"_"+e.idNumber)};}else{var j=s.attr("name");var r=j?j.replace(g,e.idNumber):"";var p=s.attr("id");
-var q=p?p.replace("_"+g,"_"+e.idNumber):"";t={id:q,name:r,"data-iterator":e.idNumber,};}s.val("").removeAttr("checked").removeAttr("selected").removeClass("hasDatepicker").attr(t);
-if(k){q=q?p.replace("zx"+g,"zx"+e.idNumber):"";s.html("");var m=s.parents(".cmb-type-wysiwyg");m.find(".mce-tinymce:not(:first-child)").remove();var o=m.html().replace(new RegExp(p,"g"),q);
-m.html(o);e.neweditor_id.push({id:q,old:p});}e.$focus=e.$focus?e.$focus:s;});return this;};d.fn.newRowHousekeeping=function(){var g=d(this);var i=g.find(".wp-picker-container");
-var h=g.find(".cmb_media_status");if(i.length){i.each(function(){var j=d(this).parent();j.html(j.find("input:text.cmb_colorpicker").attr("style",""));});
-}if(h.length){h.empty();}return this;};e.afterRowInsert=function(j){if(e.$focus){e.$focus.focus();}if(e.neweditor_id.length){var l;for(l=e.neweditor_id.length-1;
-l>=0;l--){var n=e.neweditor_id[l].id;var k=e.neweditor_id[l].old;if(typeof(tinyMCEPreInit.mceInit[n])==="undefined"){var h=jQuery.extend({},tinyMCEPreInit.mceInit[k]);
+}m.length&&d(m).remove();});};d.fn.cleanRow=function(h,i){var j=d(this);var g=j.find('input:not([type="button"]), select, textarea, label');if(i){j.find(".cmb-repeat-table .repeat-row:not(:first-child)").remove();
+}e.$focus=false;e.neweditor_id=[];d(":checked",this).removeAttr("checked");d(":selected",this).removeAttr("selected");g.each(function(){var u=d(this);var m=u.prop("tagName");
+var l=u.hasClass("wp-editor-area");var n=u.attr("for");var p=u.next();e.log("input",u.prop("tagName"),"LABEL"===u.prop("tagName")?u.attr("for"):u.attr("name"));
+var v={};if(n){v={"for":n.replace("_"+h,"_"+e.idNumber)};}else{var k=u.attr("name");var t=k?k.replace(h,e.idNumber):"";var r=u.attr("id");var s=r?r.replace("_"+h,"_"+e.idNumber):"";
+v={id:s,name:t,"data-iterator":e.idNumber,};}u.removeClass("hasDatepicker").attr(v).val("");if(l){s=s?r.replace("zx"+h,"zx"+e.idNumber):"";u.html("");var o=u.parents(".cmb-type-wysiwyg");
+o.find(".mce-tinymce:not(:first-child)").remove();var q=o.html().replace(new RegExp(r,"g"),s);o.html(q);e.neweditor_id.push({id:s,old:r});}e.$focus=e.$focus?e.$focus:u;
+});return this;};d.fn.newRowHousekeeping=function(){var g=d(this);var i=g.find(".wp-picker-container");var h=g.find(".cmb_media_status");if(i.length){i.each(function(){var j=d(this).parent();
+j.html(j.find("input:text.cmb_colorpicker").attr("style",""));});}if(h.length){h.empty();}return this;};e.afterRowInsert=function(j){if(e.$focus){e.$focus.focus();
+}if(e.neweditor_id.length){var l;for(l=e.neweditor_id.length-1;l>=0;l--){var n=e.neweditor_id[l].id;var k=e.neweditor_id[l].old;if(typeof(tinyMCEPreInit.mceInit[n])==="undefined"){var h=jQuery.extend({},tinyMCEPreInit.mceInit[k]);
 for(var m in h){if("string"===typeof(h[m])){h[m]=h[m].replace(new RegExp(k,"g"),n);}}tinyMCEPreInit.mceInit[n]=h;}if(typeof(tinyMCEPreInit.qtInit[n])==="undefined"){var g=jQuery.extend({},tinyMCEPreInit.qtInit[k]);
 for(var m in g){if("string"===typeof(g[m])){g[m]=g[m].replace(new RegExp(k,"g"),n);}}tinyMCEPreInit.qtInit[n]=g;}tinyMCE.init({id:tinyMCEPreInit.mceInit[n],});
 }}e.initPickers(j.find("input:text.cmb_timepicker"),j.find("input:text.cmb_datepicker"),j.find("input:text.cmb_colorpicker"));};e.addGroupRow=function(l){l.preventDefault();
 var m=d(this);var h=d("#"+m.data("selector"));var j=h.find(".repeatable-grouping").last();var i=parseInt(j.data("iterator"));e.idNumber=i+1;var g=j.clone();
 g.newRowHousekeeping().cleanRow(i,true);var k=d('<tr class="repeatable-grouping" data-iterator="'+e.idNumber+'">'+g.html()+"</tr>");j.after(k);e.afterRowInsert(k);
 if(h.find(".repeatable-grouping").length<=1){h.find(".remove-group-row").prop("disabled",true);}else{h.find(".remove-group-row").removeAttr("disabled");
-}h.trigger("cmb_add_row",k);};e.addAjaxRow=function(g){g.preventDefault();var l=d(this);var m="#"+l.data("selector");var o=d(m);var h=o.find(".empty-row");
-var j=parseInt(h.find("[data-iterator]").data("iterator"));e.idNumber=j+1;var k=h.clone();var n=k.find(".wp-picker-container");var i=k.find(".cmb_media_status");
-k.newRowHousekeeping().cleanRow(j);h.removeClass("empty-row").addClass("repeat-row");h.after(k);e.afterRowInsert(k);o.trigger("cmb_add_row",k);};e.removeGroupRow=function(i){i.preventDefault();
-var k=d(this);var h=d("#"+k.data("selector"));var j=k.parents(".repeatable-grouping");var g=h.find(".repeatable-grouping").length;if(g>1){j.remove();if(g<3){h.find(".remove-group-row").prop("disabled",true);
+}h.trigger("cmb_add_row",k);};e.emptyValue=function(g,h){d('input:not([type="button"]), textarea',h).val("");};e.addAjaxRow=function(g){g.preventDefault();
+var l=d(this);var m="#"+l.data("selector");var o=d(m);var h=o.find(".empty-row");var j=parseInt(h.find("[data-iterator]").data("iterator"));e.idNumber=j+1;
+var k=h.clone();var n=k.find(".wp-picker-container");var i=k.find(".cmb_media_status");k.newRowHousekeeping().cleanRow(j);h.removeClass("empty-row").addClass("repeat-row");
+h.after(k);e.afterRowInsert(k);o.trigger("cmb_add_row",k);};e.removeGroupRow=function(i){i.preventDefault();var k=d(this);var h=d("#"+k.data("selector"));
+var j=k.parents(".repeatable-grouping");var g=h.find(".repeatable-grouping").length;if(g>1){j.remove();if(g<3){h.find(".remove-group-row").prop("disabled",true);
 }else{h.find(".remove-group-row").prop("disabled",false);}h.trigger("cmb_remove_row");}};e.removeAjaxRow=function(h){h.preventDefault();var j=d(this);var i=j.parents("tr");
 var g=j.parents(".cmb-repeat-table");if(g.find("tr").length>1){if(i.hasClass("empty-row")){i.prev().addClass("empty-row").removeClass("repeat-row");}j.parents(".cmb-repeat-table tr").remove();
-g.trigger("cmb_remove_row");}};e.initPickers=function(h,i,g){e.initTimePickers(h);e.initDatePickers(i);e.initColorPickers(g);};e.initTimePickers=function(g){if(!g.length){return;
-}g.timePicker({startTime:"00:00",endTime:"23:59",show24Hours:false,separator:":",step:30});};e.initDatePickers=function(g){if(!g.length){return;}g.datepicker("destroy");
-g.datepicker();};e.initColorPickers=function(g){if(!g.length){return;}if(typeof jQuery.wp==="object"&&typeof jQuery.wp.wpColorPicker==="function"){g.wpColorPicker();
+g.trigger("cmb_remove_row");}};e.shiftRows=function(i){i.preventDefault();var l=d(this);var k=l.parents(".repeatable-grouping");var h='input:not([type="button"]),select,textarea,.cmb_media_status';
+var g=l.hasClass("move-up")?k.prev(".repeatable-grouping"):k.next(".repeatable-grouping");if(!g.length){return;}var j=[];k.find(h).each(function(n){var m=d(this);
+var o;if(m.hasClass("cmb_media_status")){o=m.html();}else{if("checkbox"===m.attr("type")){o=m.is(":checked");e.log("checked",o);}else{if("select"===m.prop("tagName")){o=m.is(":selected");
+e.log("checked",o);}else{o=m.val();}}}j.push({val:o,$:m});});g.find(h).each(function(n){var m=d(this);var o;if(m.hasClass("cmb_media_status")){o=m.html();
+m.html(j[n]["val"]);j[n]["$"].html(o);}else{if("checkbox"===m.attr("type")){j[n]["$"].prop("checked",m.is(":checked"));m.prop("checked",j[n]["val"]);}else{if("select"===m.prop("tagName")){j[n]["$"].prop("selected",m.is(":selected"));
+m.prop("selected",j[n]["val"]);}else{j[n]["$"].val(m.val());m.val(j[n]["val"]);}}}});};e.initPickers=function(h,i,g){e.initTimePickers(h);e.initDatePickers(i);
+e.initColorPickers(g);};e.initTimePickers=function(g){if(!g.length){return;}g.timePicker({startTime:"00:00",endTime:"23:59",show24Hours:false,separator:":",step:30});
+};e.initDatePickers=function(g){if(!g.length){return;}g.datepicker("destroy");g.datepicker();};e.initColorPickers=function(g){if(!g.length){return;}if(typeof jQuery.wp==="object"&&typeof jQuery.wp.wpColorPicker==="function"){g.wpColorPicker();
 }else{g.each(function(h){d(this).after('<div id="picker-'+h+'" style="z-index: 1000; background: #EEE; border: 1px solid #CCC; position: absolute; display: block;"></div>');
 d("#picker-"+h).hide().farbtastic(d(this));}).focus(function(){d(this).next().show();}).blur(function(){d(this).next().hide();});}};e.maybeOembed=function(h){var j=d(this);
 var i=h.type;var g={focusout:function(){setTimeout(function(){e.spinner(".postbox table.cmb_metabox",true);},2000);},keyup:function(){var k=function(m,l){return h.which<=l&&h.which>=m;
diff --git a/style.css b/style.css
index 7e144e5..dd613a2 100644
--- a/style.css
+++ b/style.css
@@ -33,6 +33,12 @@ table.cmb_metabox tbody > tr:first-of-type > th,
 	padding: 5px;
 }
 
+.repeatable-group .shift-rows {
+	text-decoration: none;
+	margin-right: 5px;
+	font-size: 1.2em;
+}
+
 .repeatable-group .cmb_upload_button {
 	float: right;
 }
diff --git a/style.min.css b/style.min.css
index 4ad20ad..edc06a4 100644
--- a/style.min.css
+++ b/style.min.css
@@ -1,13 +1,14 @@
 table.cmb_metabox{clear:both}table.cmb_metabox>tr:first-of-type>td,table.cmb_metabox>tr:first-of-type>th,table.cmb_metabox tbody>tr:first-of-type>td,table.cmb_metabox tbody>tr:first-of-type>th,.post-php table.cmb_metabox .cmb-nested-table td,.post-new-php table.cmb_metabox .cmb-nested-table td,.post-php table.cmb_metabox .repeatable-group th,.post-new-php table.cmb_metabox .repeatable-group th,.post-php table.cmb_metabox .repeatable-group:first-of-type,.post-new-php table.cmb_metabox .repeatable-group:first-of-type{border:0}
 .post-php table.cmb_metabox td,.post-new-php table.cmb_metabox td,.post-php table.cmb_metabox th,.post-new-php table.cmb_metabox th,.post-php table.cmb_metabox .repeatable-group,.post-new-php table.cmb_metabox .repeatable-group,.post-php table.cmb_metabox .repeatable-group,.post-new-php table.cmb_metabox .repeatable-group{border-top:1px solid #e9e9e9}
-.repeatable-group th{padding:5px}.repeatable-group .cmb_upload_button{float:right}#poststuff .repeatable-group h2{margin:0}.post-php table.cmb_metabox th,.post-new-php table.cmb_metabox th{text-align:right;font-weight:bold}
-.post-php table.cmb_metabox table th,.post-new-php table.cmb_metabox table th{text-align:left}table.cmb_metabox th label{margin-top:5px;display:block}
-p.cmb_metabox_description{color:#AAA;font-style:italic;margin:2px 0!important}span.cmb_metabox_description{color:#AAA;font-style:italic}table.cmb_metabox input,table.cmb_metabox textarea{font-size:14px;padding:5px}
-table.cmb_metabox input[type=text],table.cmb_metabox textarea{width:97%}table.cmb_metabox textarea.cmb_textarea_code{font-family:Consolas,Monaco,monospace;line-height:16px}
-table.cmb_metabox input.cmb_text_small{width:100px;margin-right:15px}table.cmb_metabox input.cmb_timepicker{width:100px;margin-right:15px}table.cmb_metabox input.cmb_text_money{width:90px;margin-right:15px}
-table.cmb_metabox input.cmb_text_medium{width:230px;margin-right:15px}table.cmb_metabox input.cmb_upload_file{width:65%}table.cmb_metabox input.ed_button{padding:2px 4px}
-table.cmb_metabox li{font-size:14px;margin:1px 0 5px 0;line-height:16px}table.cmb_metabox ul{padding-top:5px;margin:0}table.cmb_metabox select{font-size:14px;margin-top:3px}
-table.cmb_metabox input:focus,table.cmb_metabox textarea:focus{background:#fffff8}.cmb_metabox_title{margin:0 0 5px 0;padding:5px 0 0 0}.edit-tags-php .cmb_metabox_title,.profile-php .cmb_metabox_title,.user-edit-php .cmb_metabox_title{margin-left:-10px}
+.repeatable-group th{padding:5px}.repeatable-group .shift-rows{text-decoration:none;margin-right:5px;font-size:1.2em}.repeatable-group .cmb_upload_button{float:right}
+#poststuff .repeatable-group h2{margin:0}.post-php table.cmb_metabox th,.post-new-php table.cmb_metabox th{text-align:right;font-weight:bold}.post-php table.cmb_metabox table th,.post-new-php table.cmb_metabox table th{text-align:left}
+table.cmb_metabox th label{margin-top:5px;display:block}p.cmb_metabox_description{color:#AAA;font-style:italic;margin:2px 0!important}span.cmb_metabox_description{color:#AAA;font-style:italic}
+table.cmb_metabox input,table.cmb_metabox textarea{font-size:14px;padding:5px}table.cmb_metabox input[type=text],table.cmb_metabox textarea{width:97%}
+table.cmb_metabox textarea.cmb_textarea_code{font-family:Consolas,Monaco,monospace;line-height:16px}table.cmb_metabox input.cmb_text_small{width:100px;margin-right:15px}
+table.cmb_metabox input.cmb_timepicker{width:100px;margin-right:15px}table.cmb_metabox input.cmb_text_money{width:90px;margin-right:15px}table.cmb_metabox input.cmb_text_medium{width:230px;margin-right:15px}
+table.cmb_metabox input.cmb_upload_file{width:65%}table.cmb_metabox input.ed_button{padding:2px 4px}table.cmb_metabox li{font-size:14px;margin:1px 0 5px 0;line-height:16px}
+table.cmb_metabox ul{padding-top:5px;margin:0}table.cmb_metabox select{font-size:14px;margin-top:3px}table.cmb_metabox input:focus,table.cmb_metabox textarea:focus{background:#fffff8}
+.cmb_metabox_title{margin:0 0 5px 0;padding:5px 0 0 0}.edit-tags-php .cmb_metabox_title,.profile-php .cmb_metabox_title,.user-edit-php .cmb_metabox_title{margin-left:-10px}
 .cmb-inline ul{padding:4px 0 0 0}.cmb-inline li{display:inline-block;padding-right:18px}table.cmb_metabox input[type="radio"]{margin:0 5px 0 0;padding:0}
 table.cmb_metabox input[type="checkbox"]{margin:0 5px 0 0;padding:0}table.cmb_metabox .mceLayout{border:1px solid #dfdfdf!important}
 table.cmb_metabox .mceIframeContainer{background:#FFF}table.cmb_metabox .meta_mce{width:97%}table.cmb_metabox .meta_mce textarea{width:100%}table.cmb_metabox .cmb_media_status{margin:10px 0 0 0}

From 4f795371babb469b6b32c8e5aa9a6880ea804b8d Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Tue, 1 Apr 2014 15:59:00 -0400
Subject: [PATCH 57/71] Add "Repeatable Field Groups" metabox example

---
 example-functions.php | 75 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 64 insertions(+), 11 deletions(-)

diff --git a/example-functions.php b/example-functions.php
index 5de4c0b..a4581c3 100644
--- a/example-functions.php
+++ b/example-functions.php
@@ -20,6 +20,9 @@ function cmb_sample_metaboxes( array $meta_boxes ) {
 	// Start with an underscore to hide fields from custom fields list
 	$prefix = '_cmb_';
 
+	/**
+	 * Sample metabox to demonstrate each field type included
+	 */
 	$meta_boxes['test_metabox'] = array(
 		'id'         => 'test_metabox',
 		'title'      => __( 'Test Metabox', 'cmb' ),
@@ -250,6 +253,9 @@ function cmb_sample_metaboxes( array $meta_boxes ) {
 		),
 	);
 
+	/**
+	 * Metabox to be displayed on a single page ID
+	 */
 	$meta_boxes['about_page_metabox'] = array(
 		'id'         => 'about_page_metabox',
 		'title'      => __( 'About Page Metabox', 'cmb' ),
@@ -268,16 +274,62 @@ function cmb_sample_metaboxes( array $meta_boxes ) {
 		)
 	);
 
+	/**
+	 * Repeatable Field Groups
+	 */
+	$meta_boxes['field_group'] = array(
+		'id'         => 'field_group',
+		'title'      => __( 'Repeating Field Group', 'cmb' ),
+		'pages'      => array( 'page', ),
+		'fields'     => array(
+			array(
+				'id'          => $prefix . 'repeat_group',
+				'type'        => 'group',
+				'description' => __( 'Generates reusable form entries', 'cmb' ),
+				'options'     => array(
+					'add_button'    => __( 'Add Another Entry', 'cmb' ),
+					'remove_button' => __( 'Remove Entry', 'cmb' ),
+					'sortable'      => true, // beta
+				),
+				// Fields array works the same, except id's only need to be unique for this group. Prefix is not needed.
+				'fields'      => array(
+					array(
+						'name' => 'Entry Title',
+						'id'   => 'title',
+						'type' => 'text',
+						// 'repeatable' => true, // Repeatable fields are supported w/in repeatable groups (for most types)
+					),
+					array(
+						'name' => 'Description',
+						'description' => 'Write a short description for this entry',
+						'id'   => 'description',
+						'type' => 'textarea_small',
+					),
+					array(
+						'name' => 'Entry Image',
+						'id'   => 'image',
+						'type' => 'file',
+					),
+					array(
+						'name' => 'Image Caption',
+						'id'   => 'image_caption',
+						'type' => 'text',
+					),
+				),
+			),
+		),
+	);
+
 	/**
 	 * Metabox for the user profile screen
 	 */
 	$meta_boxes['user_edit'] = array(
-		'id'            => 'user_edit',
-		'title'         => __( 'User Profile Metabox', 'cmb' ),
-		'pages'         => array( 'user' ), // Tells CMB to use user_meta vs post_meta
-		'show_names'    => true,
-		// 'cmb_styles' => true, // Show cmb bundled styles.. not needed on user profile page
-		'fields'        => array(
+		'id'         => 'user_edit',
+		'title'      => __( 'User Profile Metabox', 'cmb' ),
+		'pages'      => array( 'user' ), // Tells CMB to use user_meta vs post_meta
+		'show_names' => true,
+		'cmb_styles' => false, // Show cmb bundled styles.. not needed on user profile page
+		'fields'     => array(
 			array(
 				'name'     => __( 'Extra Info', 'cmb' ),
 				'desc'     => __( 'field description (optional)', 'cmb' ),
@@ -326,13 +378,14 @@ function cmb_sample_metaboxes( array $meta_boxes ) {
 	);
 
 	/**
-	 * Metabox for an options page
+	 * Metabox for an options page. Will not be added automatically, but needs to be called with
+	 * the `cmb_metabox_form` helper function. See wiki for more info.
 	 */
 	$meta_boxes['options_page'] = array(
-		'id'            => 'options_page',
-		'title'         => __( 'Theme Options Metabox', 'cmb' ),
-		'show_on'    => array( 'key' => 'options-page', 'value' => array( $prefix . 'theme_options', ), ),
-		'fields'        => array(
+		'id'      => 'options_page',
+		'title'   => __( 'Theme Options Metabox', 'cmb' ),
+		'show_on' => array( 'key' => 'options-page', 'value' => array( $prefix . 'theme_options', ), ),
+		'fields'  => array(
 			array(
 				'name'    => __( 'Site Background Color', 'cmb' ),
 				'desc'    => __( 'field description (optional)', 'cmb' ),

From 2f84b9e56baba775b2aef820f2bd3d2f1ce333ba Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Tue, 1 Apr 2014 15:59:24 -0400
Subject: [PATCH 58/71] update resources and feature list

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

diff --git a/readme.md b/readme.md
index db4cf4b..de3fb58 100644
--- a/readme.md
+++ b/readme.md
@@ -16,10 +16,16 @@
 
 Custom Metaboxes and Fields (CMB for short) will create metaboxes with custom fields that will blow your mind.
 
-New in version 1.0.0:
+Features:
 
-* Bring your metaboxes to the frontend.
-* Create metaboxes to handle user meta and display them on user profile add/edit pages. Or even on the front-end.
+* Create metaboxes to be used on post edit screens.
+* Create forms to be used on options pages.
+* Create forms to handle user meta and display them on user profile add/edit pages.
+* Flexible API that allows you to use CMB forms almost anywhere, even on the front-end.
+* Several field types are included and are [listed below](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress#field-types).
+* Custom API hook that allows you to create your own field types.
+* There are numerous hooks and filters, allowing you to modify many aspects of the library (without editing it directly).
+* Repeatable fields for most field types are supported, as well as repeatable field groups.
 
 ##### Links
 * [Github project page](https://github.com/webdevstudios/Custom-Metaboxes-and-Fields-for-WordPress)
@@ -33,7 +39,7 @@ New in version 1.0.0:
 
 	> 1. The `pw_select field` acts much like the default select field. However, it adds typeahead-style search allowing you to quickly make a selection from a large list
 	> 2. The `pw_multiselect` field allows you to select multiple values with typeahead-style search. The values can be dragged and dropped to reorder
-
+* [Taxonomy_MetaData](https://github.com/jtsternberg/Taxonomy_MetaData#to-use-taxonomy_metadata-with-custom-metaboxes-and-fields): WordPress Helper Class for saving pseudo-metadata for taxonomy terms. Includes an extended class for using CMB to generate the actual form fields.
 
 ##### Field Types:
 * text (optionally repeatable)

From 04fb4d6b75e702282993a930045d69b14ba39fc3 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Tue, 1 Apr 2014 15:59:57 -0400
Subject: [PATCH 59/71] new filter, `cmb_localized_data`, for momdifiying
 localized data

---
 init.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.php b/init.php
index a875f2c..0f56662 100644
--- a/init.php
+++ b/init.php
@@ -264,7 +264,7 @@ public function register_scripts() {
 
 		wp_enqueue_media();
 
-		wp_localize_script( 'cmb-scripts', 'cmb_l10', array(
+		wp_localize_script( 'cmb-scripts', 'cmb_l10', apply_filters( 'cmb_localized_data', array(
 			'ajax_nonce'      => wp_create_nonce( 'ajax_nonce' ),
 			'script_debug'    => defined('SCRIPT_DEBUG') && SCRIPT_DEBUG,
 			'new_admin_style' => version_compare( $wp_version, '3.7', '>' ),
@@ -277,7 +277,7 @@ public function register_scripts() {
 			'ajaxurl'         => admin_url( '/admin-ajax.php' ),
 			'up_arrow'        => '[ ↑ ]&nbsp;',
 			'down_arrow'      => '&nbsp;[ ↓ ]',
-		) );
+		) ) );
 
 		wp_register_style( 'cmb-styles', CMB_META_BOX_URL . 'style'. $min .'.css', $styles );
 

From 78169e21b7c093be9f19d88a2539f8bf5f06e1a4 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Tue, 1 Apr 2014 17:36:54 -0400
Subject: [PATCH 60/71] update field types documentation

---
 readme.md | 64 +++++++++++++++++++++++++++++++++----------------------
 1 file changed, 38 insertions(+), 26 deletions(-)

diff --git a/readme.md b/readme.md
index de3fb58..3cb46d6 100644
--- a/readme.md
+++ b/readme.md
@@ -42,32 +42,43 @@ Features:
 * [Taxonomy_MetaData](https://github.com/jtsternberg/Taxonomy_MetaData#to-use-taxonomy_metadata-with-custom-metaboxes-and-fields): WordPress Helper Class for saving pseudo-metadata for taxonomy terms. Includes an extended class for using CMB to generate the actual form fields.
 
 ##### Field Types:
-* text (optionally repeatable)
-* text small (optionally repeatable)
-* text medium (optionally repeatable)
-* text url (optionally repeatable)
-* text email (optionally repeatable)
-* text money (optionally repeatable)
-* date picker
-* date picker (unix timestamp)
-* date time picker combo (unix timestamp)
-* date time picker with time zone combo (serialized DateTime object)
-* time zone dropdown
-* time picker
-* color picker
-* textarea
-* textarea small
-* textarea code
-* select
-* radio
-* radio inline
-* taxonomy radio
-* taxonomy select
-* checkbox
-* multicheck
-* WYSIWYG/TinyMCE
-* Image/file upload
-* oEmbed
+1. [`title`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#title) An arbitrary title field *
+1. [`text`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text)
+1. [`text_small`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_small)
+1. [`text_medium`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_medium)
+1. [`text_email`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_email)
+1. [`text_url`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_url)
+1. [`text_money`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_money)
+1. [`textarea`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#textarea)
+1. [`textarea_small`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#textarea_small)
+1. [`textarea_code`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#textarea_code)
+1. [`text_date`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_date) Date Picker
+1. [`text_time`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_time) Time picker
+1. [`select_timezone`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#select_timezone) Time zone dropdown
+1. [`text_date_timestamp`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_date_timestamp) Date Picker (UNIX timestamp)
+1. [`text_datetime_timestamp`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_datetime_timestamp) Test Date/Time Picker Combo (UNIX timestamp)
+1. [`text_datetime_timestamp_timezone`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_datetime_timestamp_timezone) Test Date/Time Picker/Time zone Combo (serialized DateTime object)
+1. [`colorpicker`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#colorpicker) Color picker
+1. [`radio`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#radio)
+1. [`radio_inline`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#radio_inline)
+1. [`taxonomy_radio`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#taxonomy_radio)
+1. [`taxonomy_radio_inline`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#taxonomy_radio_inline)
+1. [`select`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#select)
+1. [`taxonomy_select`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#taxonomy_select)
+1. [`checkbox`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#checkbox)
+1. [`multicheck`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#multicheck)
+1. [`taxonomy_multicheck`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#taxonomy_multicheck)
+1. [`taxonomy_multicheck_inline`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#taxonomy_multicheck_inline)
+1. [`wysiwyg`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#wysiwyg) (TinyMCE) **
+1. [`file`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#file) Image/File upload *†
+1. [`file_list`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#file_list) Image/File list upload
+1. [`oembed`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#oembed) Converts oembed urls (instagram, twitter, youtube, etc. [oEmbed in the Codex](https://codex.wordpress.org/Embeds))
+1. [`group`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#group) Hybrid field that supports adding other fields as a repeatable group. *
+1. [Create your own custom field type](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#Custom)
+
+\* Not available as a repeatable field
+\** Repeatable field support is in beta
+† Use `file_list`
 
 [More on field types (GitHub wiki)](https://github.com/webdevstudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types)
 
@@ -99,6 +110,7 @@ This script is easy to install. If you can't figure it out you probably shouldn'
 * look at preserving taxonomy hierarchies
 * Add input attributes filter
 * Always load newest version of CMB
+* Helper function to easily get oembed from stored oEmbed field
 
 ## Changelog
 

From 57de67b993bbe8993755aa46799e5c48bb8da3cb Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Wed, 2 Apr 2014 10:56:22 -0400
Subject: [PATCH 61/71] Removed  in favor of . **THIS IS A BREAKING CHANGE**

---
 helpers/cmb_Meta_Box_field.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/helpers/cmb_Meta_Box_field.php b/helpers/cmb_Meta_Box_field.php
index 3a7280b..4718b75 100644
--- a/helpers/cmb_Meta_Box_field.php
+++ b/helpers/cmb_Meta_Box_field.php
@@ -434,8 +434,6 @@ public function _set_field_defaults( $args ) {
 		if ( ! isset( $args['preview_size'] ) ) $args['preview_size'] = array( 50, 50 );
 		// Allow a filter override of the default value
 		$args['default']    = apply_filters( 'cmb_default_filter', $args['default'], $args, $this->object_type, $this->object_type );
-		// 'cmb_std_filter' deprectated, use 'cmb_default_filter' instead
-		$args['default']    = apply_filters( 'cmb_std_filter', $args['default'], $args, $this->object_type, $this->object_type );
 		$args['allow']      = 'file' == $args['type'] && ! isset( $args['allow'] ) ? array( 'url', 'attachment' ) : array();
 		$args['save_id']    = 'file' == $args['type'] && ! ( isset( $args['save_id'] ) && ! $args['save_id'] );
 		// $args['multiple']   = isset( $args['multiple'] ) ? $args['multiple'] : ( 'multicheck' == $args['type'] ? true : false );

From c1a23a945f830011b3e74119205f2e267de58a7a Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Wed, 2 Apr 2014 10:56:52 -0400
Subject: [PATCH 62/71] Fix the  parameter so it works properly

---
 helpers/cmb_Meta_Box_field.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/helpers/cmb_Meta_Box_field.php b/helpers/cmb_Meta_Box_field.php
index 4718b75..e3ca1b0 100644
--- a/helpers/cmb_Meta_Box_field.php
+++ b/helpers/cmb_Meta_Box_field.php
@@ -365,8 +365,9 @@ public function field_timezone() {
 	 */
 	public function render_field() {
 
-		if ( ! $this->args( 'on_front' ) )
-			continue;
+		// If field is requesting to not be shown on the front-end
+		if ( ! is_admin() && ! $this->args( 'on_front' ) )
+			return;
 
 		$classes    = 'cmb-type-'. sanitize_html_class( $this->type() );
 		$classes   .= ' cmb_id_'. sanitize_html_class( $this->id() );

From dc17e763162d10eb02e4c258b624aeae53b890bb Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Wed, 2 Apr 2014 10:57:16 -0400
Subject: [PATCH 63/71] bump version number

---
 init.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.php b/init.php
index 0f56662..6ec7662 100644
--- a/init.php
+++ b/init.php
@@ -6,7 +6,7 @@
 				Bill Erickson (@billerickson / billerickson.net)
 				Justin Sternberg (@jtsternberg / dsgnwrks.pro)
 Description: 	This will create metaboxes with custom fields that will blow your mind.
-Version: 		1.0.2
+Version: 		1.0.3
 */
 
 /**
@@ -54,7 +54,7 @@ class cmb_Meta_Box {
 	 * @var   string
 	 * @since 1.0.0
 	 */
-	const CMB_VERSION = '1.0.2';
+	const CMB_VERSION = '1.0.3';
 
 	/**
 	 * Metabox Config array

From ef9fc4d5948ca65fad634889df1d552cd3c9057e Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Wed, 2 Apr 2014 10:57:50 -0400
Subject: [PATCH 64/71] Update readme with new version info

---
 readme.md | 39 ++++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/readme.md b/readme.md
index 3cb46d6..10349dc 100644
--- a/readme.md
+++ b/readme.md
@@ -59,26 +59,25 @@ Features:
 1. [`text_datetime_timestamp`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_datetime_timestamp) Test Date/Time Picker Combo (UNIX timestamp)
 1. [`text_datetime_timestamp_timezone`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_datetime_timestamp_timezone) Test Date/Time Picker/Time zone Combo (serialized DateTime object)
 1. [`colorpicker`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#colorpicker) Color picker
-1. [`radio`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#radio)
-1. [`radio_inline`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#radio_inline)
-1. [`taxonomy_radio`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#taxonomy_radio)
-1. [`taxonomy_radio_inline`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#taxonomy_radio_inline)
+1. [`radio`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#radio) *
+1. [`radio_inline`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#radio_inline) *
+1. [`taxonomy_radio`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#taxonomy_radio) *
+1. [`taxonomy_radio_inline`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#taxonomy_radio_inline) *
 1. [`select`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#select)
-1. [`taxonomy_select`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#taxonomy_select)
-1. [`checkbox`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#checkbox)
+1. [`taxonomy_select`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#taxonomy_select) *
+1. [`checkbox`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#checkbox) *
 1. [`multicheck`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#multicheck)
-1. [`taxonomy_multicheck`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#taxonomy_multicheck)
+1. [`taxonomy_multicheck`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#taxonomy_multicheck) *
 1. [`taxonomy_multicheck_inline`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#taxonomy_multicheck_inline)
-1. [`wysiwyg`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#wysiwyg) (TinyMCE) **
+1. [`wysiwyg`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#wysiwyg) (TinyMCE) *
 1. [`file`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#file) Image/File upload *†
 1. [`file_list`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#file_list) Image/File list upload
 1. [`oembed`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#oembed) Converts oembed urls (instagram, twitter, youtube, etc. [oEmbed in the Codex](https://codex.wordpress.org/Embeds))
 1. [`group`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#group) Hybrid field that supports adding other fields as a repeatable group. *
 1. [Create your own custom field type](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#Custom)
 
-\* Not available as a repeatable field
-\** Repeatable field support is in beta
-† Use `file_list`
+\* Not available as a repeatable field  
+† Use `file_list` for repeatable  
 
 [More on field types (GitHub wiki)](https://github.com/webdevstudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types)
 
@@ -87,7 +86,7 @@ Features:
 This script is easy to install. If you can't figure it out you probably shouldn't be using it.
 
 1. Place `metabox` directory inside of your (activated) theme. E.g. inside `/themes/twentyten/lib/metabox/`.
-2. Include `init.php` (preferably on the 'init' WordPress hook).
+2. Include `init.php` (no earlier than on the `init` WordPress hook, preferably at a late priority).
 3. See `example-functions.php` for further guidance.
 4. Profit.
 
@@ -114,6 +113,20 @@ This script is easy to install. If you can't figure it out you probably shouldn'
 
 ## Changelog
 
+### 1.0.3
+
+**Enhancements**
+
+* Repeatable groups
+* Support for more fields to be repeatable, including oEmbed field, and date, time, and color picker fields.
+* Codebase has been revamped to be more modular and object-oriented. 
+* New filter, `"cmb_{$element}_attributes"	` for modifying an element's attributes.
+* Every field now supports an `attributes` parameter that takes an array of attributes.
+* Removed `cmb_std_filter` in favor of `cmb_default_filter`. **THIS IS A BREAKING CHANGE**
+
+**Bug Fixes**
+
+
 ### 1.0.2
 
 **Enhancements**
@@ -122,7 +135,7 @@ This script is easy to install. If you can't figure it out you probably shouldn'
 It is now passed a null value vs saved value. If null is returned, default sanitization will follow. **THIS IS A BREAKING CHANGE**. If you're already using this filter, take note.
 * All field types that take an option array have been simplified to take `key => value` pairs (vs `array( 'name' => 'value', 'value' => 'key', )`). This effects the 'select', 'radio', 'radio_inline' field types. The 'multicheck' field type was already using the `key => value` format. Backwards compatibility has been maintained for those using the older style.
 * Added default value option for `taxonomy_select` field type. props [@darlantc](https://github.com/darlantc)
-* Added option to specify image preview size for `file_list` field type. props [@IgorCode](https://github.com/IgorCode)
+* Added `preview_size` parameter for `file_list` field type. props [@IgorCode](https://github.com/IgorCode)
 * Updated `file_list` images to be displayed horizontally instead of vertically. props [@IgorCode](https://github.com/IgorCode)
 * Use `get_the_terms` where possible since the data is cached.
 

From 14a8b18e804cfd3a0b86a9d96a1425c33f978908 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Wed, 2 Apr 2014 11:07:25 -0400
Subject: [PATCH 65/71] Add "attributes" paramter feature to feature list

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

diff --git a/readme.md b/readme.md
index 10349dc..f1d404d 100644
--- a/readme.md
+++ b/readme.md
@@ -121,7 +121,7 @@ This script is easy to install. If you can't figure it out you probably shouldn'
 * Support for more fields to be repeatable, including oEmbed field, and date, time, and color picker fields.
 * Codebase has been revamped to be more modular and object-oriented. 
 * New filter, `"cmb_{$element}_attributes"	` for modifying an element's attributes.
-* Every field now supports an `attributes` parameter that takes an array of attributes.
+* Every field now supports an `attributes` parameter that takes an array of attributes. [Read more](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#attributes).
 * Removed `cmb_std_filter` in favor of `cmb_default_filter`. **THIS IS A BREAKING CHANGE**
 
 **Bug Fixes**

From 4bb65937e61d3d4738e79376370443304d2cc343 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Wed, 2 Apr 2014 11:11:42 -0400
Subject: [PATCH 66/71] bump readme version #

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

diff --git a/readme.md b/readme.md
index f1d404d..8b92b87 100644
--- a/readme.md
+++ b/readme.md
@@ -7,9 +7,9 @@
 * Bill Erickson ( [@billerickson](http://twitter.com/billerickson ) / [billerickson.net](http://billerickson.net/) )
 * Andrew Norcross ( [@norcross](http://twitter.com/norcross ) / [andrewnorcross.com](http://andrewnorcross.com/) )
 
-**Version**: 1.0.2  
+**Version**: 1.0.3  
 **Requires at least**: 3.5  
-**Tested up to**: 3.8  
+**Tested up to**: 3.9-alpha  
 **License**: GPLv2  
 
 ## Description
@@ -22,7 +22,7 @@ Features:
 * Create forms to be used on options pages.
 * Create forms to handle user meta and display them on user profile add/edit pages.
 * Flexible API that allows you to use CMB forms almost anywhere, even on the front-end.
-* Several field types are included and are [listed below](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress#field-types).
+* Several field types are included and are [listed below](#field-types).
 * Custom API hook that allows you to create your own field types.
 * There are numerous hooks and filters, allowing you to modify many aspects of the library (without editing it directly).
 * Repeatable fields for most field types are supported, as well as repeatable field groups.

From 175018e6a17083be51379211e34ae35fb900e27c Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Wed, 2 Apr 2014 11:13:54 -0400
Subject: [PATCH 67/71] include full urls

---
 readme.md | 68 +++++++++++++++++++++++++++----------------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/readme.md b/readme.md
index 8b92b87..26355c9 100644
--- a/readme.md
+++ b/readme.md
@@ -42,39 +42,39 @@ Features:
 * [Taxonomy_MetaData](https://github.com/jtsternberg/Taxonomy_MetaData#to-use-taxonomy_metadata-with-custom-metaboxes-and-fields): WordPress Helper Class for saving pseudo-metadata for taxonomy terms. Includes an extended class for using CMB to generate the actual form fields.
 
 ##### Field Types:
-1. [`title`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#title) An arbitrary title field *
-1. [`text`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text)
-1. [`text_small`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_small)
-1. [`text_medium`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_medium)
-1. [`text_email`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_email)
-1. [`text_url`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_url)
-1. [`text_money`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_money)
-1. [`textarea`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#textarea)
-1. [`textarea_small`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#textarea_small)
-1. [`textarea_code`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#textarea_code)
-1. [`text_date`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_date) Date Picker
-1. [`text_time`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_time) Time picker
-1. [`select_timezone`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#select_timezone) Time zone dropdown
-1. [`text_date_timestamp`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_date_timestamp) Date Picker (UNIX timestamp)
-1. [`text_datetime_timestamp`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_datetime_timestamp) Test Date/Time Picker Combo (UNIX timestamp)
-1. [`text_datetime_timestamp_timezone`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_datetime_timestamp_timezone) Test Date/Time Picker/Time zone Combo (serialized DateTime object)
-1. [`colorpicker`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#colorpicker) Color picker
-1. [`radio`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#radio) *
-1. [`radio_inline`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#radio_inline) *
-1. [`taxonomy_radio`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#taxonomy_radio) *
-1. [`taxonomy_radio_inline`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#taxonomy_radio_inline) *
-1. [`select`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#select)
-1. [`taxonomy_select`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#taxonomy_select) *
-1. [`checkbox`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#checkbox) *
-1. [`multicheck`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#multicheck)
-1. [`taxonomy_multicheck`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#taxonomy_multicheck) *
-1. [`taxonomy_multicheck_inline`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#taxonomy_multicheck_inline)
-1. [`wysiwyg`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#wysiwyg) (TinyMCE) *
-1. [`file`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#file) Image/File upload *†
-1. [`file_list`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#file_list) Image/File list upload
-1. [`oembed`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#oembed) Converts oembed urls (instagram, twitter, youtube, etc. [oEmbed in the Codex](https://codex.wordpress.org/Embeds))
-1. [`group`](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#group) Hybrid field that supports adding other fields as a repeatable group. *
-1. [Create your own custom field type](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#Custom)
+1. [`title`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#title) An arbitrary title field *
+1. [`text`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text)
+1. [`text_small`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_small)
+1. [`text_medium`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_medium)
+1. [`text_email`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_email)
+1. [`text_url`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_url)
+1. [`text_money`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_money)
+1. [`textarea`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#textarea)
+1. [`textarea_small`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#textarea_small)
+1. [`textarea_code`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#textarea_code)
+1. [`text_date`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_date) Date Picker
+1. [`text_time`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_time) Time picker
+1. [`select_timezone`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#select_timezone) Time zone dropdown
+1. [`text_date_timestamp`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_date_timestamp) Date Picker (UNIX timestamp)
+1. [`text_datetime_timestamp`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_datetime_timestamp) Test Date/Time Picker Combo (UNIX timestamp)
+1. [`text_datetime_timestamp_timezone`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#text_datetime_timestamp_timezone) Test Date/Time Picker/Time zone Combo (serialized DateTime object)
+1. [`colorpicker`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#colorpicker) Color picker
+1. [`radio`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#radio) *
+1. [`radio_inline`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#radio_inline) *
+1. [`taxonomy_radio`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#taxonomy_radio) *
+1. [`taxonomy_radio_inline`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#taxonomy_radio_inline) *
+1. [`select`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#select)
+1. [`taxonomy_select`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#taxonomy_select) *
+1. [`checkbox`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#checkbox) *
+1. [`multicheck`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#multicheck)
+1. [`taxonomy_multicheck`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#taxonomy_multicheck) *
+1. [`taxonomy_multicheck_inline`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#taxonomy_multicheck_inline)
+1. [`wysiwyg`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#wysiwyg) (TinyMCE) *
+1. [`file`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#file) Image/File upload *†
+1. [`file_list`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#file_list) Image/File list upload
+1. [`oembed`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#oembed) Converts oembed urls (instagram, twitter, youtube, etc. [oEmbed in the Codex](https://codex.wordpress.org/Embeds))
+1. [`group`](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#group) Hybrid field that supports adding other fields as a repeatable group. *
+1. [Create your own custom field type](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#Custom)
 
 \* Not available as a repeatable field  
 † Use `file_list` for repeatable  
@@ -121,7 +121,7 @@ This script is easy to install. If you can't figure it out you probably shouldn'
 * Support for more fields to be repeatable, including oEmbed field, and date, time, and color picker fields.
 * Codebase has been revamped to be more modular and object-oriented. 
 * New filter, `"cmb_{$element}_attributes"	` for modifying an element's attributes.
-* Every field now supports an `attributes` parameter that takes an array of attributes. [Read more](/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#attributes).
+* Every field now supports an `attributes` parameter that takes an array of attributes. [Read more](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#attributes).
 * Removed `cmb_std_filter` in favor of `cmb_default_filter`. **THIS IS A BREAKING CHANGE**
 
 **Bug Fixes**

From f021381c31362dd192272f08df15ad942d8b3c5d Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Wed, 2 Apr 2014 11:53:20 -0400
Subject: [PATCH 68/71] Update minified js

---
 js/cmb.min.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/js/cmb.min.js b/js/cmb.min.js
index 0053512..d21b2b7 100644
--- a/js/cmb.min.js
+++ b/js/cmb.min.js
@@ -17,14 +17,14 @@ return false;}e.formfield=i.attr("rel");var h=i.parents(".img_status");e.metabox
 if(!h.length){i.parents(".cmb_media_status").html("");}else{h.html("");}return false;};d.fn.replaceText=function(g,h,i){return this.each(function(){var k=this.firstChild,j,l,m=[];
 if(k){do{if(k.nodeType===3){j=k.nodeValue;l=j.replace(g,h);if(l!==j){if(!i&&/</.test(l)){d(k).before(l);m.push(k);}else{k.nodeValue=l;}}}}while(k=k.nextSibling);
 }m.length&&d(m).remove();});};d.fn.cleanRow=function(h,i){var j=d(this);var g=j.find('input:not([type="button"]), select, textarea, label');if(i){j.find(".cmb-repeat-table .repeat-row:not(:first-child)").remove();
-}e.$focus=false;e.neweditor_id=[];d(":checked",this).removeAttr("checked");d(":selected",this).removeAttr("selected");g.each(function(){var u=d(this);var m=u.prop("tagName");
-var l=u.hasClass("wp-editor-area");var n=u.attr("for");var p=u.next();e.log("input",u.prop("tagName"),"LABEL"===u.prop("tagName")?u.attr("for"):u.attr("name"));
-var v={};if(n){v={"for":n.replace("_"+h,"_"+e.idNumber)};}else{var k=u.attr("name");var t=k?k.replace(h,e.idNumber):"";var r=u.attr("id");var s=r?r.replace("_"+h,"_"+e.idNumber):"";
-v={id:s,name:t,"data-iterator":e.idNumber,};}u.removeClass("hasDatepicker").attr(v).val("");if(l){s=s?r.replace("zx"+h,"zx"+e.idNumber):"";u.html("");var o=u.parents(".cmb-type-wysiwyg");
-o.find(".mce-tinymce:not(:first-child)").remove();var q=o.html().replace(new RegExp(r,"g"),s);o.html(q);e.neweditor_id.push({id:s,old:r});}e.$focus=e.$focus?e.$focus:u;
-});return this;};d.fn.newRowHousekeeping=function(){var g=d(this);var i=g.find(".wp-picker-container");var h=g.find(".cmb_media_status");if(i.length){i.each(function(){var j=d(this).parent();
-j.html(j.find("input:text.cmb_colorpicker").attr("style",""));});}if(h.length){h.empty();}return this;};e.afterRowInsert=function(j){if(e.$focus){e.$focus.focus();
-}if(e.neweditor_id.length){var l;for(l=e.neweditor_id.length-1;l>=0;l--){var n=e.neweditor_id[l].id;var k=e.neweditor_id[l].old;if(typeof(tinyMCEPreInit.mceInit[n])==="undefined"){var h=jQuery.extend({},tinyMCEPreInit.mceInit[k]);
+}e.$focus=false;e.neweditor_id=[];g.filter(":checked").removeAttr("checked");g.filter(":selected").removeAttr("selected");g.each(function(){var t=d(this);
+var l=t.hasClass("wp-editor-area");var m=t.attr("for");var o=t.next();var u={};if(m){u={"for":m.replace("_"+h,"_"+e.idNumber)};}else{var k=t.attr("name");
+var s=k?k.replace(h,e.idNumber):"";var q=t.attr("id");var r=q?q.replace("_"+h,"_"+e.idNumber):"";u={id:r,name:s,"data-iterator":e.idNumber,};}t.removeClass("hasDatepicker").attr(u).val("");
+if(l){r=r?q.replace("zx"+h,"zx"+e.idNumber):"";t.html("");var n=t.parents(".cmb-type-wysiwyg");n.find(".mce-tinymce:not(:first-child)").remove();var p=n.html().replace(new RegExp(q,"g"),r);
+n.html(p);e.neweditor_id.push({id:r,old:q});}e.$focus=e.$focus?e.$focus:t;});return this;};d.fn.newRowHousekeeping=function(){var g=d(this);var i=g.find(".wp-picker-container");
+var h=g.find(".cmb_media_status");if(i.length){i.each(function(){var j=d(this).parent();j.html(j.find("input:text.cmb_colorpicker").attr("style",""));});
+}if(h.length){h.empty();}return this;};e.afterRowInsert=function(j){if(e.$focus){e.$focus.focus();}if(e.neweditor_id.length){var l;for(l=e.neweditor_id.length-1;
+l>=0;l--){var n=e.neweditor_id[l].id;var k=e.neweditor_id[l].old;if(typeof(tinyMCEPreInit.mceInit[n])==="undefined"){var h=jQuery.extend({},tinyMCEPreInit.mceInit[k]);
 for(var m in h){if("string"===typeof(h[m])){h[m]=h[m].replace(new RegExp(k,"g"),n);}}tinyMCEPreInit.mceInit[n]=h;}if(typeof(tinyMCEPreInit.qtInit[n])==="undefined"){var g=jQuery.extend({},tinyMCEPreInit.qtInit[k]);
 for(var m in g){if("string"===typeof(g[m])){g[m]=g[m].replace(new RegExp(k,"g"),n);}}tinyMCEPreInit.qtInit[n]=g;}tinyMCE.init({id:tinyMCEPreInit.mceInit[n],});
 }}e.initPickers(j.find("input:text.cmb_timepicker"),j.find("input:text.cmb_datepicker"),j.find("input:text.cmb_colorpicker"));};e.addGroupRow=function(l){l.preventDefault();

From 98ae2fa7e2051a4f310b2f4079640d39194b4495 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Wed, 2 Apr 2014 12:18:45 -0400
Subject: [PATCH 69/71] Remove `escape_cb` parameter from `cmb_get_field_value`
 function, since that should be handled by the `field_args` array.

---
 init.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/init.php b/init.php
index 6ec7662..fed9a3c 100644
--- a/init.php
+++ b/init.php
@@ -1029,14 +1029,11 @@ function cmb_get_field( $field_args, $object_id = 0, $object_type = 'post' ) {
  * @param  array  $field_args  Field arguments
  * @param  int    $object_id   Object ID
  * @param  string $object_type Type of object being saved. (e.g., post, user, or comment)
- * @param  mixed $func         Escaping function (if not esc_attr()) or false for no escaping
  * @return mixed               Maybe escaped value
  */
-function cmb_get_field_value( $field_args, $object_id = 0, $object_type = 'post', $escape_cb = 'esc_attr' ) {
+function cmb_get_field_value( $field_args, $object_id = 0, $object_type = 'post' ) {
 	$field = cmb_get_field( $object_id, $field_args, $object_type );
-	if ( false === $escape_cb )
-		return $field->value();
-	return $field->escaped_value( $escape_cb );
+	return $field->escaped_value();
 }
 
 /**

From 6ead10818cb40965aa5f30a52b005312c7f21a2b Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Wed, 2 Apr 2014 12:19:48 -0400
Subject: [PATCH 70/71] Remove `escape_cb` parameter from `cmb_get_field_value`
 function, since that should be handled by the `field_args` array.

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

diff --git a/init.php b/init.php
index fed9a3c..8f2e63e 100644
--- a/init.php
+++ b/init.php
@@ -1024,7 +1024,7 @@ function cmb_get_field( $field_args, $object_id = 0, $object_type = 'post' ) {
 }
 
 /**
- * Get a field's (optionally escaped) value.
+ * Get a field's value.
  * @since  1.0.3
  * @param  array  $field_args  Field arguments
  * @param  int    $object_id   Object ID

From c61f4978a50b7f31da0736cf1847fb7fa6380ea0 Mon Sep 17 00:00:00 2001
From: Justin Sternberg <justin@dsgnwrks.pro>
Date: Wed, 2 Apr 2014 12:57:56 -0400
Subject: [PATCH 71/71] bump version to 1.1.0 to keep with Semantic Versioning

---
 helpers/cmb_Meta_Box_Sanitize.php |  8 ++++----
 helpers/cmb_Meta_Box_field.php    | 34 +++++++++++++++----------------
 helpers/cmb_Meta_Box_types.php    | 28 ++++++++++++-------------
 init.php                          | 10 ++++-----
 readme.md                         | 14 +++++++++----
 5 files changed, 50 insertions(+), 44 deletions(-)

diff --git a/helpers/cmb_Meta_Box_Sanitize.php b/helpers/cmb_Meta_Box_Sanitize.php
index 8f31e80..e451dc9 100644
--- a/helpers/cmb_Meta_Box_Sanitize.php
+++ b/helpers/cmb_Meta_Box_Sanitize.php
@@ -20,7 +20,7 @@ class cmb_Meta_Box_Sanitize {
 
 	/**
 	 * Setup our class vars
-	 * @since 1.0.3
+	 * @since 1.1.0
 	 * @param object $field A CMB field object
 	 * @param mixed  $value Field value
 	 */
@@ -263,7 +263,7 @@ public function textarea_code( $value, $repeat = false ) {
 
 	/**
 	 * Peforms saving of `file` attachement's ID
-	 * @since  1.0.3
+	 * @since  1.1.0
 	 * @param  string $value File url
 	 */
 	public function _save_file_id( $value ) {
@@ -310,7 +310,7 @@ public function _save_file_id( $value ) {
 
 	/**
 	 * Handles saving of attachment post ID and sanitizing file url
-	 * @since  1.0.3
+	 * @since  1.1.0
 	 * @param  string $value File url
 	 * @return string        Sanitized url
 	 */
@@ -327,7 +327,7 @@ public function file( $value ) {
 
 	/**
 	 * If repeating, loop through and re-apply sanitization method
-	 * @since  1.0.3
+	 * @since  1.1.0
 	 * @param  mixed  $value  Meta value
 	 * @param  string $method Class method
 	 * @param  bool   $repeat Whether repeating or not
diff --git a/helpers/cmb_Meta_Box_field.php b/helpers/cmb_Meta_Box_field.php
index e3ca1b0..4d755af 100644
--- a/helpers/cmb_Meta_Box_field.php
+++ b/helpers/cmb_Meta_Box_field.php
@@ -2,48 +2,48 @@
 
 /**
  * CMB field class
- * @since  1.0.3
+ * @since  1.1.0
  */
 class cmb_Meta_Box_field {
 
 	/**
 	 * Metabox object id
 	 * @var   mixed
-	 * @since 1.0.3
+	 * @since 1.1.0
 	 */
 	public $object_id;
 
 	/**
 	 * Metabox object type
 	 * @var   mixed
-	 * @since 1.0.3
+	 * @since 1.1.0
 	 */
 	public $object_type;
 
 	/**
 	 * Field arguments
 	 * @var   mixed
-	 * @since 1.0.3
+	 * @since 1.1.0
 	 */
 	public $args;
 
 	/**
 	 * Field group object
 	 * @var   mixed
-	 * @since 1.0.3
+	 * @since 1.1.0
 	 */
 	public $group;
 
 	/**
 	 * Field meta value
 	 * @var   mixed
-	 * @since 1.0.3
+	 * @since 1.1.0
 	 */
 	public $value;
 
 	/**
 	 * Constructs our field object
-	 * @since 1.0.3
+	 * @since 1.1.0
 	 * @param array $field_args  Field arguments
 	 * @param array $group_field (optional) Group field object
 	 */
@@ -65,7 +65,7 @@ public function __construct( $field_args, $group_field = null ) {
 
 	/**
 	 * Non-existent methods fallback to checking for field arguments of the same name
-	 * @since  1.0.3
+	 * @since  1.1.0
 	 * @param  string $name     Method name
 	 * @param  array  $arguments Array of passed-in arguments
 	 * @return mixed             Value of field argument
@@ -77,7 +77,7 @@ public function __call( $name, $arguments ) {
 
 	/**
 	 * Retrieves the field id
-	 * @since  1.0.3
+	 * @since  1.1.0
 	 * @param  boolean $raw Whether to retrieve pre-modidifed id
 	 * @return string       Field id
 	 */
@@ -88,7 +88,7 @@ public function id( $raw = false ) {
 
 	/**
 	 * Get a field argument
-	 * @since  1.0.3
+	 * @since  1.1.0
 	 * @param  string $key Argument to check
 	 * @param  string $key Sub argument to check
 	 * @return mixed       Argument value or false if non-existent
@@ -103,7 +103,7 @@ public function args( $key = '', $_key = '' ) {
 
 	/**
 	 * Get Field's value
-	 * @since  1.0.3
+	 * @since  1.1.0
 	 * @param  string $key If value is an array, is used to get array key->value
 	 * @return mixed       Field value or false if non-existent
 	 */
@@ -113,7 +113,7 @@ public function value( $key = '' ) {
 
 	/**
 	 * Retrieve a portion of a field property
-	 * @since  1.0.3
+	 * @since  1.1.0
 	 * @param  string  $var Field property to check
 	 * @param  string  $key Field property array key to check
 	 * @return mixed        Queried property value or false
@@ -187,7 +187,7 @@ public function remove_data( $old = '' ) {
 
 	/**
 	 * data variables for get/set data methods
-	 * @since  1.0.3
+	 * @since  1.1.0
 	 * @param  array $args Override arguments
 	 * @return array       Updated arguments
 	 */
@@ -251,7 +251,7 @@ public function maybe_callback( $cb ) {
 
 	/**
 	 * Determine if current type is excempt from escaping
-	 * @since  1.0.3
+	 * @since  1.1.0
 	 * @return bool  True if exempt
 	 */
 	public function escaping_exception() {
@@ -265,7 +265,7 @@ public function escaping_exception() {
 
 	/**
 	 * Determine if current type cannot be repeatable
-	 * @since  1.0.3
+	 * @since  1.1.0
 	 * @param  string $type Field type to check
 	 * @return bool         True if type cannot be repeatable
 	 */
@@ -414,7 +414,7 @@ public function render_field() {
 
 	/**
 	 * Fills in empty field parameters with defaults
-	 * @since 1.0.3
+	 * @since 1.1.0
 	 * @param array $args Metabox field config array
 	 */
 	public function _set_field_defaults( $args ) {
@@ -468,7 +468,7 @@ public function _set_field_defaults( $args ) {
 
 	/**
 	 * Updates attributes array values unless they exist from the field config array
-	 * @since 1.0.3
+	 * @since 1.1.0
 	 * @param array $attrs Array of attributes to update
 	 */
 	public function maybe_set_attributes( $attrs = array() ) {
diff --git a/helpers/cmb_Meta_Box_types.php b/helpers/cmb_Meta_Box_types.php
index 3439c79..f59d880 100644
--- a/helpers/cmb_Meta_Box_types.php
+++ b/helpers/cmb_Meta_Box_types.php
@@ -41,7 +41,7 @@ public function __call( $name, $arguments ) {
 
 	/**
 	 * Render a field (and handle repeatable)
-	 * @since  1.0.3
+	 * @since  1.1.0
 	 */
 	public function render() {
 		if ( $this->field->args( 'repeatable' ) ) {
@@ -53,7 +53,7 @@ public function render() {
 
 	/**
 	 * Render a field type
-	 * @since  1.0.3
+	 * @since  1.1.0
 	 */
 	protected function _render() {
 		echo $this->{$this->field->type()}();
@@ -117,7 +117,7 @@ public function is_valid_img_ext( $file ) {
 
 	/**
 	 * Handles parsing and filtering attributes while preserving any passed in via field config.
-	 * @since  1.0.3
+	 * @since  1.1.0
 	 * @param  array  $args     Override arguments
 	 * @param  string $element  Element for filter
 	 * @param  array  $defaults Default arguments
@@ -129,7 +129,7 @@ public function parse_args( $args, $element, $defaults ) {
 
 	/**
 	 * Combines attributes into a string for a form element
-	 * @since  1.0.3
+	 * @since  1.1.0
 	 * @param  array  $attrs        Attributes to concatenate
 	 * @param  array  $attr_exclude Attributes that should NOT be concatenated
 	 * @return string               String of attributes for form element
@@ -145,7 +145,7 @@ public function concat_attrs( $attrs, $attr_exclude = array() ) {
 
 	/**
 	 * Generates html for an option element
-	 * @since  1.0.3
+	 * @since  1.1.0
 	 * @param  string  $opt_label Option label
 	 * @param  string  $opt_value Option value
 	 * @param  mixed   $selected  Selected attribute if option is selected
@@ -157,7 +157,7 @@ public function option( $opt_label, $opt_value, $selected ) {
 
 	/**
 	 * Generates options html
-	 * @since  1.0.3
+	 * @since  1.1.0
 	 * @param  array   $args   Optional arguments
 	 * @param  string  $method Method to generate individual option item
 	 * @return string          Concatenated html options
@@ -193,7 +193,7 @@ public function concat_options( $args = array(), $method = 'list_input' ) {
 
 	/**
 	 * Generates html for list item with input
-	 * @since  1.0.3
+	 * @since  1.1.0
 	 * @param  array  $args Override arguments
 	 * @param  int    $i    Iterator value
 	 * @return string       Gnerated list item html
@@ -213,7 +213,7 @@ public function list_input( $args = array(), $i ) {
 
 	/**
 	 * Generates html for list item with checkbox input
-	 * @since  1.0.3
+	 * @since  1.1.0
 	 * @param  array  $args Override arguments
 	 * @param  int    $i    Iterator value
 	 * @return string       Gnerated list item html
@@ -253,7 +253,7 @@ public function render_repeatable_field() {
 
 	/**
 	 * Generates repeatable field rows
-	 * @since  1.0.3
+	 * @since  1.1.0
 	 */
 	public function repeatable_rows() {
 		$meta_value = $this->field->escaped_value();
@@ -288,7 +288,7 @@ public function repeatable_rows() {
 
 	/**
 	 * Generates a repeatable row's markup
-	 * @since  1.0.3
+	 * @since  1.1.0
 	 * @param  string  $class Repeatable table row's class
 	 */
 	protected function repeat_row( $class = 'repeat-row' ) {
@@ -327,7 +327,7 @@ public function _desc( $paragraph = false, $echo = false ) {
 
 	/**
 	 * Generate field name attribute
-	 * @since  1.0.3
+	 * @since  1.1.0
 	 * @param  string  $suffix For multi-part fields
 	 * @return string          Name attribute
 	 */
@@ -337,7 +337,7 @@ public function _name( $suffix = '' ) {
 
 	/**
 	 * Generate field id attribute
-	 * @since  1.0.3
+	 * @since  1.1.0
 	 * @param  string  $suffix For multi-part fields
 	 * @return string          Id attribute
 	 */
@@ -347,7 +347,7 @@ public function _id( $suffix = '' ) {
 
 	/**
 	 * Handles outputting an 'input' element
-	 * @since  1.0.3
+	 * @since  1.1.0
 	 * @param  array  $args Override arguments
 	 * @return string       Form input element
 	 */
@@ -366,7 +366,7 @@ public function input( $args = array() ) {
 
 	/**
 	 * Handles outputting an 'textarea' element
-	 * @since  1.0.3
+	 * @since  1.1.0
 	 * @param  array  $args Override arguments
 	 * @return string       Form textarea element
 	 */
diff --git a/init.php b/init.php
index 8f2e63e..8d6a982 100644
--- a/init.php
+++ b/init.php
@@ -6,7 +6,7 @@
 				Bill Erickson (@billerickson / billerickson.net)
 				Justin Sternberg (@jtsternberg / dsgnwrks.pro)
 Description: 	This will create metaboxes with custom fields that will blow your mind.
-Version: 		1.0.3
+Version: 		1.1.0
 */
 
 /**
@@ -54,7 +54,7 @@ class cmb_Meta_Box {
 	 * @var   string
 	 * @since 1.0.0
 	 */
-	const CMB_VERSION = '1.0.3';
+	const CMB_VERSION = '1.1.0';
 
 	/**
 	 * Metabox Config array
@@ -133,7 +133,7 @@ class cmb_Meta_Box {
 	/**
 	 * List of fields that are changed/updated on save
 	 * @var   array
-	 * @since 1.0.3
+	 * @since 1.1.0
 	 */
 	protected static $updated = array();
 
@@ -1008,7 +1008,7 @@ function cmb_get_option( $option_key, $field_id = '' ) {
 
 /**
  * Get a CMB field object.
- * @since  1.0.3
+ * @since  1.1.0
  * @param  array  $field_args  Field arguments
  * @param  int    $object_id   Object ID
  * @param  string $object_type Type of object being saved. (e.g., post, user, or comment)
@@ -1025,7 +1025,7 @@ function cmb_get_field( $field_args, $object_id = 0, $object_type = 'post' ) {
 
 /**
  * Get a field's value.
- * @since  1.0.3
+ * @since  1.1.0
  * @param  array  $field_args  Field arguments
  * @param  int    $object_id   Object ID
  * @param  string $object_type Type of object being saved. (e.g., post, user, or comment)
diff --git a/readme.md b/readme.md
index 26355c9..23df7b9 100644
--- a/readme.md
+++ b/readme.md
@@ -7,7 +7,7 @@
 * Bill Erickson ( [@billerickson](http://twitter.com/billerickson ) / [billerickson.net](http://billerickson.net/) )
 * Andrew Norcross ( [@norcross](http://twitter.com/norcross ) / [andrewnorcross.com](http://andrewnorcross.com/) )
 
-**Version**: 1.0.3  
+**Version**: 1.1.0  
 **Requires at least**: 3.5  
 **Tested up to**: 3.9-alpha  
 **License**: GPLv2  
@@ -113,18 +113,24 @@ This script is easy to install. If you can't figure it out you probably shouldn'
 
 ## Changelog
 
-### 1.0.3
+### 1.1.0
 
 **Enhancements**
 
 * Repeatable groups
-* Support for more fields to be repeatable, including oEmbed field, and date, time, and color picker fields.
+* Support for more fields to be repeatable, including oEmbed field, and date, time, and color picker fields, etc.
 * Codebase has been revamped to be more modular and object-oriented. 
 * New filter, `"cmb_{$element}_attributes"	` for modifying an element's attributes.
 * Every field now supports an `attributes` parameter that takes an array of attributes. [Read more](https://github.com/WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress/wiki/Field-Types#attributes).
 * Removed `cmb_std_filter` in favor of `cmb_default_filter`. **THIS IS A BREAKING CHANGE**
+* Better handling of labels in sidebar. They are now placed on top of the input rather than adjacent.
+* Added i18n compatibility to text_money. props [@ArchCarrier](https://github.com/ArchCarrier)
+* New helper functions: `cmb_get_field` and `cmb_get_field_value` for getting access to CMB's field object and/or value.
+* New JavaScript events, `cmb_add_row` and `cmb_remove_row` for hooking in and manipulating the new row's data.
+* New filter, `cmb_localized_data`, for modifiying localized data passed to the CMB JS.
 
 **Bug Fixes**
+* Resolved occasional issue where only the first character of the label/value was diplayed. props [@mustardBees](https://github.com/mustardBees)
 
 
 ### 1.0.2
@@ -143,7 +149,7 @@ It is now passed a null value vs saved value. If null is returned, default sanit
 
 * Fixed wysiwyg escaping slashes. props [@gregrickaby](https://github.com/gregrickaby)
 * Replaced `__DIR__`, as `dirname( __FILE__ )` is easier to maintain back-compatibility.
-* Fixed missing table styling on new posts. [@mustardBees](https://github.com/mustardBees)
+* Fixed missing table styling on new posts. props [@mustardBees](https://github.com/mustardBees)
 * Fix undeclared JS variable. [@veelen](https://github.com/veelen)
 * Fix `file_list` errors when removing all files and saving.
 * Set correct `object_id` to be used later in `cmb_show_on` filter. [@lauravaq](https://github.com/lauravaq)