From 25f95bfef21d5a9288cae23c42c18320d4435137 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Fri, 16 Oct 2015 23:56:12 -0400
Subject: [PATCH 01/76] Enable autocomplete when focusing an autocomplete-ready
 field

Autocomplete fields in the Customizer are not likely to be visible when
`fm.autocomplete.enable_autocomplete()` first fires. Rather than adding
another FM-specific event, this triggers `enable_autocomplete()`
whenever an uninitialized autocomplete input is focused.

Bonus: This affects autocomplete fields in widgets and menu items, too.
---
 js/fieldmanager-autocomplete.js | 10 +++++++---
 tests/js/index.html             |  8 ++++++++
 tests/js/test-fieldmanager.js   | 11 +++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/js/fieldmanager-autocomplete.js b/js/fieldmanager-autocomplete.js
index 2674395cc4..974f175f7b 100644
--- a/js/fieldmanager-autocomplete.js
+++ b/js/fieldmanager-autocomplete.js
@@ -1,4 +1,4 @@
-( function( $ ) {
+(function( $ ) {
 
 fm.autocomplete = {
 
@@ -34,7 +34,7 @@ fm.autocomplete = {
 								custom_data = custom_result;
 							}
 						}
-						
+
 						$.post( ajaxurl, {
 							action: $el.data( 'action' ),
 							fm_context: $el.data( 'context' ),
@@ -77,5 +77,9 @@ fm.autocomplete = {
 
 $( document ).ready( fm.autocomplete.enable_autocomplete );
 $( document ).on( 'fm_collapsible_toggle fm_added_element fm_displayif_toggle fm_activate_tab', fm.autocomplete.enable_autocomplete );
+$( document ).on( 'focus',
+	'input[class*="fm-autocomplete"]:not(.fm-autocomplete-enabled)',
+	fm.autocomplete.enable_autocomplete
+);
 
-} ) ( jQuery );
+})( jQuery );
diff --git a/tests/js/index.html b/tests/js/index.html
index de5a844789..929c42d98a 100644
--- a/tests/js/index.html
+++ b/tests/js/index.html
@@ -29,10 +29,13 @@
 			svn + '/src/wp-includes/js/jquery/ui/sortable.js',
 			svn + '/src/wp-includes/js/jquery/ui/draggable.js',
 			svn + '/src/wp-includes/js/jquery/ui/droppable.js',
+			svn + '/src/wp-includes/js/jquery/ui/menu.js',
+			svn + '/src/wp-includes/js/jquery/ui/autocomplete.js',
 		];
 
 		// Fieldmanager.
 		scripts.push( '../../js/fieldmanager.js' );
+		scripts.push( '../../js/fieldmanager-autocomplete.js' );
 
 		// Tests.
 		scripts.push( 'test-fieldmanager.js' );
@@ -99,6 +102,11 @@
 		</div>
 		-->
 
+		<div id="autocomplete">
+			<input type="text" id="ac-visible" class="fm-autocomplete">
+			<input type="text" id="ac-invisible" class="fm-autocomplete" style="display: none;">
+		</div>
+
 		<div id="renumbered" class="fm-wrapper" data-fm-array-position="1">
 			<div class="fm-item">
 				<div class="fm-element" name="mytest[0]">First</div>
diff --git a/tests/js/test-fieldmanager.js b/tests/js/test-fieldmanager.js
index fd39ca54a2..05dbc43d67 100644
--- a/tests/js/test-fieldmanager.js
+++ b/tests/js/test-fieldmanager.js
@@ -65,6 +65,17 @@
 		// assert.ok( $( '#di-456' ).is( ':visible' ), "hide display-if value of '456'" );
 	});
 
+	QUnit.test( 'Autocomplete', function( assert ) {
+		assert.ok( $( '#ac-visible' ).hasClass( 'fm-autocomplete-enabled' ) );
+
+		var $invisible = $( '#ac-invisible' );
+		assert.notOk( $invisible.hasClass( 'fm-autocomplete-enabled' ) );
+
+		// Simulate activating autocomplete by focusing an element.
+		$invisible.show().focus();
+		assert.ok( $invisible.hasClass( 'fm-autocomplete-enabled' ) );
+	});
+
 	QUnit.test( 'Renumber', function( assert ) {
 		// Reorganize the items in the simple group.
 		var $fieldLast = $( '#renumbered .fm-item' ).last();

From 370d191e502a9d4239cbc97611da779640ba3d41 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sun, 15 Nov 2015 11:15:02 -0500
Subject: [PATCH 02/76] Allow init_sortable() and init_label_macros() to be
 triggered externally

These handlers allow contexts (immediately, the Customizer context) or
third-party extensions to reinitialize these features after events not
relevant to fieldmanager.js.
---
 js/fieldmanager.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/js/fieldmanager.js b/js/fieldmanager.js
index d26d8d9657..cd63f1ee5f 100644
--- a/js/fieldmanager.js
+++ b/js/fieldmanager.js
@@ -200,6 +200,8 @@ $( document ).ready( function () {
 	init_sortable();
 
 	$( document ).on( 'fm_activate_tab', init_sortable );
+	$( document ).on( 'fm_init_sortable', init_sortable );
+	$( document ).on( 'fm_init_label_macros', init_label_macros );
 } );
 
 } )( jQuery );

From 490f7a83bf90db6ecb4581508901a4098690e27f Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sun, 15 Nov 2015 11:27:15 -0500
Subject: [PATCH 03/76] Add the basics of a Customizer context

---
 css/fieldmanager.css                          |  17 +-
 fieldmanager.php                              |  20 +++
 js/fieldmanager-customize.js                  | 170 ++++++++++++++++++
 php/class-fieldmanager-customize-control.php  |  47 +++++
 php/class-fieldmanager-field.php              |  11 ++
 .../class-fieldmanager-context-customizer.php | 129 +++++++++++++
 6 files changed, 393 insertions(+), 1 deletion(-)
 create mode 100644 js/fieldmanager-customize.js
 create mode 100644 php/class-fieldmanager-customize-control.php
 create mode 100644 php/context/class-fieldmanager-context-customizer.php

diff --git a/css/fieldmanager.css b/css/fieldmanager.css
index 74273b8e0f..1c8b3d1b77 100644
--- a/css/fieldmanager.css
+++ b/css/fieldmanager.css
@@ -305,4 +305,19 @@ a.fm-delete:hover {
 .form-field .fm-option label,
 .form-field .fm-checkbox label {
 	display: inline;
-}
\ No newline at end of file
+}
+
+.wp-customizer .ui-autocomplete {
+	/* Hoist the autocomplete popup over who-knows-what in the Customizer. */
+	z-index: 500000;
+}
+
+.wp-customizer .fmjs-removable .fmjs-drag-icon {
+	/* Nudge for the Customizer. */
+	margin-top: 7px;
+}
+
+.wp-customizer .fmjs-removable .fmjs-drag-icon + .fmjs-removable-element {
+	/* Nudge for the Customizer. */
+	max-width: 90%;
+}
diff --git a/fieldmanager.php b/fieldmanager.php
index 4196314852..ef60de4eb4 100644
--- a/fieldmanager.php
+++ b/fieldmanager.php
@@ -69,6 +69,11 @@ function fieldmanager_load_class( $class ) {
 		}
 		return fieldmanager_load_file( 'datasource/class-fieldmanager-datasource-' . $class_id . '.php' );
 	}
+
+	if ( 'Fieldmanager_Customize_Control' === $class ) {
+		return fieldmanager_load_file( 'class-fieldmanager-customize-control.php' );
+	}
+
 	return fieldmanager_load_file( 'class-fieldmanager-' . $class_id . '.php', $class );
 }
 
@@ -181,6 +186,12 @@ function fm_add_script( $handle, $path, $deps = array(), $ver = false, $in_foote
 
 	add_action( 'admin_enqueue_scripts', $add_script );
 	add_action( 'wp_enqueue_scripts', $add_script );
+	/*
+	 * Use a later priority because 'customize_controls_enqueue_scripts' will be
+	 * in the middle of firing at the default priority when
+	 * Fieldmanager_Customize_Control::enqueue() calls this.
+	 */
+	add_action( 'customize_controls_enqueue_scripts', $add_script, 20 );
 }
 
 /**
@@ -278,6 +289,11 @@ function fm_get_context() {
  * }
  */
 function fm_calculate_context() {
+	// Consider the Customizer preview authoritative.
+	if ( is_customize_preview() ) {
+		return array( 'customizer', null );
+	}
+
 	// Safe to use at any point in the load process, and better than URL matching.
 	if ( is_admin() ) {
 		$script = substr( $_SERVER['PHP_SELF'], strrpos( $_SERVER['PHP_SELF'], '/' ) + 1 );
@@ -312,6 +328,10 @@ function fm_calculate_context() {
 			}
 		}
 
+		if ( 'customize.php' === $script || is_customize_preview() ) {
+			return array( 'customizer', null );
+		}
+
 		switch ( $script ) {
 			// Context = "post".
 			case 'post.php':
diff --git a/js/fieldmanager-customize.js b/js/fieldmanager-customize.js
new file mode 100644
index 0000000000..3af361e747
--- /dev/null
+++ b/js/fieldmanager-customize.js
@@ -0,0 +1,170 @@
+/* global document, jQuery, wp, _ */
+/**
+ * Integrate Fieldmanager and the Customizer.
+ *
+ * @param {function} $ jQuery
+ * @param {function} api wp.customize API.
+ * @param {function} _ Underscore
+ */
+(function( $, api, _ ) {
+	'use strict';
+
+	/**
+	 * Fires when an .fm-element input triggers a 'change' event.
+	 *
+	 * @param {Event} e Event object.
+	 */
+	var onFmElementChange = function( e ) {
+		reserializeEachControl();
+	};
+
+	/**
+	 * Fires when an .fm-element input triggers a 'keyup' event.
+	 *
+	 * @param {Event} e Event object.
+	 */
+	var onFmElementKeyup = function( e ) {
+		var $target = $( e.target );
+
+		// Ignore [Escape] and [Enter].
+		if ( 27 === e.keyCode || 13 === e.keyCode ) {
+			return;
+		}
+
+		// @todo This gets unnecessarily delayed by the _debounce
+		if ( $target.hasClass( 'fm-autocomplete' ) ) {
+			// Update an autocomplete setting object when the input's text is deleted.
+			if ( '' === $target.val() ) {
+				// See fm.autocomplete.enable_autocomplete() for this tree.
+				var $targetAutocomplete = $target.siblings( 'input[type=hidden]' ).first();
+
+				// @todo Risky? Autocomplete hidden fields don't typically get set to value="".
+				$targetAutocomplete.val( '' );
+
+			/*
+			 * Don't update when typing into the autocomplete input. The hidden
+			 * field actually contains the value and is handled onFmElementChange().
+			 */
+			} else {
+				return;
+			}
+		}
+
+		reserializeEachControl();
+	};
+
+	/**
+	 * Fires when a Fieldmanager object is dropped while sorting.
+	 *
+	 * @param {Event} e Event object.
+	 * @param {Element} el The sorted element.
+	 */
+	var onFmSortableDrop = function( e, el ) {
+		reserializeEachControl();
+	};
+
+	/**
+	 * Fires when Fieldmanager adds a new element in a repeatable field.
+	 *
+	 * @param {Event} e Event object.
+	 */
+	var onFmAddedElement = function( e ) {
+		reserializeEachControl();
+	};
+
+	/**
+	 * Fires when an item is selected and previewed in a Fieldmanager media field.
+	 *
+	 * @param {Event} e Event object.
+	 * @param {jQuery} $wrapper .media-wrapper jQuery object.
+	 * @param {object} attachment Attachment attributes.
+	 * @param {object} wp Global WordPress JS API.
+	 */
+	var onFieldmanagerMediaPreview = function( e, $wrapper, attachment, wp ) {
+		reserializeEachControl();
+	};
+
+	/**
+	 * Fires after clicking the "Remove" link of a Fieldmanager media field.
+	 *
+	 * @param {Event} e Event object.
+	 */
+	var onFmMediaRemoveClick = function( e ) {
+		reserializeEachControl();
+	};
+
+	/**
+	 * Fires after clicking the "Remove" link of a Fieldmanager repeatable field.
+	 *
+	 * @param {Event} e Event object.
+	 */
+	var onFmjsRemoveClick = function( e ) {
+		reserializeEachControl();
+	};
+
+	/**
+	 * Set the values of all Fieldmanager controls.
+	 */
+	var reserializeEachControl = function() {
+		api.control.each( reserializeControl );
+	};
+
+	/**
+	 * Set a Fieldmanager control to its form values.
+	 *
+	 * @param {Object} control Customizer Control object.
+	 */
+	var reserializeControl = function( control ) {
+		if ( 'fieldmanager' !== control.params.type ) {
+			return;
+		}
+
+		control.setting.set( control.container.find( '.fm-element' ).serialize() );
+	};
+
+	/**
+	 * Fires when a Customizer Section expands.
+	 */
+	var onSectionContainerExpanded = function() {
+		/*
+		 * Initialize sortable fields and fields with label macros on any fields
+		 * that just been expanded and are now visible.
+		 */
+		$( document ).trigger( 'fm_init_sortable' );
+		$( document ).trigger( 'fm_init_label_macros' );
+	};
+
+	/**
+	 * Fires when the Customizer is loaded.
+	 */
+	var ready = function() {
+		var $document = $( document );
+
+		$document.on( 'change', '.fm-element', onFmElementChange );
+		$document.on( 'keyup', '.fm-element', _.debounce( onFmElementKeyup, 500 ) );
+		$document.on( 'click', '.fm-media-remove', onFmMediaRemoveClick );
+		$document.on( 'click', '.fmjs-remove', onFmjsRemoveClick );
+		$document.on( 'fm_sortable_drop', onFmSortableDrop );
+		$document.on( 'fieldmanager_media_preview', onFieldmanagerMediaPreview );
+
+		// @todo Also do this on section add
+		api.section.each(function( section ) {
+			section.container.bind( 'expanded', onSectionContainerExpanded );
+		});
+
+		/*
+		 * Hacky, because it always prompts the user to save. Unlike when we
+		 * create individual settings, the field "value" is always going to
+		 * change when it's reserialized. It also ensures defaults are applied
+		 * when the Customizer loads. But if the user saved those changes, the
+		 * defaults would be applied, as opposed to a submenu page, where there
+		 * isn't an AYS prompt. Creating a query string on the PHP side might
+		 * work, but that's even weirder.
+		 */
+		reserializeEachControl();
+	};
+
+	if ( typeof api !== 'undefined' ) {
+		api.bind( 'ready', ready );
+	}
+})( jQuery, wp.customize, _ );
diff --git a/php/class-fieldmanager-customize-control.php b/php/class-fieldmanager-customize-control.php
new file mode 100644
index 0000000000..90d210a265
--- /dev/null
+++ b/php/class-fieldmanager-customize-control.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Class file for Fieldmanager_Customize_Control.
+ */
+
+if ( class_exists( 'WP_Customize_Control' ) ) :
+	/**
+	 * Render a Fieldmanager field as a Customizer control.
+	 */
+	class Fieldmanager_Customize_Control extends WP_Customize_Control {
+		/**
+		 * The field object to use. Supply via `$args['fm']`.
+		 *
+		 * @var Fieldmanager_Field
+		 */
+		protected $fm;
+
+		/**
+		 * The control 'type', used in scripts to identify FM controls.
+		 *
+		 * @var string
+		 */
+		public $type = 'fieldmanager';
+
+		/**
+		 * Enqueue control-related scripts and styles.
+		 */
+		public function enqueue() {
+			fm_add_script(
+				'fm_customizer',
+				'js/fieldmanager-customize.js',
+				array( 'jquery', 'underscore', 'fieldmanager_script', 'customize-controls' ),
+				'1.0.0',
+				true
+			);
+		}
+
+		/**
+		 * Render the control's content.
+		 *
+		 * @see Fieldmanager_Field::element_markup().
+		 */
+		public function render_content() {
+			echo $this->fm->element_markup( $this->value() );
+		}
+	}
+endif;
diff --git a/php/class-fieldmanager-field.php b/php/class-fieldmanager-field.php
index 5378940598..5789a83f2e 100644
--- a/php/class-fieldmanager-field.php
+++ b/php/class-fieldmanager-field.php
@@ -1032,6 +1032,17 @@ public function activate_submenu_page() {
 		_fieldmanager_registry( 'active_submenu', $active_submenu );
 	}
 
+	/**
+	 * Add this field to the Customizer.
+	 *
+	 * @param string|array $args Customizer section title or arguments for the
+	 *     section and setting. @see Fieldmanager_Context_Customizer.
+	 */
+	public function add_customizer_section( $args ) {
+		$this->require_base();
+		return new Fieldmanager_Context_Customizer( $args, $this );
+	}
+
 	private function require_base() {
 		if ( !empty( $this->parent ) ) {
 			throw new FM_Developer_Exception( esc_html__( 'You cannot use this method on a subgroup', 'fieldmanager' ) );
diff --git a/php/context/class-fieldmanager-context-customizer.php b/php/context/class-fieldmanager-context-customizer.php
new file mode 100644
index 0000000000..d7762a45df
--- /dev/null
+++ b/php/context/class-fieldmanager-context-customizer.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Class file for Fieldmanager_Context_Customizer.
+ *
+ * @package Fieldmanager_Context
+ */
+
+/**
+ * Add Fieldmanager fields to the Customizer.
+ */
+class Fieldmanager_Context_Customizer extends Fieldmanager_Context {
+	/**
+	 * The value of the setting before any changes are submitted via the Customizer.
+	 *
+	 * @see Fieldmanager_Field::presave_all().
+	 *
+	 * @var mixed
+	 */
+	protected $current_value;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param string|array $args {
+	 *     The title to use with the {@see WP_Customize_Section}, or arrays of
+	 *     arguments to construct the Customizer section and setting.
+	 *
+	 *     @type array $section_args Arguments for constructing a WP_Customize_Section.
+	 *     @type array $setting_args Arguments for constructing a {@see WP_Customize_Setting}.
+	 * }
+	 * @param Fieldmanager_Field $fm Field object to add to the Customizer.
+	 */
+	public function __construct( $args, $fm ) {
+		if ( is_string( $args ) ) {
+			$args = array( 'section_args' => array( 'title' => $args ) );
+		}
+
+		$this->args = wp_parse_args( $args, array(
+			'section_args' => array(),
+			'setting_args' => array(),
+		) );
+
+		$this->fm = $fm;
+
+		add_action( 'customize_register', array( $this, 'customize_register' ) );
+	}
+
+	/**
+	 * Fires once WordPress has loaded in the Customizer.
+	 *
+	 * @param WP_Customize_Manager $manager WP_Customize_Manager instance.
+	 */
+	public function customize_register( $manager ) {
+		$this->register( $manager );
+		/*
+		 * Get the current setting value for Fieldmanager_Field::presave_all()
+		 * before the setting's preview method is called.
+		 *
+		 * WP_Customize_Setting::preview() adds filters to get_option() and
+		 * get_theme_mod() that eventually call the setting's sanitize() method.
+		 * Attempting to call WP_Customize_Setting::value() inside of
+		 * Fieldmanager_Context_Customizer::sanitize_callback() creates an
+		 * infinite loop.
+		 */
+		$this->init_current_value( $manager );
+	}
+
+	/**
+	 * Filter a Customize setting value in un-slashed form.
+	 *
+	 * @param mixed $value Setting value.
+	 * @param WP_Customize_Setting $setting WP_Customize_Setting instance.
+	 * @return mixed The sanitized setting value.
+	 */
+	public function sanitize_callback( $value, $setting ) {
+		if ( is_string( $value ) && 0 === strpos( $value, $this->fm->name ) ) {
+			// Parse the query-string version of our values into an array.
+			parse_str( $value, $value );
+		}
+
+		if ( is_array( $value ) && isset( $value[ $this->fm->name ] ) ) {
+			// If the option name is the top-level array key, get just the value.
+			$value = $value[ $this->fm->name ];
+		}
+
+		// Return the value after Fieldmanager takes a shot at it.
+		return $this->fm->presave_all( $value, $this->current_value );
+	}
+
+	/**
+	 * Create a Customizer section, setting, and control for this field.
+	 *
+	 * @param WP_Customize_Manager $manager WP_Customize_Manager instance.
+	 */
+	protected function register( $manager ) {
+		$manager->add_section( $this->fm->name, wp_parse_args(
+			$this->args['section_args'],
+			array()
+		) );
+
+		// Set Fieldmanager defaults after parsing the user args, then register the setting.
+		$setting_args = wp_parse_args(
+			$this->args['setting_args'],
+			array(
+				// Use the capability passed to Fieldmanager_Field::add_customizer_section().
+				'capability' => $manager->get_section( $this->fm->name )->capability,
+				'type'       => 'option',
+			)
+		);
+		$setting_args['default']           = $this->fm->default_value;
+		$setting_args['sanitize_callback'] = array( $this, 'sanitize_callback' );
+		$setting_args['section']           = $this->fm->name;
+		$manager->add_setting( $this->fm->name, $setting_args );
+
+		$manager->add_control( new Fieldmanager_Customize_Control( $manager, $this->fm->name, array(
+			'fm'      => $this->fm,
+			'section' => $this->fm->name,
+		) ) );
+	}
+
+	/**
+	 * Initialize $current_value for the type of Customizer setting.
+	 *
+	 * @param WP_Customize_Manager $manager WP_Customize_Manager instance.
+	 */
+	protected function init_current_value( $manager ) {
+		$this->current_value = $manager->get_setting( $this->fm->name )->value();
+	}
+}

From c5fc06ee35814bc67ace65dbc1c089d85b6b8c53 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sun, 22 Nov 2015 13:50:20 -0500
Subject: [PATCH 04/76] Include jQuery Datepicker as Datepicker dependency

This helps ensure the UI Datepicker script loads when adding a
Datepicker field to the Customizer.
---
 php/class-fieldmanager-datepicker.php          | 2 +-
 tests/php/test-fieldmanager-script-loading.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/php/class-fieldmanager-datepicker.php b/php/class-fieldmanager-datepicker.php
index e404c82aee..21a9d03db0 100644
--- a/php/class-fieldmanager-datepicker.php
+++ b/php/class-fieldmanager-datepicker.php
@@ -62,7 +62,7 @@ class Fieldmanager_Datepicker extends Fieldmanager_Field {
 	public function __construct( $label, $options = array() ) {
 		wp_enqueue_script( 'jquery-ui-datepicker' );
 		fm_add_style( 'fm-jquery-ui', 'css/jquery-ui/jquery-ui-1.10.2.custom.min.css' );
-		fm_add_script( 'fm_datepicker', 'js/fieldmanager-datepicker.js', array( 'fieldmanager_script' ) );
+		fm_add_script( 'fm_datepicker', 'js/fieldmanager-datepicker.js', array( 'fieldmanager_script', 'jquery-ui-datepicker' ) );
 		parent::__construct( $label, $options );
 
 		if ( empty( $this->js_opts ) ) {
diff --git a/tests/php/test-fieldmanager-script-loading.php b/tests/php/test-fieldmanager-script-loading.php
index b3dc4938c9..6a27003704 100644
--- a/tests/php/test-fieldmanager-script-loading.php
+++ b/tests/php/test-fieldmanager-script-loading.php
@@ -56,7 +56,7 @@ public function script_data() {
 		return array(
 			array( 'fieldmanager_script', array( 'jquery' ) ),
 			array( 'fm_autocomplete_js', array( 'fieldmanager_script' ) ),
-			array( 'fm_datepicker', array( 'fieldmanager_script' ) ),
+			array( 'fm_datepicker', array( 'fieldmanager_script', 'jquery-ui-datepicker' ) ),
 			array( 'fm_draggablepost_js', array() ),
 			array( 'fm_group_tabs_js', array( 'jquery', 'jquery-hoverintent' ) ),
 			array( 'fm_media', array( 'jquery' ) ),

From be02e65c9e27ed9a6f01cf61f3549d9f8396aa3d Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sun, 22 Nov 2015 14:48:22 -0500
Subject: [PATCH 05/76] Replace per-field JS handlers with Customizer event

This removes the two event handlers that existed only to enable sortable
fields and label macros. Instead, we trigger one event when a Customizer
section containing a Fieldmanager control expands, and have those
features listen for it. This is a little more consistent with other FM
features that listen for FM-related events.
---
 js/fieldmanager-customize.js | 29 +++++++++++++++++------------
 js/fieldmanager.js           |  5 ++---
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/js/fieldmanager-customize.js b/js/fieldmanager-customize.js
index 3af361e747..988ca5d8f5 100644
--- a/js/fieldmanager-customize.js
+++ b/js/fieldmanager-customize.js
@@ -123,15 +123,23 @@
 	};
 
 	/**
-	 * Fires when a Customizer Section expands.
+	 * Trigger an event when a Customizer section with a Fieldmanager control expands.
 	 */
-	var onSectionContainerExpanded = function() {
-		/*
-		 * Initialize sortable fields and fields with label macros on any fields
-		 * that just been expanded and are now visible.
-		 */
-		$( document ).trigger( 'fm_init_sortable' );
-		$( document ).trigger( 'fm_init_label_macros' );
+	var bindToSectionsWithFm = function() {
+		// @todo Also do this on section add
+		api.section.each(function( section ) {
+			$.each( section.controls(), function( i, control ) {
+				if ( 'fieldmanager' !== control.params.type ) {
+					return;
+				}
+
+				section.container.bind( 'expanded', function() {
+					$( document ).trigger( 'fm_customizer_control_section_expanded' );
+				});
+
+				return false;
+			});
+		});
 	};
 
 	/**
@@ -147,10 +155,7 @@
 		$document.on( 'fm_sortable_drop', onFmSortableDrop );
 		$document.on( 'fieldmanager_media_preview', onFieldmanagerMediaPreview );
 
-		// @todo Also do this on section add
-		api.section.each(function( section ) {
-			section.container.bind( 'expanded', onSectionContainerExpanded );
-		});
+		bindToSectionsWithFm();
 
 		/*
 		 * Hacky, because it always prompts the user to save. Unlike when we
diff --git a/js/fieldmanager.js b/js/fieldmanager.js
index cd63f1ee5f..e18122462a 100644
--- a/js/fieldmanager.js
+++ b/js/fieldmanager.js
@@ -199,9 +199,8 @@ $( document ).ready( function () {
 	init_label_macros();
 	init_sortable();
 
-	$( document ).on( 'fm_activate_tab', init_sortable );
-	$( document ).on( 'fm_init_sortable', init_sortable );
-	$( document ).on( 'fm_init_label_macros', init_label_macros );
+	$( document ).on( 'fm_activate_tab fm_customizer_control_section_expanded', init_sortable );
+	$( document ).on( 'fm_customizer_control_section_expanded', init_label_macros );
 } );
 
 } )( jQuery );

From be00ddf829400d01dd8335562aba4479bfe6c13f Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sun, 22 Nov 2015 14:55:17 -0500
Subject: [PATCH 06/76] Fix Datepicker initialization in the Customizer

---
 css/fieldmanager.css          | 7 ++++---
 js/fieldmanager-datepicker.js | 5 ++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/css/fieldmanager.css b/css/fieldmanager.css
index 1c8b3d1b77..15e49c0e1f 100644
--- a/css/fieldmanager.css
+++ b/css/fieldmanager.css
@@ -307,9 +307,10 @@ a.fm-delete:hover {
 	display: inline;
 }
 
-.wp-customizer .ui-autocomplete {
-	/* Hoist the autocomplete popup over who-knows-what in the Customizer. */
-	z-index: 500000;
+.wp-customizer .ui-autocomplete,
+.wp-customizer .ui-datepicker {
+	/* Hoist jQuery UI popups over who-knows-what in the Customizer. */
+	z-index: 500000 !important;
 }
 
 .wp-customizer .fmjs-removable .fmjs-drag-icon {
diff --git a/js/fieldmanager-datepicker.js b/js/fieldmanager-datepicker.js
index cc785253ee..21fc482d1f 100644
--- a/js/fieldmanager-datepicker.js
+++ b/js/fieldmanager-datepicker.js
@@ -11,5 +11,8 @@
 	}
 
 	$( document ).ready( fm.datepicker.add_datepicker );
-	$( document ).on( 'fm_collapsible_toggle fm_added_element fm_displayif_toggle fm_activate_tab', fm.datepicker.add_datepicker );
+	$( document ).on(
+		'fm_collapsible_toggle fm_added_element fm_displayif_toggle fm_activate_tab fm_customizer_control_section_expanded',
+		fm.datepicker.add_datepicker
+	);
 } ) ( jQuery );
\ No newline at end of file

From a79fe3e284e9668f28f0943e48588c0f8d55dcb0 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sun, 22 Nov 2015 15:10:58 -0500
Subject: [PATCH 07/76] Initialize display-if triggers in the Customizer

Moves the initialization logic to a function so it can be called during
'fm_customizer_control_section_expanded'.
---
 js/fieldmanager.js | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/js/fieldmanager.js b/js/fieldmanager.js
index e18122462a..b0ca2e9278 100644
--- a/js/fieldmanager.js
+++ b/js/fieldmanager.js
@@ -114,6 +114,25 @@ var match_value = function( values, match_string ) {
 	return false;
 }
 
+/**
+ * Initializes triggers to conditionally hide or show fields.
+ */
+var init_display_if = function() {
+	$( '.display-if' ).each(function() {
+		var src = $( this ).data( 'display-src' );
+		var values = $( this ).data( 'display-value' ).split( ',' );
+		var trigger = $( this ).siblings( '.fm-' + src + '-wrapper' ).find( '.fm-element' );
+		var val = trigger.val();
+		if ( trigger.is( ':radio' ) && trigger.filter( ':checked' ).length ) {
+			val = trigger.filter( ':checked' ).val();
+		}
+		trigger.addClass( 'display-trigger' );
+		if ( ! match_value( values, val ) ) {
+			$( this ).hide();
+		}
+	});
+};
+
 fm_add_another = function( $element ) {
 	var el_name = $element.data( 'related-element' )
 		, limit = $element.data( 'limit' ) - 0
@@ -163,21 +182,6 @@ $( document ).ready( function () {
 
 	$( '.fm-collapsed > .fm-group:not(.fmjs-proto) > .fm-group-inner' ).hide();
 
-	// Initializes triggers to conditionally hide or show fields
-	$( '.display-if' ).each( function() {
-		var src = $( this ).data( 'display-src' );
-		var values = $( this ).data( 'display-value' ).split( ',' );
-		var trigger = $( this ).siblings( '.fm-' + src + '-wrapper' ).find( '.fm-element' );
-		var val = trigger.val();
-		if ( trigger.is( ':radio' ) && trigger.filter( ':checked' ).length ) {
-			val = trigger.filter( ':checked' ).val();
-		}
-		trigger.addClass( 'display-trigger' );
-		if ( !match_value( values, val ) ) {
-			$( this ).hide();
-		}
-	} );
-
 	// Controls the trigger to show or hide fields
 	$( document ).on( 'change', '.display-trigger', function() {
 		var val = $( this ).val().split(',');
@@ -198,9 +202,11 @@ $( document ).ready( function () {
 
 	init_label_macros();
 	init_sortable();
+	init_display_if();
 
 	$( document ).on( 'fm_activate_tab fm_customizer_control_section_expanded', init_sortable );
 	$( document ).on( 'fm_customizer_control_section_expanded', init_label_macros );
+	$( document ).on( 'fm_customizer_control_section_expanded', init_display_if );
 } );
 
 } )( jQuery );

From c1c66d8c66005c1132a76b056ec69f3c5025ce8d Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sun, 22 Nov 2015 15:47:42 -0500
Subject: [PATCH 08/76] Remove unnecessary variable

---
 js/fieldmanager-customize.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/js/fieldmanager-customize.js b/js/fieldmanager-customize.js
index 988ca5d8f5..8f60f56dd6 100644
--- a/js/fieldmanager-customize.js
+++ b/js/fieldmanager-customize.js
@@ -36,10 +36,8 @@
 			// Update an autocomplete setting object when the input's text is deleted.
 			if ( '' === $target.val() ) {
 				// See fm.autocomplete.enable_autocomplete() for this tree.
-				var $targetAutocomplete = $target.siblings( 'input[type=hidden]' ).first();
-
 				// @todo Risky? Autocomplete hidden fields don't typically get set to value="".
-				$targetAutocomplete.val( '' );
+				$target.siblings( 'input[type=hidden]' ).first().val( '' );
 
 			/*
 			 * Don't update when typing into the autocomplete input. The hidden

From 8f39b3fe5df2908d43695cf376196bc8616f6b14 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sun, 22 Nov 2015 15:48:16 -0500
Subject: [PATCH 09/76] Fix unnecessarily debounced autocomplete events

---
 js/fieldmanager-customize.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/js/fieldmanager-customize.js b/js/fieldmanager-customize.js
index 8f60f56dd6..e7aafd9889 100644
--- a/js/fieldmanager-customize.js
+++ b/js/fieldmanager-customize.js
@@ -31,7 +31,6 @@
 			return;
 		}
 
-		// @todo This gets unnecessarily delayed by the _debounce
 		if ( $target.hasClass( 'fm-autocomplete' ) ) {
 			// Update an autocomplete setting object when the input's text is deleted.
 			if ( '' === $target.val() ) {
@@ -146,8 +145,17 @@
 	var ready = function() {
 		var $document = $( document );
 
+		/*
+		 * We debounce() most keyup events to avoid refreshing the Customizer
+		 * preview every single time the user types a letter. But typing into
+		 * the autocomplete input does not itself trigger a refresh -- the only
+		 * time it should affect the preview is when removing an autocomplete
+		 * selection. We allow that to occur normally.
+		 */
+		$document.on( 'keyup', '.fm-element:not(.fm-autocomplete)', _.debounce( onFmElementKeyup, 500 ) );
+		$document.on( 'keyup', '.fm-autocomplete', onFmElementKeyup );
+
 		$document.on( 'change', '.fm-element', onFmElementChange );
-		$document.on( 'keyup', '.fm-element', _.debounce( onFmElementKeyup, 500 ) );
 		$document.on( 'click', '.fm-media-remove', onFmMediaRemoveClick );
 		$document.on( 'click', '.fmjs-remove', onFmjsRemoveClick );
 		$document.on( 'fm_sortable_drop', onFmSortableDrop );

From 980e2b5dc308c0001cbb59c429ea2b2634be5899 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sun, 6 Dec 2015 16:07:45 -0500
Subject: [PATCH 10/76] Remove extra space in string

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

diff --git a/php/class-fieldmanager-field.php b/php/class-fieldmanager-field.php
index 5789a83f2e..c8889952f6 100644
--- a/php/class-fieldmanager-field.php
+++ b/php/class-fieldmanager-field.php
@@ -843,7 +843,7 @@ public function presave( $value, $current_value = array() ) {
 		foreach ( $this->validate as $func ) {
 			if ( !call_user_func( $func, $value ) ) {
 				$this->_failed_validation( sprintf(
-					__( 'Input "%1$s" is not valid for field "%2$s" ', 'fieldmanager' ),
+					__( 'Input "%1$s" is not valid for field "%2$s"', 'fieldmanager' ),
 					(string) $value,
 					$this->label
 				) );

From 0795c833e45844c946b694f65a652df7bdea9daa Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sun, 6 Dec 2015 16:13:17 -0500
Subject: [PATCH 11/76] Alert users to failed validation during saving

This primarily updates Fieldmanager_Field::_failed_validation() so that
it returns usable data to the Customizer. The particular error string
and the method of alerting users might come in for more updates.
---
 js/fieldmanager-customize.js     | 15 +++++++++++++++
 php/class-fieldmanager-field.php | 14 +++++++++-----
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/js/fieldmanager-customize.js b/js/fieldmanager-customize.js
index e7aafd9889..197d65a2dc 100644
--- a/js/fieldmanager-customize.js
+++ b/js/fieldmanager-customize.js
@@ -175,7 +175,22 @@
 		reserializeEachControl();
 	};
 
+	/**
+	 * Fires when a Customizer request to save values fails.
+	 *
+	 * @return {Mixed} response The response from the server.
+	 */
+	var error = function( response ) {
+		if ( ! response.fieldmanager ) {
+			return;
+		}
+
+		// There isn't yet an official way to signal a save failure, but this mimics the AYS prompt.
+		alert( response.fieldmanager );
+	};
+
 	if ( typeof api !== 'undefined' ) {
 		api.bind( 'ready', ready );
+		api.bind( 'error', error );
 	}
 })( jQuery, wp.customize, _ );
diff --git a/php/class-fieldmanager-field.php b/php/class-fieldmanager-field.php
index c8889952f6..7da5a7f0be 100644
--- a/php/class-fieldmanager-field.php
+++ b/php/class-fieldmanager-field.php
@@ -1072,12 +1072,16 @@ protected function _failed_validation( $debug_message = '' ) {
 		if ( self::$debug ) {
 			throw new FM_Validation_Exception( $debug_message );
 		}
-		else {
-			wp_die( esc_html(
-				$debug_message . "\n\n" .
-				__( "You may be able to use your browser's back button to resolve this error.", 'fieldmanager' )
-			) );
+
+		if ( is_customize_preview() ) {
+			// There isn't yet a way to catch this error during a preview refresh.
+			wp_send_json_error( array( 'fieldmanager' => sprintf( __( 'Error: %s', 'fieldmanager' ), $debug_message ) ) );
 		}
+
+		wp_die( esc_html(
+			$debug_message . "\n\n" .
+			__( "You may be able to use your browser's back button to resolve this error.", 'fieldmanager' )
+		) );
 	}
 
 	/**

From e017a204e4991d525e117eac43a2e255f8911c4d Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sun, 6 Dec 2015 19:38:12 -0500
Subject: [PATCH 12/76] Bind FM event to Sections as they're added

This helps ensure we bind 'fm_customizer_control_section_expanded' to
sections that are dynamically added.

This also changes the previous behavior of binding to only sections with
Fieldmanager controls: If an FM control is dynamically added to a
section that had no FM controls, we need to trigger the event when that
section expands.

Binding to when controls are added, rather than sections, isn't enough
because controls can be added without being assigned to sections.
Eventually, it might be more efficient to try binding to a section only
when a Fieldmanager control is added to it.
---
 js/fieldmanager-customize.js | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/js/fieldmanager-customize.js b/js/fieldmanager-customize.js
index 197d65a2dc..5989e69363 100644
--- a/js/fieldmanager-customize.js
+++ b/js/fieldmanager-customize.js
@@ -120,22 +120,14 @@
 	};
 
 	/**
-	 * Trigger an event when a Customizer section with a Fieldmanager control expands.
+	 * Trigger a Fieldmanager event when a Customizer section expands.
+	 *
+	 * We bind to sections whether or not they have FM controls in case a
+	 * control is added dynamically.
 	 */
-	var bindToSectionsWithFm = function() {
-		// @todo Also do this on section add
-		api.section.each(function( section ) {
-			$.each( section.controls(), function( i, control ) {
-				if ( 'fieldmanager' !== control.params.type ) {
-					return;
-				}
-
-				section.container.bind( 'expanded', function() {
-					$( document ).trigger( 'fm_customizer_control_section_expanded' );
-				});
-
-				return false;
-			});
+	var bindToSectionExpanded = function( section ) {
+		section.container.bind( 'expanded', function() {
+			$( document ).trigger( 'fm_customizer_control_section_expanded' );
 		});
 	};
 
@@ -161,8 +153,6 @@
 		$document.on( 'fm_sortable_drop', onFmSortableDrop );
 		$document.on( 'fieldmanager_media_preview', onFieldmanagerMediaPreview );
 
-		bindToSectionsWithFm();
-
 		/*
 		 * Hacky, because it always prompts the user to save. Unlike when we
 		 * create individual settings, the field "value" is always going to
@@ -189,8 +179,19 @@
 		alert( response.fieldmanager );
 	};
 
+	/**
+	 * Fires when a Customizer Section is added.
+	 *
+	 * @param {Object} section Customizer Section object.
+	 */
+	var addSection = function( section ) {
+		// It would be more efficient to do this only when adding an FM control to a section.
+		bindToSectionExpanded( section );
+	};
+
 	if ( typeof api !== 'undefined' ) {
 		api.bind( 'ready', ready );
 		api.bind( 'error', error );
+		api.section.bind( 'add', addSection );
 	}
 })( jQuery, wp.customize, _ );

From bd39fe88477f57a943125714489c630ea68014ef Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sun, 6 Dec 2015 21:20:18 -0500
Subject: [PATCH 13/76] Offer suggestion after saving in Customizer fails

This follows other FM error messages, e.g. "You may be able to use your
browser's back button" and "Please check your code and try again."
---
 php/class-fieldmanager-field.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/class-fieldmanager-field.php b/php/class-fieldmanager-field.php
index 7da5a7f0be..aca3c31c50 100644
--- a/php/class-fieldmanager-field.php
+++ b/php/class-fieldmanager-field.php
@@ -1075,7 +1075,7 @@ protected function _failed_validation( $debug_message = '' ) {
 
 		if ( is_customize_preview() ) {
 			// There isn't yet a way to catch this error during a preview refresh.
-			wp_send_json_error( array( 'fieldmanager' => sprintf( __( 'Error: %s', 'fieldmanager' ), $debug_message ) ) );
+			wp_send_json_error( array( 'fieldmanager' => sprintf( __( 'Error: %s. Please check your settings and save again.', 'fieldmanager' ), $debug_message ) ) );
 		}
 
 		wp_die( esc_html(

From d6330b4cf31c4691ff721fe2dc51d8fdf9eaeca4 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sat, 2 Jan 2016 16:12:39 -0500
Subject: [PATCH 14/76] Don't reserialize all controls on changes in value

Instead, reserialize only those controls containing the changed element.
---
 js/fieldmanager-customize.js | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/js/fieldmanager-customize.js b/js/fieldmanager-customize.js
index 5989e69363..b7d7d7c8bb 100644
--- a/js/fieldmanager-customize.js
+++ b/js/fieldmanager-customize.js
@@ -15,7 +15,7 @@
 	 * @param {Event} e Event object.
 	 */
 	var onFmElementChange = function( e ) {
-		reserializeEachControl();
+		reserializeControlsContainingElement( e.target );
 	};
 
 	/**
@@ -47,7 +47,7 @@
 			}
 		}
 
-		reserializeEachControl();
+		reserializeControlsContainingElement( e.target );
 	};
 
 	/**
@@ -57,7 +57,7 @@
 	 * @param {Element} el The sorted element.
 	 */
 	var onFmSortableDrop = function( e, el ) {
-		reserializeEachControl();
+		reserializeControlsContainingElement( e.target );
 	};
 
 	/**
@@ -66,7 +66,7 @@
 	 * @param {Event} e Event object.
 	 */
 	var onFmAddedElement = function( e ) {
-		reserializeEachControl();
+		reserializeControlsContainingElement( e.target );
 	};
 
 	/**
@@ -78,7 +78,7 @@
 	 * @param {object} wp Global WordPress JS API.
 	 */
 	var onFieldmanagerMediaPreview = function( e, $wrapper, attachment, wp ) {
-		reserializeEachControl();
+		reserializeControlsContainingElement( e.target );
 	};
 
 	/**
@@ -87,7 +87,7 @@
 	 * @param {Event} e Event object.
 	 */
 	var onFmMediaRemoveClick = function( e ) {
-		reserializeEachControl();
+		reserializeControlsContainingElement( e.target );
 	};
 
 	/**
@@ -96,7 +96,7 @@
 	 * @param {Event} e Event object.
 	 */
 	var onFmjsRemoveClick = function( e ) {
-		reserializeEachControl();
+		reserializeControlsContainingElement( e.target );
 	};
 
 	/**
@@ -106,6 +106,19 @@
 		api.control.each( reserializeControl );
 	};
 
+	/**
+	 * Set the value of any Fieldmanager control with a given element in its container.
+	 *
+	 * @param {Element} el Element to look for.
+	 */
+	var reserializeControlsContainingElement = function( el ) {
+		api.control.each(function( control ) {
+			if ( control.container.find( el ).length ) {
+				reserializeControl( control );
+			}
+		});
+	};
+
 	/**
 	 * Set a Fieldmanager control to its form values.
 	 *

From 466ce6e9dbed2ff9259f334b44d640a5e0b0fc6c Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Mon, 25 Jan 2016 22:27:18 -0500
Subject: [PATCH 15/76] Fix some saving callbacks after d6330b4

- After dropping a sortable field, pass the available element directly
  to reserializeControlsContainingElement()
- Call reserializeEachControl() after removing fields or values, because
  they no longer exist and so the control doesn't contain them.
---
 js/fieldmanager-customize.js | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/js/fieldmanager-customize.js b/js/fieldmanager-customize.js
index b7d7d7c8bb..afbcc3c310 100644
--- a/js/fieldmanager-customize.js
+++ b/js/fieldmanager-customize.js
@@ -56,8 +56,8 @@
 	 * @param {Event} e Event object.
 	 * @param {Element} el The sorted element.
 	 */
-	var onFmSortableDrop = function( e, el ) {
-		reserializeControlsContainingElement( e.target );
+	var onFmSortableDrop = function ( e, el ) {
+		reserializeControlsContainingElement( el );
 	};
 
 	/**
@@ -86,18 +86,20 @@
 	 *
 	 * @param {Event} e Event object.
 	 */
-	var onFmMediaRemoveClick = function( e ) {
-		reserializeControlsContainingElement( e.target );
-	};
-
-	/**
-	 * Fires after clicking the "Remove" link of a Fieldmanager repeatable field.
-	 *
-	 * @param {Event} e Event object.
-	 */
-	var onFmjsRemoveClick = function( e ) {
-		reserializeControlsContainingElement( e.target );
-	};
+	 var onFmMediaRemoveClick = function ( e ) {
+		// The control no longer contains the element, so reserialize all of them.
+		reserializeEachControl();
+	 };
+
+	 /**
+	  * Fires after clicking the "Remove" link of a Fieldmanager repeatable field.
+	  *
+	  * @param {Event} e Event object.
+	  */
+	 var onFmjsRemoveClick = function ( e ) {
+		// The control no longer contains the element, so reserialize all of them.
+		reserializeEachControl();
+	 };
 
 	/**
 	 * Set the values of all Fieldmanager controls.

From 01893e7ef607daf817f96e8f1369b8f49707ec64 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Mon, 25 Jan 2016 22:32:26 -0500
Subject: [PATCH 16/76] Serialize FM Control values into JS objects

When previewing or saving a Fieldmanager field in the Customizer, we now
use the jquery.serializeJSON][1] library to serialize the FM control
into a JavaScript object. The object is then set as value of the
control's setting.

This allows us to send an object both to PHP, as part of a 'refresh'
setting, and to JS, as part of a 'postMessage' setting. Previously each
received a string from jQuery's `serialize()`, which remains the
fallback behavior.

[1]: https://github.com/marioizquierdo/jquery.serializeJSON
---
 js/fieldmanager-customize.js                  |  17 +-
 .../jquery.serializejson.js                   | 277 ++++++++++++++++++
 .../jquery.serializejson.min.js               |  10 +
 php/class-fieldmanager-customize-control.php  |  10 +-
 4 files changed, 311 insertions(+), 3 deletions(-)
 create mode 100644 js/jquery-serializejson/jquery.serializejson.js
 create mode 100644 js/jquery-serializejson/jquery.serializejson.min.js

diff --git a/js/fieldmanager-customize.js b/js/fieldmanager-customize.js
index afbcc3c310..9e8b8d95a2 100644
--- a/js/fieldmanager-customize.js
+++ b/js/fieldmanager-customize.js
@@ -126,12 +126,25 @@
 	 *
 	 * @param {Object} control Customizer Control object.
 	 */
-	var reserializeControl = function( control ) {
+	var reserializeControl = function ( control ) {
+		var $element;
+		var serialized;
+		var value;
+
 		if ( 'fieldmanager' !== control.params.type ) {
 			return;
 		}
 
-		control.setting.set( control.container.find( '.fm-element' ).serialize() );
+		$element = control.container.find( '.fm-element' );
+
+		if ( $.serializeJSON ) {
+			serialized = $element.serializeJSON();
+			value = serialized[ control.id ];
+		} else {
+			value = $element.serialize();
+		}
+
+		control.setting.set( value );
 	};
 
 	/**
diff --git a/js/jquery-serializejson/jquery.serializejson.js b/js/jquery-serializejson/jquery.serializejson.js
new file mode 100644
index 0000000000..9cfe797eb1
--- /dev/null
+++ b/js/jquery-serializejson/jquery.serializejson.js
@@ -0,0 +1,277 @@
+/*!
+  SerializeJSON jQuery plugin.
+  https://github.com/marioizquierdo/jquery.serializeJSON
+  version 2.6.2 (May, 2015)
+
+  Copyright (c) 2012, 2015 Mario Izquierdo
+  Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
+  and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
+*/
+(function (factory) {
+  if (typeof define === 'function' && define.amd) { // AMD. Register as an anonymous module.
+    define(['jquery'], factory);
+  } else if (typeof exports === 'object') { // Node/CommonJS
+    var jQuery = require('jquery');
+    module.exports = factory(jQuery);
+  } else { // Browser globals (zepto supported)
+    factory(window.jQuery || window.Zepto || window.$); // Zepto supported on browsers as well
+  }
+
+}(function ($) {
+  "use strict";
+
+  // jQuery('form').serializeJSON()
+  $.fn.serializeJSON = function (options) {
+    var serializedObject, formAsArray, keys, type, value, _ref, f, opts;
+    f = $.serializeJSON;
+    opts = f.setupOpts(options); // calculate values for options {parseNumbers, parseBoolens, parseNulls}
+    formAsArray = this.serializeArray(); // array of objects {name, value}
+    f.readCheckboxUncheckedValues(formAsArray, this, opts); // add {name, value} of unchecked checkboxes if needed
+
+    serializedObject = {};
+    $.each(formAsArray, function (i, input) {
+      keys = f.splitInputNameIntoKeysArray(input.name, opts);
+      type = keys.pop(); // the last element is always the type ("string" by default)
+      if (type !== 'skip') { // easy way to skip a value
+        value = f.parseValue(input.value, type, opts); // string, number, boolean or null
+        if (opts.parseWithFunction && type === '_') { // allow for custom parsing
+          value = opts.parseWithFunction(value, input.name);
+        }
+        f.deepSet(serializedObject, keys, value, opts);
+      }
+    });
+    return serializedObject;
+  };
+
+  // Use $.serializeJSON as namespace for the auxiliar functions
+  // and to define defaults
+  $.serializeJSON = {
+
+    defaultOptions: {
+      checkboxUncheckedValue: undefined, // to include that value for unchecked checkboxes (instead of ignoring them)
+
+      parseNumbers: false, // convert values like "1", "-2.33" to 1, -2.33
+      parseBooleans: false, // convert "true", "false" to true, false
+      parseNulls: false, // convert "null" to null
+      parseAll: false, // all of the above
+      parseWithFunction: null, // to use custom parser, a function like: function(val){ return parsed_val; }
+
+      customTypes: {}, // override defaultTypes
+      defaultTypes: {
+        "string":  function(str) { return String(str); },
+        "number":  function(str) { return Number(str); },
+        "boolean": function(str) { var falses = ["false", "null", "undefined", "", "0"]; return falses.indexOf(str) === -1; },
+        "null":    function(str) { var falses = ["false", "null", "undefined", "", "0"]; return falses.indexOf(str) === -1 ? str : null; },
+        "array":   function(str) { return JSON.parse(str); },
+        "object":  function(str) { return JSON.parse(str); },
+        "auto":    function(str) { return $.serializeJSON.parseValue(str, null, {parseNumbers: true, parseBooleans: true, parseNulls: true}); } // try again with something like "parseAll"
+      },
+
+      useIntKeysAsArrayIndex: false // name="foo[2]" value="v" => {foo: [null, null, "v"]}, instead of {foo: ["2": "v"]}
+    },
+
+    // Merge option defaults into the options
+    setupOpts: function(options) {
+      var opt, validOpts, defaultOptions, optWithDefault, parseAll, f;
+      f = $.serializeJSON;
+
+      if (options == null) { options = {}; }   // options ||= {}
+      defaultOptions = f.defaultOptions || {}; // defaultOptions
+
+      // Make sure that the user didn't misspell an option
+      validOpts = ['checkboxUncheckedValue', 'parseNumbers', 'parseBooleans', 'parseNulls', 'parseAll', 'parseWithFunction', 'customTypes', 'defaultTypes', 'useIntKeysAsArrayIndex']; // re-define because the user may override the defaultOptions
+      for (opt in options) {
+        if (validOpts.indexOf(opt) === -1) {
+          throw new  Error("serializeJSON ERROR: invalid option '" + opt + "'. Please use one of " + validOpts.join(', '));
+        }
+      }
+
+      // Helper to get the default value for this option if none is specified by the user
+      optWithDefault = function(key) { return (options[key] !== false) && (options[key] !== '') && (options[key] || defaultOptions[key]); };
+
+      // Return computed options (opts to be used in the rest of the script)
+      parseAll = optWithDefault('parseAll');
+      return {
+        checkboxUncheckedValue:    optWithDefault('checkboxUncheckedValue'),
+
+        parseNumbers:  parseAll || optWithDefault('parseNumbers'),
+        parseBooleans: parseAll || optWithDefault('parseBooleans'),
+        parseNulls:    parseAll || optWithDefault('parseNulls'),
+        parseWithFunction:         optWithDefault('parseWithFunction'),
+
+        typeFunctions: $.extend({}, optWithDefault('defaultTypes'), optWithDefault('customTypes')),
+
+        useIntKeysAsArrayIndex: optWithDefault('useIntKeysAsArrayIndex')
+      };
+    },
+
+    // Given a string, apply the type or the relevant "parse" options, to return the parsed value
+    parseValue: function(str, type, opts) {
+      var typeFunction, f;
+      f = $.serializeJSON;
+
+      // Parse with a type if available
+      typeFunction = opts.typeFunctions && opts.typeFunctions[type];
+      if (typeFunction) { return typeFunction(str); } // use specific type
+
+      // Otherwise, check if there is any auto-parse option enabled and use it.
+      if (opts.parseNumbers  && f.isNumeric(str)) { return Number(str); } // auto: number
+      if (opts.parseBooleans && (str === "true" || str === "false")) { return str === "true"; } // auto: boolean
+      if (opts.parseNulls    && str == "null") { return null; } // auto: null
+
+      // If none applies, just return the str
+      return str;
+    },
+
+    isObject:          function(obj) { return obj === Object(obj); }, // is it an Object?
+    isUndefined:       function(obj) { return obj === void 0; }, // safe check for undefined values
+    isValidArrayIndex: function(val) { return /^[0-9]+$/.test(String(val)); }, // 1,2,3,4 ... are valid array indexes
+    isNumeric:         function(obj) { return obj - parseFloat(obj) >= 0; }, // taken from jQuery.isNumeric implementation. Not using jQuery.isNumeric to support old jQuery and Zepto versions
+
+    optionKeys: function(obj) { if (Object.keys) { return Object.keys(obj); } else { var key, keys = []; for(key in obj){ keys.push(key); } return keys;} }, // polyfill Object.keys to get option keys in IE<9
+
+    // Split the input name in programatically readable keys.
+    // The last element is always the type (default "_").
+    // Examples:
+    // "foo"              => ['foo', '_']
+    // "foo:string"       => ['foo', 'string']
+    // "foo:boolean"      => ['foo', 'boolean']
+    // "[foo]"            => ['foo', '_']
+    // "foo[inn][bar]"    => ['foo', 'inn', 'bar', '_']
+    // "foo[inn[bar]]"    => ['foo', 'inn', 'bar', '_']
+    // "foo[inn][arr][0]" => ['foo', 'inn', 'arr', '0', '_']
+    // "arr[][val]"       => ['arr', '', 'val', '_']
+    // "arr[][val]:null"  => ['arr', '', 'val', 'null']
+    splitInputNameIntoKeysArray: function(name, opts) {
+      var keys, nameWithoutType, type, _ref, f;
+      f = $.serializeJSON;
+      _ref = f.extractTypeFromInputName(name, opts); nameWithoutType = _ref[0]; type = _ref[1];
+      keys = nameWithoutType.split('['); // split string into array
+      keys = $.map(keys, function (key) { return key.replace(/\]/g, ''); }); // remove closing brackets
+      if (keys[0] === '') { keys.shift(); } // ensure no opening bracket ("[foo][inn]" should be same as "foo[inn]")
+      keys.push(type); // add type at the end
+      return keys;
+    },
+
+    // Returns [name-without-type, type] from name.
+    // "foo"              =>  ["foo",      '_']
+    // "foo:boolean"      =>  ["foo",      'boolean']
+    // "foo[bar]:null"    =>  ["foo[bar]", 'null']
+    extractTypeFromInputName: function(name, opts) {
+      var match, validTypes, f;
+      if (match = name.match(/(.*):([^:]+)$/)){
+        f = $.serializeJSON;
+
+        validTypes = f.optionKeys(opts ? opts.typeFunctions : f.defaultOptions.defaultTypes);
+        validTypes.push('skip'); // skip is a special type that makes it easy to remove
+        if (validTypes.indexOf(match[2]) !== -1) {
+          return [match[1], match[2]];
+        } else {
+          throw new Error("serializeJSON ERROR: Invalid type " + match[2] + " found in input name '" + name + "', please use one of " + validTypes.join(', '));
+        }
+      } else {
+        return [name, '_']; // no defined type, then use parse options
+      }
+    },
+
+    // Set a value in an object or array, using multiple keys to set in a nested object or array:
+    //
+    // deepSet(obj, ['foo'], v)               // obj['foo'] = v
+    // deepSet(obj, ['foo', 'inn'], v)        // obj['foo']['inn'] = v // Create the inner obj['foo'] object, if needed
+    // deepSet(obj, ['foo', 'inn', '123'], v) // obj['foo']['arr']['123'] = v //
+    //
+    // deepSet(obj, ['0'], v)                                   // obj['0'] = v
+    // deepSet(arr, ['0'], v, {useIntKeysAsArrayIndex: true})   // arr[0] = v
+    // deepSet(arr, [''], v)                                    // arr.push(v)
+    // deepSet(obj, ['arr', ''], v)                             // obj['arr'].push(v)
+    //
+    // arr = [];
+    // deepSet(arr, ['', v]          // arr => [v]
+    // deepSet(arr, ['', 'foo'], v)  // arr => [v, {foo: v}]
+    // deepSet(arr, ['', 'bar'], v)  // arr => [v, {foo: v, bar: v}]
+    // deepSet(arr, ['', 'bar'], v)  // arr => [v, {foo: v, bar: v}, {bar: v}]
+    //
+    deepSet: function (o, keys, value, opts) {
+      var key, nextKey, tail, lastIdx, lastVal, f;
+      if (opts == null) { opts = {}; }
+      f = $.serializeJSON;
+      if (f.isUndefined(o)) { throw new Error("ArgumentError: param 'o' expected to be an object or array, found undefined"); }
+      if (!keys || keys.length === 0) { throw new Error("ArgumentError: param 'keys' expected to be an array with least one element"); }
+
+      key = keys[0];
+
+      // Only one key, then it's not a deepSet, just assign the value.
+      if (keys.length === 1) {
+        if (key === '') {
+          o.push(value); // '' is used to push values into the array (assume o is an array)
+        } else {
+          o[key] = value; // other keys can be used as object keys or array indexes
+        }
+
+      // With more keys is a deepSet. Apply recursively.
+      } else {
+        nextKey = keys[1];
+
+        // '' is used to push values into the array,
+        // with nextKey, set the value into the same object, in object[nextKey].
+        // Covers the case of ['', 'foo'] and ['', 'var'] to push the object {foo, var}, and the case of nested arrays.
+        if (key === '') {
+          lastIdx = o.length - 1; // asume o is array
+          lastVal = o[lastIdx];
+          if (f.isObject(lastVal) && (f.isUndefined(lastVal[nextKey]) || keys.length > 2)) { // if nextKey is not present in the last object element, or there are more keys to deep set
+            key = lastIdx; // then set the new value in the same object element
+          } else {
+            key = lastIdx + 1; // otherwise, point to set the next index in the array
+          }
+        }
+
+        // '' is used to push values into the array "array[]"
+        if (nextKey === '') {
+          if (f.isUndefined(o[key]) || !$.isArray(o[key])) {
+            o[key] = []; // define (or override) as array to push values
+          }
+        } else {
+          if (opts.useIntKeysAsArrayIndex && f.isValidArrayIndex(nextKey)) { // if 1, 2, 3 ... then use an array, where nextKey is the index
+            if (f.isUndefined(o[key]) || !$.isArray(o[key])) {
+              o[key] = []; // define (or override) as array, to insert values using int keys as array indexes
+            }
+          } else { // for anything else, use an object, where nextKey is going to be the attribute name
+            if (f.isUndefined(o[key]) || !f.isObject(o[key])) {
+              o[key] = {}; // define (or override) as object, to set nested properties
+            }
+          }
+        }
+
+        // Recursively set the inner object
+        tail = keys.slice(1);
+        f.deepSet(o[key], tail, value, opts);
+      }
+    },
+
+    // Fill the formAsArray object with values for the unchecked checkbox inputs,
+    // using the same format as the jquery.serializeArray function.
+    // The value of the unchecked values is determined from the opts.checkboxUncheckedValue
+    // and/or the data-unchecked-value attribute of the inputs.
+    readCheckboxUncheckedValues: function (formAsArray, $form, opts) {
+      var selector, $uncheckedCheckboxes, $el, dataUncheckedValue, f;
+      if (opts == null) { opts = {}; }
+      f = $.serializeJSON;
+
+      selector = 'input[type=checkbox][name]:not(:checked):not([disabled])';
+      $uncheckedCheckboxes = $form.find(selector).add($form.filter(selector));
+      $uncheckedCheckboxes.each(function (i, el) {
+        $el = $(el);
+        dataUncheckedValue = $el.attr('data-unchecked-value');
+        if(dataUncheckedValue) { // data-unchecked-value has precedence over option opts.checkboxUncheckedValue
+          formAsArray.push({name: el.name, value: dataUncheckedValue});
+        } else {
+          if (!f.isUndefined(opts.checkboxUncheckedValue)) {
+            formAsArray.push({name: el.name, value: opts.checkboxUncheckedValue});
+          }
+        }
+      });
+    }
+
+  };
+
+}));
diff --git a/js/jquery-serializejson/jquery.serializejson.min.js b/js/jquery-serializejson/jquery.serializejson.min.js
new file mode 100644
index 0000000000..08e07581e3
--- /dev/null
+++ b/js/jquery-serializejson/jquery.serializejson.min.js
@@ -0,0 +1,10 @@
+/*!
+  SerializeJSON jQuery plugin.
+  https://github.com/marioizquierdo/jquery.serializeJSON
+  version 2.6.2 (May, 2015)
+
+  Copyright (c) 2012, 2015 Mario Izquierdo
+  Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
+  and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
+*/
+!function(e){if("function"==typeof define&&define.amd)define(["jquery"],e);else if("object"==typeof exports){var n=require("jquery");module.exports=e(n)}else e(window.jQuery||window.Zepto||window.$)}(function(e){"use strict";e.fn.serializeJSON=function(n){var r,t,s,i,a,u,o;return u=e.serializeJSON,o=u.setupOpts(n),t=this.serializeArray(),u.readCheckboxUncheckedValues(t,this,o),r={},e.each(t,function(e,n){s=u.splitInputNameIntoKeysArray(n.name,o),i=s.pop(),"skip"!==i&&(a=u.parseValue(n.value,i,o),o.parseWithFunction&&"_"===i&&(a=o.parseWithFunction(a,n.name)),u.deepSet(r,s,a,o))}),r},e.serializeJSON={defaultOptions:{checkboxUncheckedValue:void 0,parseNumbers:!1,parseBooleans:!1,parseNulls:!1,parseAll:!1,parseWithFunction:null,customTypes:{},defaultTypes:{string:function(e){return String(e)},number:function(e){return Number(e)},"boolean":function(e){var n=["false","null","undefined","","0"];return-1===n.indexOf(e)},"null":function(e){var n=["false","null","undefined","","0"];return-1===n.indexOf(e)?e:null},array:function(e){return JSON.parse(e)},object:function(e){return JSON.parse(e)},auto:function(n){return e.serializeJSON.parseValue(n,null,{parseNumbers:!0,parseBooleans:!0,parseNulls:!0})}},useIntKeysAsArrayIndex:!1},setupOpts:function(n){var r,t,s,i,a,u;u=e.serializeJSON,null==n&&(n={}),s=u.defaultOptions||{},t=["checkboxUncheckedValue","parseNumbers","parseBooleans","parseNulls","parseAll","parseWithFunction","customTypes","defaultTypes","useIntKeysAsArrayIndex"];for(r in n)if(-1===t.indexOf(r))throw new Error("serializeJSON ERROR: invalid option '"+r+"'. Please use one of "+t.join(", "));return i=function(e){return n[e]!==!1&&""!==n[e]&&(n[e]||s[e])},a=i("parseAll"),{checkboxUncheckedValue:i("checkboxUncheckedValue"),parseNumbers:a||i("parseNumbers"),parseBooleans:a||i("parseBooleans"),parseNulls:a||i("parseNulls"),parseWithFunction:i("parseWithFunction"),typeFunctions:e.extend({},i("defaultTypes"),i("customTypes")),useIntKeysAsArrayIndex:i("useIntKeysAsArrayIndex")}},parseValue:function(n,r,t){var s,i;return i=e.serializeJSON,s=t.typeFunctions&&t.typeFunctions[r],s?s(n):t.parseNumbers&&i.isNumeric(n)?Number(n):!t.parseBooleans||"true"!==n&&"false"!==n?t.parseNulls&&"null"==n?null:n:"true"===n},isObject:function(e){return e===Object(e)},isUndefined:function(e){return void 0===e},isValidArrayIndex:function(e){return/^[0-9]+$/.test(String(e))},isNumeric:function(e){return e-parseFloat(e)>=0},optionKeys:function(e){if(Object.keys)return Object.keys(e);var n,r=[];for(n in e)r.push(n);return r},splitInputNameIntoKeysArray:function(n,r){var t,s,i,a,u;return u=e.serializeJSON,a=u.extractTypeFromInputName(n,r),s=a[0],i=a[1],t=s.split("["),t=e.map(t,function(e){return e.replace(/\]/g,"")}),""===t[0]&&t.shift(),t.push(i),t},extractTypeFromInputName:function(n,r){var t,s,i;if(t=n.match(/(.*):([^:]+)$/)){if(i=e.serializeJSON,s=i.optionKeys(r?r.typeFunctions:i.defaultOptions.defaultTypes),s.push("skip"),-1!==s.indexOf(t[2]))return[t[1],t[2]];throw new Error("serializeJSON ERROR: Invalid type "+t[2]+" found in input name '"+n+"', please use one of "+s.join(", "))}return[n,"_"]},deepSet:function(n,r,t,s){var i,a,u,o,l,c;if(null==s&&(s={}),c=e.serializeJSON,c.isUndefined(n))throw new Error("ArgumentError: param 'o' expected to be an object or array, found undefined");if(!r||0===r.length)throw new Error("ArgumentError: param 'keys' expected to be an array with least one element");i=r[0],1===r.length?""===i?n.push(t):n[i]=t:(a=r[1],""===i&&(o=n.length-1,l=n[o],i=c.isObject(l)&&(c.isUndefined(l[a])||r.length>2)?o:o+1),""===a?(c.isUndefined(n[i])||!e.isArray(n[i]))&&(n[i]=[]):s.useIntKeysAsArrayIndex&&c.isValidArrayIndex(a)?(c.isUndefined(n[i])||!e.isArray(n[i]))&&(n[i]=[]):(c.isUndefined(n[i])||!c.isObject(n[i]))&&(n[i]={}),u=r.slice(1),c.deepSet(n[i],u,t,s))},readCheckboxUncheckedValues:function(n,r,t){var s,i,a,u,o;null==t&&(t={}),o=e.serializeJSON,s="input[type=checkbox][name]:not(:checked):not([disabled])",i=r.find(s).add(r.filter(s)),i.each(function(r,s){a=e(s),u=a.attr("data-unchecked-value"),u?n.push({name:s.name,value:u}):o.isUndefined(t.checkboxUncheckedValue)||n.push({name:s.name,value:t.checkboxUncheckedValue})})}}});
\ No newline at end of file
diff --git a/php/class-fieldmanager-customize-control.php b/php/class-fieldmanager-customize-control.php
index 90d210a265..d757130179 100644
--- a/php/class-fieldmanager-customize-control.php
+++ b/php/class-fieldmanager-customize-control.php
@@ -26,10 +26,18 @@ class Fieldmanager_Customize_Control extends WP_Customize_Control {
 		 * Enqueue control-related scripts and styles.
 		 */
 		public function enqueue() {
+			wp_register_script(
+				'fm-serializejson',
+				fieldmanager_get_baseurl() . 'js/jquery-serializejson/jquery.serializejson.min.js',
+				array(),
+				'2.0.0',
+				true
+			);
+
 			fm_add_script(
 				'fm_customizer',
 				'js/fieldmanager-customize.js',
-				array( 'jquery', 'underscore', 'fieldmanager_script', 'customize-controls' ),
+				array( 'jquery', 'underscore', 'fieldmanager_script', 'customize-controls', 'fm-serializejson' ),
 				'1.0.0',
 				true
 			);

From 96a9041e7e45a6bf3c2ef1fc6d0a987c1d346c1c Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Fri, 29 Jan 2016 20:49:24 -0500
Subject: [PATCH 17/76] stripslashes_deep(), use context API when saving

stripslashes_deep() matches existing submenu saving behavior.
---
 php/context/class-fieldmanager-context-customizer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/context/class-fieldmanager-context-customizer.php b/php/context/class-fieldmanager-context-customizer.php
index d7762a45df..aaa5de19f8 100644
--- a/php/context/class-fieldmanager-context-customizer.php
+++ b/php/context/class-fieldmanager-context-customizer.php
@@ -84,7 +84,7 @@ public function sanitize_callback( $value, $setting ) {
 		}
 
 		// Return the value after Fieldmanager takes a shot at it.
-		return $this->fm->presave_all( $value, $this->current_value );
+		return stripslashes_deep( $this->prepare_data( $this->current_value, $value ) );
 	}
 
 	/**

From 1155bf5c9f4cfb05645d3a9dce30db65f4e25ec4 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Fri, 29 Jan 2016 20:52:04 -0500
Subject: [PATCH 18/76] Pass context, not field, to Customize control

This lets the context manage the field object, rather than passing the
field to both the context and the control. It also lets us use the
context's own API for rendering instead of echoing it ourselves.
---
 php/class-fieldmanager-customize-control.php        |  8 ++++----
 .../class-fieldmanager-context-customizer.php       | 13 ++++++++++++-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/php/class-fieldmanager-customize-control.php b/php/class-fieldmanager-customize-control.php
index d757130179..cbf1f6eb9d 100644
--- a/php/class-fieldmanager-customize-control.php
+++ b/php/class-fieldmanager-customize-control.php
@@ -9,11 +9,11 @@
 	 */
 	class Fieldmanager_Customize_Control extends WP_Customize_Control {
 		/**
-		 * The field object to use. Supply via `$args['fm']`.
+		 * The Fieldmanager context controlling this field.
 		 *
-		 * @var Fieldmanager_Field
+		 * @var Fieldmanager_Context
 		 */
-		protected $fm;
+		protected $context;
 
 		/**
 		 * The control 'type', used in scripts to identify FM controls.
@@ -49,7 +49,7 @@ public function enqueue() {
 		 * @see Fieldmanager_Field::element_markup().
 		 */
 		public function render_content() {
-			echo $this->fm->element_markup( $this->value() );
+			$this->context->render_field();
 		}
 	}
 endif;
diff --git a/php/context/class-fieldmanager-context-customizer.php b/php/context/class-fieldmanager-context-customizer.php
index aaa5de19f8..c1fd685dfe 100644
--- a/php/context/class-fieldmanager-context-customizer.php
+++ b/php/context/class-fieldmanager-context-customizer.php
@@ -65,6 +65,17 @@ public function customize_register( $manager ) {
 		$this->init_current_value( $manager );
 	}
 
+	/**
+	 * Exposes Fieldmanager_Context::render_field() for the control to call.
+	 *
+	 * @param array $args Unused.
+	 */
+	public function render_field( $args = array() ) {
+		parent::render_field( array(
+			'data' => $this->current_value,
+		) );
+	}
+
 	/**
 	 * Filter a Customize setting value in un-slashed form.
 	 *
@@ -113,8 +124,8 @@ protected function register( $manager ) {
 		$manager->add_setting( $this->fm->name, $setting_args );
 
 		$manager->add_control( new Fieldmanager_Customize_Control( $manager, $this->fm->name, array(
-			'fm'      => $this->fm,
 			'section' => $this->fm->name,
+			'context' => $this,
 		) ) );
 	}
 

From 176460cba96ef3ad18d506135e2613e30fa744de Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Fri, 29 Jan 2016 20:56:50 -0500
Subject: [PATCH 19/76] Ensure Customize settings accept null default value

---
 .../class-fieldmanager-context-customizer.php      | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/php/context/class-fieldmanager-context-customizer.php b/php/context/class-fieldmanager-context-customizer.php
index c1fd685dfe..3b0daa65ad 100644
--- a/php/context/class-fieldmanager-context-customizer.php
+++ b/php/context/class-fieldmanager-context-customizer.php
@@ -118,10 +118,20 @@ protected function register( $manager ) {
 				'type'       => 'option',
 			)
 		);
-		$setting_args['default']           = $this->fm->default_value;
 		$setting_args['sanitize_callback'] = array( $this, 'sanitize_callback' );
 		$setting_args['section']           = $this->fm->name;
-		$manager->add_setting( $this->fm->name, $setting_args );
+		$setting = $manager->add_setting( $this->fm->name, $setting_args );
+
+		/*
+		 * If the field default is null, the setting constructor won't detect it
+		 * Adding the setting as an ID first allows the filters in
+		 * WP_Customize_Manager::add_setting() to run; adding it again as a
+		 * WP_Customize_Setting instance replaces the first without re-running
+		 * them. An alternate approach could be for FM to instatiate its own
+		 * WP_Customize_Setting extension.
+		 */
+		$setting->default = $this->fm->default_value;
+		$manager->add_setting( $setting );
 
 		$manager->add_control( new Fieldmanager_Customize_Control( $manager, $this->fm->name, array(
 			'section' => $this->fm->name,

From 43b320ae7b68d7de7a4fa8b8b185a23d631466dc Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Fri, 29 Jan 2016 21:16:53 -0500
Subject: [PATCH 20/76] Trigger an event after an FM RTE loads TinyMCE

---
 js/richtext.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/js/richtext.js b/js/richtext.js
index fc6aca88fa..e3d50dd248 100644
--- a/js/richtext.js
+++ b/js/richtext.js
@@ -36,6 +36,16 @@
 
 						try {
 							if ( 'html' !== fm.richtextarea.mode_enabled( this ) ) {
+								tinyMCEPreInit.mceInit[ ed_id ].setup = function ( ed ) {
+									ed.on( 'init', function( args ) {
+										/**
+										 * Event after TinyMCE loads for an Fieldmanager_RichTextArea.
+										 *
+										 * @var {Object} TinyMCE instance.
+										 */
+										 $( document ).trigger( 'fm_richtext_init', ed );
+									});
+								};
 								tinymce.init( tinyMCEPreInit.mceInit[ ed_id ] );
 								$( this ).closest( '.wp-editor-wrap' ).on( 'click.wp-editor', function() {
 									if ( this.id ) {

From 3c13c568ed7cb2a2711d053a5f7a856c89e78340 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Fri, 29 Jan 2016 21:18:54 -0500
Subject: [PATCH 21/76] Check for getUserSetting() before calling it

---
 js/richtext.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/js/richtext.js b/js/richtext.js
index e3d50dd248..6f3cd15e2d 100644
--- a/js/richtext.js
+++ b/js/richtext.js
@@ -138,7 +138,10 @@
 		setTimeout( fm.richtextarea.reset_core_editor_mode, 50 );
 	} );
 
-	var core_editor_state = getUserSetting( 'editor' );
+	var core_editor_state;
+	if ( typeof getUserSetting === 'function' ) {
+		core_editor_state = getUserSetting( 'editor' );
+	}
 
 	/**
 	 * If the main editor's state changes, note that change.

From 8066242aed6b421d3003a63be2ef991533914356 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Fri, 29 Jan 2016 21:19:27 -0500
Subject: [PATCH 22/76] Add support for RichTextAreas in the Customizer

---
 js/fieldmanager-customize.js                 | 28 +++++++++++++++++---
 php/class-fieldmanager-customize-control.php |  2 +-
 php/class-fieldmanager-richtextarea.php      | 26 ++++++++++++++++++
 3 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/js/fieldmanager-customize.js b/js/fieldmanager-customize.js
index 9e8b8d95a2..f0fbaae652 100644
--- a/js/fieldmanager-customize.js
+++ b/js/fieldmanager-customize.js
@@ -9,6 +9,13 @@
 (function( $, api, _ ) {
 	'use strict';
 
+	/**
+	 * Debounce interval between looking for changes after a 'keyup'.
+	 *
+	 * @type {Number}
+	 */
+	var keyupDebounceInterval = 500;
+
 	/**
 	 * Fires when an .fm-element input triggers a 'change' event.
 	 *
@@ -74,13 +81,26 @@
 	 *
 	 * @param {Event} e Event object.
 	 * @param {jQuery} $wrapper .media-wrapper jQuery object.
-	 * @param {object} attachment Attachment attributes.
-	 * @param {object} wp Global WordPress JS API.
+	 * @param {Object} attachment Attachment attributes.
+	 * @param {Object} wp Global WordPress JS API.
 	 */
 	var onFieldmanagerMediaPreview = function( e, $wrapper, attachment, wp ) {
 		reserializeControlsContainingElement( e.target );
 	};
 
+	/**
+	 * Fires after TinyMCE initializes in a Fieldmanager richtext field.
+	 *
+	 * @param {Event} e Event object.
+	 * @param {Object} ed TinyMCE instance.
+	 */
+	var onFmRichtextInit = function( e, ed ) {
+		ed.on( 'keyup AddUndo', _.debounce( function () {
+			ed.save();
+			reserializeControlsContainingElement( document.getElementById( ed.id ) );
+		}, keyupDebounceInterval ) );
+	};
+
 	/**
 	 * Fires after clicking the "Remove" link of a Fieldmanager media field.
 	 *
@@ -156,6 +176,7 @@
 	var bindToSectionExpanded = function( section ) {
 		section.container.bind( 'expanded', function() {
 			$( document ).trigger( 'fm_customizer_control_section_expanded' );
+			fm.richtextarea.add_rte_to_visible_textareas();
 		});
 	};
 
@@ -172,7 +193,7 @@
 		 * time it should affect the preview is when removing an autocomplete
 		 * selection. We allow that to occur normally.
 		 */
-		$document.on( 'keyup', '.fm-element:not(.fm-autocomplete)', _.debounce( onFmElementKeyup, 500 ) );
+		$document.on( 'keyup', '.fm-element:not(.fm-autocomplete)', _.debounce( onFmElementKeyup, keyupDebounceInterval ) );
 		$document.on( 'keyup', '.fm-autocomplete', onFmElementKeyup );
 
 		$document.on( 'change', '.fm-element', onFmElementChange );
@@ -180,6 +201,7 @@
 		$document.on( 'click', '.fmjs-remove', onFmjsRemoveClick );
 		$document.on( 'fm_sortable_drop', onFmSortableDrop );
 		$document.on( 'fieldmanager_media_preview', onFieldmanagerMediaPreview );
+		$document.on( 'fm_richtext_init', onFmRichtextInit );
 
 		/*
 		 * Hacky, because it always prompts the user to save. Unlike when we
diff --git a/php/class-fieldmanager-customize-control.php b/php/class-fieldmanager-customize-control.php
index cbf1f6eb9d..c701176d14 100644
--- a/php/class-fieldmanager-customize-control.php
+++ b/php/class-fieldmanager-customize-control.php
@@ -37,7 +37,7 @@ public function enqueue() {
 			fm_add_script(
 				'fm_customizer',
 				'js/fieldmanager-customize.js',
-				array( 'jquery', 'underscore', 'fieldmanager_script', 'customize-controls', 'fm-serializejson' ),
+				array( 'jquery', 'underscore', 'editor', 'quicktags', 'fieldmanager_script', 'customize-controls', 'fm-serializejson' ),
 				'1.0.0',
 				true
 			);
diff --git a/php/class-fieldmanager-richtextarea.php b/php/class-fieldmanager-richtextarea.php
index ea3755bab6..c694acd078 100644
--- a/php/class-fieldmanager-richtextarea.php
+++ b/php/class-fieldmanager-richtextarea.php
@@ -74,6 +74,13 @@ class Fieldmanager_RichTextArea extends Fieldmanager_Field {
 	 */
 	protected $edit_config = false;
 
+	/**
+	 * Whether this class is hooked into the Customizer to print editor scripts.
+	 *
+	 * @var bool
+	 */
+	public static $has_registered_customize_scripts = false;
+
 	/**
 	 * Construct defaults for this field.
 	 *
@@ -113,6 +120,7 @@ public function form_element( $value = '' ) {
 			'textarea_name'  => $this->get_form_name(),
 			'editor_class'   => 'fm-element fm-richtext',
 			'tinymce'        => array( 'wp_skip_init' => true ),
+			'teeny'          => is_customize_preview(),
 		) );
 
 		if ( $proto ) {
@@ -252,6 +260,24 @@ protected function add_editor_filters() {
 		// removing whatever it added.
 		remove_filter( 'the_editor_content', 'wp_htmledit_pre' );
 		remove_filter( 'the_editor_content', 'wp_richedit_pre' );
+
+		if ( ! self::$has_registered_customize_scripts ) {
+			add_action( 'customize_controls_print_footer_scripts', array( $this, 'customize_controls_print_footer_scripts' ), 50 );
+			self::$has_registered_customize_scripts = true;
+		}
+	}
+
+	/**
+	 * Print Customizer control scripts in the footer.
+	 */
+	public function customize_controls_print_footer_scripts() {
+		if ( class_exists( '_WP_Editors' ) ) {
+			if ( false === has_action( 'customize_controls_print_footer_scripts', array( '_WP_Editors', 'editor_js' ) ) ) {
+				// Print the necessary JS for an RTE, unless we can't or suspect it's already there.
+				_WP_Editors::editor_js();
+				_WP_Editors::enqueue_scripts();
+			}
+		}
 	}
 
 	/**

From 591ae7b58a68516c43f3456328c5dd1920f5be79 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Fri, 29 Jan 2016 22:29:56 -0500
Subject: [PATCH 23/76] Don't reserialize each control on 'ready'

This takes a slightly more limited approach to reserializing controls so
that their default values take effect.
---
 js/fieldmanager-customize.js | 48 ++++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/js/fieldmanager-customize.js b/js/fieldmanager-customize.js
index f0fbaae652..34ca0c3835 100644
--- a/js/fieldmanager-customize.js
+++ b/js/fieldmanager-customize.js
@@ -168,15 +168,36 @@
 	};
 
 	/**
-	 * Trigger a Fieldmanager event when a Customizer section expands.
+	 * Fires when a Customizer Section expands.
 	 *
-	 * We bind to sections whether or not they have FM controls in case a
-	 * control is added dynamically.
+	 * @param {Object} section Customizer Section object.
 	 */
-	var bindToSectionExpanded = function( section ) {
-		section.container.bind( 'expanded', function() {
-			$( document ).trigger( 'fm_customizer_control_section_expanded' );
+	var onSectionExpanded = function( section ) {
+		/*
+		 * Trigger a Fieldmanager event when a Customizer section expands.
+		 *
+		 * We bind to sections whether or not they have FM controls in case a
+		 * control is added dynamically.
+		 */
+		$( document ).trigger( 'fm_customizer_control_section_expanded' );
+
+		if ( fm.richtextarea ) {
 			fm.richtextarea.add_rte_to_visible_textareas();
+		}
+
+		/*
+		 * Reserialize any Fieldmanager controls in this section with null
+		 * values. We assume null indicates nothing has been saved to the
+		 * database, so we want to make sure default values take effect in the
+		 * preview and are submitted on save as they would be in other contexts.
+		 */
+		_.each( section.controls(), function ( control ) {
+			if (
+				control.settings.default &&
+				null === control.settings.default.get()
+			) {
+				reserializeControl( control );
+			}
 		});
 	};
 
@@ -202,17 +223,6 @@
 		$document.on( 'fm_sortable_drop', onFmSortableDrop );
 		$document.on( 'fieldmanager_media_preview', onFieldmanagerMediaPreview );
 		$document.on( 'fm_richtext_init', onFmRichtextInit );
-
-		/*
-		 * Hacky, because it always prompts the user to save. Unlike when we
-		 * create individual settings, the field "value" is always going to
-		 * change when it's reserialized. It also ensures defaults are applied
-		 * when the Customizer loads. But if the user saved those changes, the
-		 * defaults would be applied, as opposed to a submenu page, where there
-		 * isn't an AYS prompt. Creating a query string on the PHP side might
-		 * work, but that's even weirder.
-		 */
-		reserializeEachControl();
 	};
 
 	/**
@@ -236,7 +246,9 @@
 	 */
 	var addSection = function( section ) {
 		// It would be more efficient to do this only when adding an FM control to a section.
-		bindToSectionExpanded( section );
+		section.container.bind( 'expanded', function () {
+			onSectionExpanded( section );
+		} );
 	};
 
 	if ( typeof api !== 'undefined' ) {

From 1d6148cf518660ed8ccad68890716504461834bd Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sat, 30 Jan 2016 21:33:00 -0500
Subject: [PATCH 24/76] Expose setting functions in the global fm object

---
 js/fieldmanager-customize.js | 127 ++++++++++++++++++-----------------
 1 file changed, 66 insertions(+), 61 deletions(-)

diff --git a/js/fieldmanager-customize.js b/js/fieldmanager-customize.js
index 34ca0c3835..a6d871eba0 100644
--- a/js/fieldmanager-customize.js
+++ b/js/fieldmanager-customize.js
@@ -1,14 +1,65 @@
-/* global document, jQuery, wp, _ */
+/* global document, jQuery, wp, _, fm */
 /**
  * Integrate Fieldmanager and the Customizer.
  *
  * @param {function} $ jQuery
- * @param {function} api wp.customize API.
+ * @param {function} api Customizer API.
  * @param {function} _ Underscore
+ * @param {Object} fm Fieldmanager API.
  */
-(function( $, api, _ ) {
+(function( $, api, _, fm ) {
 	'use strict';
 
+	fm.customize = {
+		/**
+		 * Set the values of all Fieldmanager controls.
+		 */
+		setEachControl: function () {
+			api.control.each( this.setControl );
+		},
+
+		/**
+		 * Set the value of any Fieldmanager control with a given element in its container.
+		 *
+		 * @param {Element} el Element to look for.
+		 */
+		setControlsContainingElement: function ( el ) {
+			var that = this;
+
+			api.control.each(function( control ) {
+				if ( control.container.find( el ).length ) {
+					that.setControl( control );
+				}
+			});
+		},
+
+		/**
+		 * Set a Fieldmanager setting to its control's form values.
+		 *
+		 * @param {Object} control Customizer Control object.
+		 */
+		setControl: function ( control ) {
+			var $element;
+			var serialized;
+			var value;
+
+			if ( 'fieldmanager' !== control.params.type ) {
+				return;
+			}
+
+			$element = control.container.find( '.fm-element' );
+
+			if ( $.serializeJSON ) {
+				serialized = $element.serializeJSON();
+				value = serialized[ control.id ];
+			} else {
+				value = $element.serialize();
+			}
+
+			control.setting.set( value );
+		},
+	};
+
 	/**
 	 * Debounce interval between looking for changes after a 'keyup'.
 	 *
@@ -22,7 +73,7 @@
 	 * @param {Event} e Event object.
 	 */
 	var onFmElementChange = function( e ) {
-		reserializeControlsContainingElement( e.target );
+		fm.customize.setControlsContainingElement( e.target );
 	};
 
 	/**
@@ -54,7 +105,7 @@
 			}
 		}
 
-		reserializeControlsContainingElement( e.target );
+		fm.customize.setControlsContainingElement( e.target );
 	};
 
 	/**
@@ -64,7 +115,7 @@
 	 * @param {Element} el The sorted element.
 	 */
 	var onFmSortableDrop = function ( e, el ) {
-		reserializeControlsContainingElement( el );
+		fm.customize.setControlsContainingElement( el );
 	};
 
 	/**
@@ -73,7 +124,7 @@
 	 * @param {Event} e Event object.
 	 */
 	var onFmAddedElement = function( e ) {
-		reserializeControlsContainingElement( e.target );
+		fm.customize.setControlsContainingElement( e.target );
 	};
 
 	/**
@@ -85,7 +136,7 @@
 	 * @param {Object} wp Global WordPress JS API.
 	 */
 	var onFieldmanagerMediaPreview = function( e, $wrapper, attachment, wp ) {
-		reserializeControlsContainingElement( e.target );
+		fm.customize.setControlsContainingElement( e.target );
 	};
 
 	/**
@@ -97,7 +148,7 @@
 	var onFmRichtextInit = function( e, ed ) {
 		ed.on( 'keyup AddUndo', _.debounce( function () {
 			ed.save();
-			reserializeControlsContainingElement( document.getElementById( ed.id ) );
+			fm.customize.setControlsContainingElement( document.getElementById( ed.id ) );
 		}, keyupDebounceInterval ) );
 	};
 
@@ -107,8 +158,8 @@
 	 * @param {Event} e Event object.
 	 */
 	 var onFmMediaRemoveClick = function ( e ) {
-		// The control no longer contains the element, so reserialize all of them.
-		reserializeEachControl();
+		// The control no longer contains the element, so set all of them.
+		fm.customize.setEachControl();
 	 };
 
 	 /**
@@ -117,56 +168,10 @@
 	  * @param {Event} e Event object.
 	  */
 	 var onFmjsRemoveClick = function ( e ) {
-		// The control no longer contains the element, so reserialize all of them.
-		reserializeEachControl();
+		// The control no longer contains the element, so set all of them.
+		fm.customize.setEachControl();
 	 };
 
-	/**
-	 * Set the values of all Fieldmanager controls.
-	 */
-	var reserializeEachControl = function() {
-		api.control.each( reserializeControl );
-	};
-
-	/**
-	 * Set the value of any Fieldmanager control with a given element in its container.
-	 *
-	 * @param {Element} el Element to look for.
-	 */
-	var reserializeControlsContainingElement = function( el ) {
-		api.control.each(function( control ) {
-			if ( control.container.find( el ).length ) {
-				reserializeControl( control );
-			}
-		});
-	};
-
-	/**
-	 * Set a Fieldmanager control to its form values.
-	 *
-	 * @param {Object} control Customizer Control object.
-	 */
-	var reserializeControl = function ( control ) {
-		var $element;
-		var serialized;
-		var value;
-
-		if ( 'fieldmanager' !== control.params.type ) {
-			return;
-		}
-
-		$element = control.container.find( '.fm-element' );
-
-		if ( $.serializeJSON ) {
-			serialized = $element.serializeJSON();
-			value = serialized[ control.id ];
-		} else {
-			value = $element.serialize();
-		}
-
-		control.setting.set( value );
-	};
-
 	/**
 	 * Fires when a Customizer Section expands.
 	 *
@@ -196,7 +201,7 @@
 				control.settings.default &&
 				null === control.settings.default.get()
 			) {
-				reserializeControl( control );
+				fm.customize.setControl( control );
 			}
 		});
 	};
@@ -256,4 +261,4 @@
 		api.bind( 'error', error );
 		api.section.bind( 'add', addSection );
 	}
-})( jQuery, wp.customize, _ );
+})( jQuery, wp.customize, _, fm );

From 5d51f6e4cd43b6cc22883b665d8e20e653542b0b Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Thu, 4 Feb 2016 17:13:03 -0500
Subject: [PATCH 25/76] Include fm-customize in script tests

---
 php/class-fieldmanager-customize-control.php   |  2 +-
 tests/php/test-fieldmanager-script-loading.php | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/php/class-fieldmanager-customize-control.php b/php/class-fieldmanager-customize-control.php
index c701176d14..5b9ebaab6c 100644
--- a/php/class-fieldmanager-customize-control.php
+++ b/php/class-fieldmanager-customize-control.php
@@ -35,7 +35,7 @@ public function enqueue() {
 			);
 
 			fm_add_script(
-				'fm_customizer',
+				'fm-customize',
 				'js/fieldmanager-customize.js',
 				array( 'jquery', 'underscore', 'editor', 'quicktags', 'fieldmanager_script', 'customize-controls', 'fm-serializejson' ),
 				'1.0.0',
diff --git a/tests/php/test-fieldmanager-script-loading.php b/tests/php/test-fieldmanager-script-loading.php
index f3c79f027c..63b309a779 100644
--- a/tests/php/test-fieldmanager-script-loading.php
+++ b/tests/php/test-fieldmanager-script-loading.php
@@ -11,6 +11,9 @@ class Test_Fieldmanager_Script_Loading extends WP_UnitTestCase {
 	public function setUp() {
 		parent::setUp();
 
+		require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
+		$customize_manager = new WP_Customize_Manager();
+
 		// Spoof is_admin() for fm_add_script().
 		$this->screen = get_current_screen();
 		set_current_screen( 'dashboard-user' );
@@ -36,6 +39,13 @@ public function setUp() {
 		new Fieldmanager_RichTextArea( 'Test' );
 		new Fieldmanager_Colorpicker( 'Test' );
 
+		$control = new Fieldmanager_Customize_Control(
+			$customize_manager,
+			'test',
+			array( 'context' => $this->getMock( 'Fieldmanager_Context' ) )
+		);
+		$control->enqueue();
+
 		do_action( 'wp_enqueue_scripts' );
 		do_action( 'admin_enqueue_scripts' );
 	}
@@ -69,6 +79,7 @@ public function script_data() {
 			array( 'fm_select_js', array() ),
 			array( 'grid', array() ),
 			array( 'fm_colorpicker', array( 'jquery', 'wp-color-picker' ) ),
+			array( 'fm-customize', array( 'jquery', 'underscore', 'editor', 'quicktags', 'fieldmanager_script', 'customize-controls', 'fm-serializejson' ) ),
 		);
 	}
 

From 7c991b8dd77f1ff1300f3b1ccce49ba30e9345d0 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sun, 7 Feb 2016 18:26:16 -0500
Subject: [PATCH 26/76] Add support for Colorpickers in the Customizer

---
 js/fieldmanager-colorpicker.js | 23 +++++++++++++++++++++--
 js/fieldmanager-customize.js   | 15 +++++++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/js/fieldmanager-colorpicker.js b/js/fieldmanager-colorpicker.js
index 4d6fc278f8..19fbde69ab 100644
--- a/js/fieldmanager-colorpicker.js
+++ b/js/fieldmanager-colorpicker.js
@@ -2,9 +2,28 @@
 
 	fm.colorpicker = {
 		init: function() {
-			$( '.fm-colorpicker-popup:visible' ).wpColorPicker();
+			$( '.fm-colorpicker-popup:visible' ).wpColorPicker({
+				change: function ( e, ui ) {
+					// Make sure the input's value attribute also changes.
+					$( this ).attr( 'value', ui.color.toString() );
+					fm.colorpicker.triggerUpdateEvent( this );
+				},
+				clear: function () {
+					// Make sure the input's value attribute also changes.
+					$( this ).attr( 'value', '' );
+					fm.colorpicker.triggerUpdateEvent( this );
+				},
+			});
+		},
+		triggerUpdateEvent: function ( el ) {
+			/**
+			 * Trigger a common event for a value 'change' or 'clear'.
+			 *
+			 * @var {Element} Colorpicker element.
+			 */
+			$( document ).trigger( 'fm_colorpicker_update', el );
 		}
-	}
+	};
 
 	$( document ).ready( fm.colorpicker.init );
 	$( document ).on( 'fm_collapsible_toggle fm_added_element fm_displayif_toggle fm_activate_tab', fm.colorpicker.init );
diff --git a/js/fieldmanager-customize.js b/js/fieldmanager-customize.js
index a6d871eba0..b68e55a3d8 100644
--- a/js/fieldmanager-customize.js
+++ b/js/fieldmanager-customize.js
@@ -152,6 +152,16 @@
 		}, keyupDebounceInterval ) );
 	};
 
+	/**
+	 * Fires after a Fieldmanager colorpicker field updates.
+	 *
+	 * @param {Event} e Event object.
+	 * @param {Element} el Colorpicker element.
+	 */
+	var onFmColorpickerUpdate = function( e, el ) {
+		fm.customize.setControlsContainingElement( el );
+	};
+
 	/**
 	 * Fires after clicking the "Remove" link of a Fieldmanager media field.
 	 *
@@ -190,6 +200,10 @@
 			fm.richtextarea.add_rte_to_visible_textareas();
 		}
 
+		if ( fm.colorpicker ) {
+			fm.colorpicker.init();
+		}
+
 		/*
 		 * Reserialize any Fieldmanager controls in this section with null
 		 * values. We assume null indicates nothing has been saved to the
@@ -228,6 +242,7 @@
 		$document.on( 'fm_sortable_drop', onFmSortableDrop );
 		$document.on( 'fieldmanager_media_preview', onFieldmanagerMediaPreview );
 		$document.on( 'fm_richtext_init', onFmRichtextInit );
+		$document.on( 'fm_colorpicker_update', onFmColorpickerUpdate );
 	};
 
 	/**

From 9e98884dfefc194088c49648abdc16fd435f94f3 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Wed, 10 Feb 2016 22:27:28 -0500
Subject: [PATCH 27/76] Introduce Fieldmanager_Customize_Setting

The new object sets the default value, sanitize callback, and type where
those were previously passed as constructor arguments.

we also extend the _preview_filter() so we can call value() during the
default sanitizing callback, fetching the current option value for
Fieldmanager_Field::presave_all(), without creating an infinite loop.
Being able to call value() means we can remove the
Fieldmanager_Context_Customizer::current_value logic, which didn't
account for newly saved values from the Customizer anyway.

Also includes a bit of restructuring to make the context and the objects
it creates easier to extend.

Adds PHP tests for new classes.
---
 fieldmanager.php                              |   4 +
 php/class-fieldmanager-customize-control.php  |  23 +-
 php/class-fieldmanager-customize-setting.php  |  68 ++++
 .../class-fieldmanager-context-customizer.php | 117 ++++---
 tests/php/bootstrap.php                       |   2 +
 .../test-fieldmanager-context-customizer.php  | 303 ++++++++++++++++++
 .../test-fieldmanager-customize-control.php   |  92 ++++++
 .../test-fieldmanager-customize-setting.php   |  78 +++++
 .../php/test-fieldmanager-script-loading.php  |   6 +-
 ...s-fieldmanager-customizer-unittestcase.php |  15 +
 10 files changed, 641 insertions(+), 67 deletions(-)
 create mode 100644 php/class-fieldmanager-customize-setting.php
 create mode 100644 tests/php/test-fieldmanager-context-customizer.php
 create mode 100644 tests/php/test-fieldmanager-customize-control.php
 create mode 100644 tests/php/test-fieldmanager-customize-setting.php
 create mode 100644 tests/php/testcase/class-fieldmanager-customizer-unittestcase.php

diff --git a/fieldmanager.php b/fieldmanager.php
index c758108f24..81bcd2592c 100644
--- a/fieldmanager.php
+++ b/fieldmanager.php
@@ -74,6 +74,10 @@ function fieldmanager_load_class( $class ) {
 		return fieldmanager_load_file( 'class-fieldmanager-customize-control.php' );
 	}
 
+	if ( 'Fieldmanager_Customize_Setting' === $class ) {
+		return fieldmanager_load_file( 'class-fieldmanager-customize-setting.php' );
+	}
+
 	return fieldmanager_load_file( 'class-fieldmanager-' . $class_id . '.php', $class );
 }
 
diff --git a/php/class-fieldmanager-customize-control.php b/php/class-fieldmanager-customize-control.php
index 5b9ebaab6c..c3ce9db806 100644
--- a/php/class-fieldmanager-customize-control.php
+++ b/php/class-fieldmanager-customize-control.php
@@ -22,6 +22,23 @@ class Fieldmanager_Customize_Control extends WP_Customize_Control {
 		 */
 		public $type = 'fieldmanager';
 
+		/**
+		 * Constructor.
+		 *
+		 * @param WP_Customize_Manager $manager
+		 * @param string $id Control ID.
+		 * @param array $args Control arguments, including $context.
+		 */
+		public function __construct( $manager, $id, $args = array() ) {
+			parent::__construct( $manager, $id, $args );
+
+			if ( ! ( $this->context instanceof Fieldmanager_Context_Customizer ) && FM_DEBUG ) {
+				throw new FM_Developer_Exception(
+					__( 'Fieldmanager_Customize_Control requires a Fieldmanager_Context_Customizer', 'fieldmanager' )
+				);
+			}
+		}
+
 		/**
 		 * Enqueue control-related scripts and styles.
 		 */
@@ -46,10 +63,10 @@ public function enqueue() {
 		/**
 		 * Render the control's content.
 		 *
-		 * @see Fieldmanager_Field::element_markup().
+		 * @see Fieldmanager_Context::render_field().
 		 */
-		public function render_content() {
-			$this->context->render_field();
+		protected function render_content() {
+			$this->context->render_field( array( 'data' => $this->value() ) );
 		}
 	}
 endif;
diff --git a/php/class-fieldmanager-customize-setting.php b/php/class-fieldmanager-customize-setting.php
new file mode 100644
index 0000000000..f0629388bb
--- /dev/null
+++ b/php/class-fieldmanager-customize-setting.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Class file for Fieldmanager_Customize_Setting.
+ */
+
+if ( class_exists( 'WP_Customize_Setting' ) ) :
+	/**
+	 * Represent a Fieldmanager field as a Customizer setting.
+	 */
+	class Fieldmanager_Customize_Setting extends WP_Customize_Setting {
+		/**
+		 * The Fieldmanager context controlling this setting.
+		 *
+		 * @var Fieldmanager_Context_Customizer
+		 */
+		protected $context;
+
+		/**
+		 * Constructor.
+		 *
+		 * @param WP_Customize_Manager $manager
+		 * @param string $id Setting ID.
+		 * @param array $args Setting arguments, including $context.
+		 */
+		public function __construct( $manager, $id, $args = array() ) {
+			if ( isset( $args['context'] ) && ( $args['context'] instanceof Fieldmanager_Context ) ) {
+				$this->context = $args['context'];
+
+				// Set the default without checking isset() to support null values.
+				$this->default = $this->context->fm->default_value;
+
+				// Sanitize with the context.
+				$this->sanitize_callback = array( $this->context, 'sanitize_callback' );
+
+				// Use the Fieldmanager submenu default.
+				$this->type = 'option';
+			} elseif ( FM_DEBUG ) {
+				throw new FM_Developer_Exception( __( 'Fieldmanager_Customize_Setting requires a Fieldmanager_Context_Customizer', 'fieldmanager' ) );
+			}
+
+			parent::__construct( $manager, $id, $args );
+		}
+
+		/**
+		 * Filter non-multidimensional theme mods and options.
+		 *
+		 * Settings created with the Customizer context are non-multidimensional
+		 * by default. If you create your own multidimensional settings, you
+		 * might need to extend _multidimensional_preview_filter() accordingly.
+		 *
+		 * @param mixed $original Old value.
+		 * @return mixed New or old value.
+		 */
+		public function _preview_filter( $original ) {
+			/*
+			 * Don't continue to the parent _preview_filter() while sanitizing.
+			 * _preview_filter() eventually calls sanitize_callback(), which
+			 * calls Fieldmanager_Context_Customizer::sanitize_callback(), which
+			 * calls WP_Customize_Setting::value(), which ends up back here.
+			 */
+			if ( doing_filter( "customize_sanitize_{$this->id}" ) ) {
+				return $original;
+			}
+
+			return parent::_preview_filter( $original );
+		}
+	}
+endif;
diff --git a/php/context/class-fieldmanager-context-customizer.php b/php/context/class-fieldmanager-context-customizer.php
index 3b0daa65ad..78cfc48d09 100644
--- a/php/context/class-fieldmanager-context-customizer.php
+++ b/php/context/class-fieldmanager-context-customizer.php
@@ -10,24 +10,21 @@
  */
 class Fieldmanager_Context_Customizer extends Fieldmanager_Context {
 	/**
-	 * The value of the setting before any changes are submitted via the Customizer.
-	 *
-	 * @see Fieldmanager_Field::presave_all().
+	 * @var string|array $args {
+	 *     The title to use with the {@see WP_Customize_Section}, or arrays of
+	 *     arguments to construct Customizer objects.
 	 *
-	 * @var mixed
+	 *     @type array $section_args Arguments for constructing a WP_Customize_Section.
+	 *     @type array $setting_args Arguments for constructing a {@see Fieldmanager_Customize_Setting}.
+	 *     @type array $control_args Arguments for constructing a {@see Fieldmanager_Customize_Control}.
+	 * }
 	 */
-	protected $current_value;
+	protected $args;
 
 	/**
 	 * Constructor.
 	 *
-	 * @param string|array $args {
-	 *     The title to use with the {@see WP_Customize_Section}, or arrays of
-	 *     arguments to construct the Customizer section and setting.
-	 *
-	 *     @type array $section_args Arguments for constructing a WP_Customize_Section.
-	 *     @type array $setting_args Arguments for constructing a {@see WP_Customize_Setting}.
-	 * }
+	 * @param string|array $args Section title or Customizer object arguments.
 	 * @param Fieldmanager_Field $fm Field object to add to the Customizer.
 	 */
 	public function __construct( $args, $fm ) {
@@ -38,6 +35,7 @@ public function __construct( $args, $fm ) {
 		$this->args = wp_parse_args( $args, array(
 			'section_args' => array(),
 			'setting_args' => array(),
+			'control_args' => array(),
 		) );
 
 		$this->fm = $fm;
@@ -52,17 +50,6 @@ public function __construct( $args, $fm ) {
 	 */
 	public function customize_register( $manager ) {
 		$this->register( $manager );
-		/*
-		 * Get the current setting value for Fieldmanager_Field::presave_all()
-		 * before the setting's preview method is called.
-		 *
-		 * WP_Customize_Setting::preview() adds filters to get_option() and
-		 * get_theme_mod() that eventually call the setting's sanitize() method.
-		 * Attempting to call WP_Customize_Setting::value() inside of
-		 * Fieldmanager_Context_Customizer::sanitize_callback() creates an
-		 * infinite loop.
-		 */
-		$this->init_current_value( $manager );
 	}
 
 	/**
@@ -71,9 +58,7 @@ public function customize_register( $manager ) {
 	 * @param array $args Unused.
 	 */
 	public function render_field( $args = array() ) {
-		parent::render_field( array(
-			'data' => $this->current_value,
-		) );
+		return parent::render_field( $args );
 	}
 
 	/**
@@ -89,13 +74,13 @@ public function sanitize_callback( $value, $setting ) {
 			parse_str( $value, $value );
 		}
 
-		if ( is_array( $value ) && isset( $value[ $this->fm->name ] ) ) {
+		if ( is_array( $value ) && array_key_exists( $this->fm->name, $value ) ) {
 			// If the option name is the top-level array key, get just the value.
 			$value = $value[ $this->fm->name ];
 		}
 
 		// Return the value after Fieldmanager takes a shot at it.
-		return stripslashes_deep( $this->prepare_data( $this->current_value, $value ) );
+		return stripslashes_deep( $this->prepare_data( $setting->value(), $value ) );
 	}
 
 	/**
@@ -104,47 +89,53 @@ public function sanitize_callback( $value, $setting ) {
 	 * @param WP_Customize_Manager $manager WP_Customize_Manager instance.
 	 */
 	protected function register( $manager ) {
-		$manager->add_section( $this->fm->name, wp_parse_args(
-			$this->args['section_args'],
-			array()
-		) );
-
-		// Set Fieldmanager defaults after parsing the user args, then register the setting.
-		$setting_args = wp_parse_args(
-			$this->args['setting_args'],
-			array(
-				// Use the capability passed to Fieldmanager_Field::add_customizer_section().
-				'capability' => $manager->get_section( $this->fm->name )->capability,
-				'type'       => 'option',
-			)
-		);
-		$setting_args['sanitize_callback'] = array( $this, 'sanitize_callback' );
-		$setting_args['section']           = $this->fm->name;
-		$setting = $manager->add_setting( $this->fm->name, $setting_args );
+		$this->register_section( $manager );
+		$this->register_setting( $manager );
+		$this->register_control( $manager );
+	}
 
-		/*
-		 * If the field default is null, the setting constructor won't detect it
-		 * Adding the setting as an ID first allows the filters in
-		 * WP_Customize_Manager::add_setting() to run; adding it again as a
-		 * WP_Customize_Setting instance replaces the first without re-running
-		 * them. An alternate approach could be for FM to instatiate its own
-		 * WP_Customize_Setting extension.
-		 */
-		$setting->default = $this->fm->default_value;
-		$manager->add_setting( $setting );
+	/**
+	 * Add a Customizer section for this field.
+	 *
+	 * @param WP_Customize_Manager $manager
+	 * @return WP_Customize_Section Section object, where supported.
+	 */
+	protected function register_section( $manager ) {
+		return $manager->add_section( $this->fm->name, $this->args['section_args'] );
+	}
 
-		$manager->add_control( new Fieldmanager_Customize_Control( $manager, $this->fm->name, array(
-			'section' => $this->fm->name,
-			'context' => $this,
-		) ) );
+	/**
+	 * Add a Customizer setting for this field.
+	 *
+	 * @param WP_Customize_Manager $manager
+	 * @return Fieldmanager_Customize_Setting Setting object, where supported.
+	 */
+	protected function register_setting( $manager ) {
+		return $manager->add_setting(
+			new Fieldmanager_Customize_Setting( $manager, $this->fm->name, wp_parse_args(
+				$this->args['setting_args'],
+				array(
+					'context' => $this,
+				)
+			) )
+		);
 	}
 
 	/**
-	 * Initialize $current_value for the type of Customizer setting.
+	 * Add a Customizer control for this field.
 	 *
-	 * @param WP_Customize_Manager $manager WP_Customize_Manager instance.
+	 * @param WP_Customize_Manager $manager
+	 * @return Fieldmanager_Customize_Control Control object, where supported.
 	 */
-	protected function init_current_value( $manager ) {
-		$this->current_value = $manager->get_setting( $this->fm->name )->value();
+	protected function register_control( $manager ) {
+		return $manager->add_control(
+			new Fieldmanager_Customize_Control( $manager, $this->fm->name, wp_parse_args(
+				$this->args['control_args'],
+				array(
+					'section' => $this->fm->name,
+					'context' => $this,
+				)
+			) )
+		);
 	}
 }
diff --git a/tests/php/bootstrap.php b/tests/php/bootstrap.php
index 2face6a065..04469800fd 100644
--- a/tests/php/bootstrap.php
+++ b/tests/php/bootstrap.php
@@ -25,6 +25,8 @@ function _manually_load_plugin() {
 
 require $_tests_dir . '/includes/bootstrap.php';
 
+require dirname( __FILE__ ) . '/testcase/class-fieldmanager-customizer-unittestcase.php';
+
 /**
  * Is the current version of WordPress at least ... ?
  *
diff --git a/tests/php/test-fieldmanager-context-customizer.php b/tests/php/test-fieldmanager-context-customizer.php
new file mode 100644
index 0000000000..8176034710
--- /dev/null
+++ b/tests/php/test-fieldmanager-context-customizer.php
@@ -0,0 +1,303 @@
+<?php
+/**
+ * @group customize
+ */
+class Test_Fieldmanager_Context_Customizer extends Fieldmanager_Customizer_UnitTestCase {
+	protected $field;
+
+	function setUp() {
+		parent::setUp();
+		$this->field = new Fieldmanager_TextField( array( 'name' => 'foo' ) );
+	}
+
+	function test_bare_section() {
+		new Fieldmanager_Context_Customizer( array(), $this->field );
+		$this->register();
+		$this->assertInstanceOf( 'WP_Customize_Section', $this->manager->get_section( $this->field->name ) );
+	}
+
+	function test_section_title() {
+		$title = rand_str();
+
+		new Fieldmanager_Context_Customizer( $title, $this->field );
+		$this->register();
+		$this->assertSame( $title, $this->manager->get_section( $this->field->name )->title );
+	}
+
+	function test_section_args() {
+		$title = rand_str();
+		$priority = rand( 0, 100 );
+
+		new Fieldmanager_Context_Customizer( array(
+			'section_args' => array(
+				'title' => $title,
+				'priority' => $priority,
+			),
+		), $this->field );
+
+		$this->register();
+
+		$actual = $this->manager->get_section( $this->field->name );
+		$this->assertSame( $title, $actual->title );
+		$this->assertSame( $priority, $actual->priority );
+	}
+
+	function test_bare_setting() {
+		new Fieldmanager_Context_Customizer( 'Foo', $this->field );
+		$this->register();
+		$this->assertInstanceOf( 'Fieldmanager_Customize_Setting', $this->manager->get_setting( $this->field->name ) );
+	}
+
+	function test_setting_args() {
+		$capability = 'edit_thing';
+		$default = rand_str();
+
+		new Fieldmanager_Context_Customizer( array(
+			'setting_args' => array(
+				'capability' => $capability,
+				'default' => $default
+			),
+		), $this->field );
+
+		$this->register();
+
+		$actual = $this->manager->get_setting( $this->field->name );
+		$this->assertSame( $capability, $actual->capability );
+		$this->assertSame( $default, $actual->default );
+	}
+
+	function test_bare_control() {
+		new Fieldmanager_Context_Customizer( 'Foo', $this->field );
+
+		$this->register();
+
+		$actual = $this->manager->get_control( $this->field->name );
+		$this->assertInstanceOf( 'Fieldmanager_Customize_Control', $actual );
+		$this->assertSame( $this->field->name, $actual->section );
+		$this->assertInstanceOf( 'Fieldmanager_Customize_Setting', $actual->settings['default'] );
+	}
+
+	function test_control_args() {
+		$label = rand_str();
+		$section = rand_str();
+
+		new Fieldmanager_Context_Customizer( array(
+			'control_args' => array(
+				'label' => $label,
+				'section' => $section,
+			),
+		), $this->field );
+
+		$this->register();
+
+		$actual = $this->manager->get_control( $this->field->name );
+		$this->assertSame( $section, $actual->section );
+		$this->assertSame( $label, $actual->label );
+	}
+
+	function test_multiple_args() {
+		$title = rand_str();
+		$theme_supports = rand_str();
+		$sanitize_callback = 'absint';
+		$type = 'theme_mod';
+		$input_attrs = array( rand_str(), rand_str() );
+
+		new Fieldmanager_Context_Customizer( array(
+			'section_args' => array(
+				'title' => $title,
+				'theme_supports' => $theme_supports,
+			),
+			'setting_args' => array(
+				'sanitize_callback' => $sanitize_callback,
+				'type' => $type,
+			),
+			'control_args' => array(
+				'input_attrs' => $input_attrs,
+			),
+		), $this->field );
+
+		$this->register();
+
+		$section = $this->manager->get_section( $this->field->name );
+		$this->assertSame( $title, $section->title );
+		$this->assertSame( $theme_supports, $section->theme_supports );
+
+		$setting = $this->manager->get_setting( $this->field->name );
+		$this->assertSame( $sanitize_callback, $setting->sanitize_callback );
+		$this->assertSame( $type, $setting->type );
+
+		$control = $this->manager->get_control( $this->field->name );
+		$this->assertSame( $input_attrs, $control->input_attrs );
+	}
+
+	/**
+	 * @expectedException FM_Exception
+	 */
+	function test_sanitize_string() {
+		$value = rand_str();
+
+		$context = new Fieldmanager_Context_Customizer( 'Foo', $this->field );
+		$this->register();
+		$setting = $this->manager->get_setting( $this->field->name );
+
+		$this->assertSame( $value, $context->sanitize_callback( $value, $setting ) );
+		$this->assertSame( $value, $context->sanitize_callback( "{$this->field->name}={$value}", $setting ) );
+		$context->sanitize_callback( array( 'Not', 'a', 'string' ), $setting );
+	}
+
+	function test_sanitize_group() {
+		$fm = new Fieldmanager_Group( array(
+			'name'           => 'option_fields',
+			'limit'          => 0,
+			'children'       => array(
+				'repeatable_group' => new Fieldmanager_Group( array(
+					'limit'          => 0,
+					'children'       => array(
+						'text'         => new Fieldmanager_Textfield( 'Text Field' ),
+						'autocomplete' => new Fieldmanager_Autocomplete( 'Autocomplete', array( 'datasource' => new Fieldmanager_Datasource_Post() ) ),
+						'local_data'   => new Fieldmanager_Autocomplete( 'Autocomplete without ajax', array( 'datasource' => new Fieldmanager_Datasource( array( 'options' => array() ) ) ) ),
+						'textarea'     => new Fieldmanager_TextArea( 'TextArea' ),
+						'media'        => new Fieldmanager_Media( 'Media File' ),
+						'checkbox'     => new Fieldmanager_Checkbox( 'Checkbox' ),
+						'radios'       => new Fieldmanager_Radios( 'Radio Buttons', array( 'options' => array( 'One', 'Two', 'Three' ) ) ),
+						'select'       => new Fieldmanager_Select( 'Select Dropdown', array( 'options' => array( 'One', 'Two', 'Three' ) ) ),
+						'richtextarea' => new Fieldmanager_RichTextArea( 'Rich Text Area' )
+					)
+				) )
+			)
+		) );
+
+		$in_as_json = array(
+			0 => array(
+				'repeatable_group' => array(
+					0 => array(
+						'text' => 'abcd',
+						'autocomplete' => '26',
+						'local_data' => '',
+						'textarea' => '',
+						'media' => '',
+						'select' => '',
+						'richtextarea' => '',
+					),
+					1 => array(
+						'text' => '',
+						'autocomplete' => '',
+						'local_data' => '',
+						'textarea' => '123456',
+						'media' => '30',
+						'select' => '',
+						'richtextarea' => '',
+					),
+					'proto' => array(
+						'text' => '',
+						'autocomplete' => '',
+						'local_data' => '',
+						'textarea' => '',
+						'media' => '',
+						'select' => '',
+						'richtextarea' => '',
+					),
+				),
+			),
+			1 => array(
+				'repeatable_group' => array(
+					0 => array(
+						'text' => '',
+						'autocomplete' => '',
+						'local_data' => '',
+						'textarea' => '',
+						'media' => '',
+						'checkbox' => '1',
+						'radios' => 'Two',
+						'select' => 'Three',
+						'richtextarea' => '<strong>Proin mi arcu, porttitor vel tellus vel, lobortis suscipit risus.</strong> Quisque consectetur eu arcu in commodo.',
+					),
+					'proto' => array(
+						'text' => '',
+						'autocomplete' => '',
+						'local_data' => '',
+						'textarea' => '',
+						'media' => '',
+						'select' => '',
+						'richtextarea' => '',
+					),
+				),
+			),
+			'proto' => array(
+				'repeatable_group' => array(
+					0 => array(
+						'text' => '',
+						'autocomplete' => '',
+						'local_data' => '',
+						'local_data' => '',
+						'textarea' => '',
+						'media' => '',
+						'checkbox' => '1',
+						'select' => '',
+						'richtextarea' => '',
+					),
+					'proto' => array(
+						'text' => '',
+						'autocomplete' => '',
+						'local_data' => '',
+						'local_data' => '',
+						'textarea' => '',
+						'media' => '',
+						'select' => '',
+						'richtextarea' => '',
+					),
+				)
+			),
+		);
+
+		$in_as_serialized = "option_fields%5Bproto%5D%5Brepeatable_group%5D%5Bproto%5D%5Btext%5D=&option_fields%5Bproto%5D%5Brepeatable_group%5D%5Bproto%5D%5Bautocomplete%5D=&option_fields%5Bproto%5D%5Brepeatable_group%5D%5Bproto%5D%5Blocal_data%5D=&option_fields%5Bproto%5D%5Brepeatable_group%5D%5Bproto%5D%5Btextarea%5D=&option_fields%5Bproto%5D%5Brepeatable_group%5D%5Bproto%5D%5Bmedia%5D=&option_fields%5Bproto%5D%5Brepeatable_group%5D%5Bproto%5D%5Bselect%5D=&option_fields%5Bproto%5D%5Brepeatable_group%5D%5Bproto%5D%5Brichtextarea%5D=&option_fields%5Bproto%5D%5Brepeatable_group%5D%5B0%5D%5Btext%5D=&option_fields%5Bproto%5D%5Brepeatable_group%5D%5B0%5D%5Bautocomplete%5D=&option_fields%5Bproto%5D%5Brepeatable_group%5D%5B0%5D%5Blocal_data%5D=&option_fields%5Bproto%5D%5Brepeatable_group%5D%5B0%5D%5Btextarea%5D=&option_fields%5Bproto%5D%5Brepeatable_group%5D%5B0%5D%5Bmedia%5D=&option_fields%5Bproto%5D%5Brepeatable_group%5D%5B0%5D%5Bcheckbox%5D=1&option_fields%5Bproto%5D%5Brepeatable_group%5D%5B0%5D%5Bradios%5D=One&option_fields%5Bproto%5D%5Brepeatable_group%5D%5B0%5D%5Bselect%5D=&option_fields%5Bproto%5D%5Brepeatable_group%5D%5B0%5D%5Brichtextarea%5D=&option_fields%5B0%5D%5Brepeatable_group%5D%5Bproto%5D%5Btext%5D=&option_fields%5B0%5D%5Brepeatable_group%5D%5Bproto%5D%5Bautocomplete%5D=&option_fields%5B0%5D%5Brepeatable_group%5D%5Bproto%5D%5Blocal_data%5D=&option_fields%5B0%5D%5Brepeatable_group%5D%5Bproto%5D%5Btextarea%5D=&option_fields%5B0%5D%5Brepeatable_group%5D%5Bproto%5D%5Bmedia%5D=&option_fields%5B0%5D%5Brepeatable_group%5D%5Bproto%5D%5Bselect%5D=&option_fields%5B0%5D%5Brepeatable_group%5D%5Bproto%5D%5Brichtextarea%5D=&option_fields%5B0%5D%5Brepeatable_group%5D%5B0%5D%5Btext%5D=abcd&option_fields%5B0%5D%5Brepeatable_group%5D%5B0%5D%5Bautocomplete%5D=26&option_fields%5B0%5D%5Brepeatable_group%5D%5B0%5D%5Blocal_data%5D=&option_fields%5B0%5D%5Brepeatable_group%5D%5B0%5D%5Btextarea%5D=&option_fields%5B0%5D%5Brepeatable_group%5D%5B0%5D%5Bmedia%5D=&option_fields%5B0%5D%5Brepeatable_group%5D%5B0%5D%5Bselect%5D=&option_fields%5B0%5D%5Brepeatable_group%5D%5B0%5D%5Brichtextarea%5D=&option_fields%5B0%5D%5Brepeatable_group%5D%5B1%5D%5Btext%5D=&option_fields%5B0%5D%5Brepeatable_group%5D%5B1%5D%5Bautocomplete%5D=&option_fields%5B0%5D%5Brepeatable_group%5D%5B1%5D%5Blocal_data%5D=&option_fields%5B0%5D%5Brepeatable_group%5D%5B1%5D%5Btextarea%5D=123456&option_fields%5B0%5D%5Brepeatable_group%5D%5B1%5D%5Bmedia%5D=30&option_fields%5B0%5D%5Brepeatable_group%5D%5B1%5D%5Bselect%5D=&option_fields%5B0%5D%5Brepeatable_group%5D%5B1%5D%5Brichtextarea%5D=&option_fields%5B1%5D%5Brepeatable_group%5D%5Bproto%5D%5Btext%5D=&option_fields%5B1%5D%5Brepeatable_group%5D%5Bproto%5D%5Bautocomplete%5D=&option_fields%5B1%5D%5Brepeatable_group%5D%5Bproto%5D%5Blocal_data%5D=&option_fields%5B1%5D%5Brepeatable_group%5D%5Bproto%5D%5Btextarea%5D=&option_fields%5B1%5D%5Brepeatable_group%5D%5Bproto%5D%5Bmedia%5D=&option_fields%5B1%5D%5Brepeatable_group%5D%5Bproto%5D%5Bselect%5D=&option_fields%5B1%5D%5Brepeatable_group%5D%5Bproto%5D%5Brichtextarea%5D=&option_fields%5B1%5D%5Brepeatable_group%5D%5B0%5D%5Btext%5D=&option_fields%5B1%5D%5Brepeatable_group%5D%5B0%5D%5Bautocomplete%5D=&option_fields%5B1%5D%5Brepeatable_group%5D%5B0%5D%5Blocal_data%5D=&option_fields%5B1%5D%5Brepeatable_group%5D%5B0%5D%5Btextarea%5D=&option_fields%5B1%5D%5Brepeatable_group%5D%5B0%5D%5Bmedia%5D=&option_fields%5B1%5D%5Brepeatable_group%5D%5B0%5D%5Bcheckbox%5D=1&option_fields%5B1%5D%5Brepeatable_group%5D%5B0%5D%5Bradios%5D=Two&option_fields%5B1%5D%5Brepeatable_group%5D%5B0%5D%5Bselect%5D=Three&option_fields%5B1%5D%5Brepeatable_group%5D%5B0%5D%5Brichtextarea%5D=%3Cstrong%3EProin+mi+arcu%2C+porttitor+vel+tellus+vel%2C+lobortis+suscipit+risus.%3C%2Fstrong%3E+Quisque+consectetur+eu+arcu+in+commodo.";
+
+		$expected = array(
+			array(
+				'repeatable_group' => array(
+					array(
+						'text' => 'abcd',
+						'autocomplete' => 26,
+					),
+					array(
+						'textarea' => '123456',
+						'media' => 30,
+					),
+				),
+			),
+			array(
+				'repeatable_group' => array(
+					array(
+						'checkbox' => '1',
+						'radios' => 'Two',
+						'select' => 'Three',
+						'richtextarea' => '<p><strong>Proin mi arcu, porttitor vel tellus vel, lobortis suscipit risus.</strong> Quisque consectetur eu arcu in commodo.</p>
+',
+					),
+				),
+			),
+		);
+
+		$context = new Fieldmanager_Context_Customizer( 'Foo', $fm );
+		$this->register();
+		$setting = $this->manager->get_setting( $fm->name );
+
+		$this->assertSame( $expected, $context->sanitize_callback( $in_as_json, $setting ) );
+		$this->assertSame( $expected, $context->sanitize_callback( $in_as_serialized, $setting ) );
+	}
+
+	function test_sanitize_stripslashes() {
+		$context = new Fieldmanager_Context_Customizer( 'Foo', $this->field );
+		$this->register();
+		$this->assertSame( 'Foo "bar" baz', $context->sanitize_callback( 'Foo \"bar\" baz', $this->manager->get_setting( $this->field->name ) ) );
+	}
+
+
+	function test_render_field() {
+		$field = $this->getMockBuilder( 'Fieldmanager_Textfield' )->disableOriginalConstructor()->getMock();
+		$context = new Fieldmanager_Context_Customizer( 'Foo', $field );
+
+		$field->expects( $this->once() )->method( 'element_markup' );
+		$context->render_field( array( 'echo' => false ) );
+	}
+}
diff --git a/tests/php/test-fieldmanager-customize-control.php b/tests/php/test-fieldmanager-customize-control.php
new file mode 100644
index 0000000000..e281ba0217
--- /dev/null
+++ b/tests/php/test-fieldmanager-customize-control.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * @group customize
+ */
+class Test_Fieldmanager_Customize_Control extends Fieldmanager_Customizer_UnitTestCase {
+	protected $mock_context;
+
+	function setUp() {
+		parent::setUp();
+
+		$this->mock_context = $this->getMockBuilder( 'Fieldmanager_Context_Customizer' )
+			->disableOriginalConstructor()
+			->getMock();
+	}
+
+	function test_parent_construction() {
+		$priority = 99;
+
+		$actual = new Fieldmanager_Customize_Control( $this->manager, 'foo', array(
+			'context' => $this->mock_context,
+			'priority' => $priority,
+		) );
+
+		$this->assertSame( $priority, $actual->priority );
+	}
+
+	/**
+	 * @expectedException FM_Developer_Exception
+	 */
+	function test_invalid_construction() {
+		new Fieldmanager_Customize_Control( $this->manager, 'foo', array() );
+	}
+
+	function test_type() {
+		$control = new Fieldmanager_Customize_Control( $this->manager, rand_str(), array( 'context' => $this->mock_context ) );
+		$this->assertSame( 'fieldmanager', $control->type );
+	}
+
+	/**
+	 * Tests for scripts registered with wp_register_script().
+	 */
+	function test_register_scripts() {
+		$before = wp_scripts()->registered;
+
+		$control = new Fieldmanager_Customize_Control( $this->manager, rand_str(), array( 'context' => $this->mock_context ) );
+		$control->enqueue();
+
+		$after = wp_scripts()->registered;
+		$this->assertSame( 1, ( count( $after ) - count( $before ) ) );
+	}
+
+	/**
+	 * Tests for closures hooked with fm_add_script().
+	 */
+	function test_fm_add_scripts() {
+		global $wp_filter;
+
+		// Spoof is_admin().
+		$screen = get_current_screen();
+		set_current_screen( 'dashboard-user' );
+
+		$before = $wp_filter['customize_controls_enqueue_scripts'];
+
+		$control = new Fieldmanager_Customize_Control( $this->manager, rand_str(), array( 'context' => $this->mock_context ) );
+		$control->enqueue();
+
+		$after = $wp_filter['customize_controls_enqueue_scripts'];
+		$this->assertSame( 1, ( count( $after ) - count( $before ) ) );
+
+		$GLOBALS['current_screen'] = $screen;
+	}
+
+	function test_render_content() {
+		$name  = rand_str();
+		$value = rand_str();
+
+		$context = new Fieldmanager_Context_Customizer( array(
+			// Bypass capability checks.
+			'section_args' => array( 'capability' => 'exist' ),
+			'setting_args' => array( 'capability' => 'exist' ),
+		), new Fieldmanager_Textfield( array( 'name' => $name ) ) );
+
+		update_option( $name, $value );
+		$this->register();
+
+		$actual = $this->manager->get_control( $name )->get_content();
+		$this->assertContains( 'fm-element', $actual );
+		$this->assertContains( sprintf( 'name="%s"', $name ), $actual );
+		// Slip in a test that the option value is also used.
+		$this->assertContains( sprintf( 'value="%s"', $value ), $actual );
+	}
+}
diff --git a/tests/php/test-fieldmanager-customize-setting.php b/tests/php/test-fieldmanager-customize-setting.php
new file mode 100644
index 0000000000..70152109c9
--- /dev/null
+++ b/tests/php/test-fieldmanager-customize-setting.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * @group customize
+ */
+class Test_Fieldmanager_Customize_Setting extends Fieldmanager_Customizer_UnitTestCase {
+	protected $field, $context;
+
+	function setUp() {
+		parent::setUp();
+		$this->field   = new Fieldmanager_TextField( array( 'name' => 'foo' ) );
+		$this->context = new Fieldmanager_Context_Customizer( array(), $this->field );
+	}
+
+	function test_construction() {
+		$actual = new Fieldmanager_Customize_Setting( $this->manager, $this->field->name, array(
+			'context' => $this->context,
+		) );
+
+		$this->assertInstanceOf( 'Fieldmanager_Customize_Setting', $actual );
+		$this->assertSame( $this->field->default_value, $actual->default );
+		$this->assertSame( array( $this->context, 'sanitize_callback' ), $actual->sanitize_callback );
+		$this->assertSame( 'option', $actual->type );
+	}
+
+	/**
+	 * Test that properties set by default by Fieldmanager_Customize_Setting can be overridden.
+	 */
+	function test_parent_construction() {
+		$actual = new Fieldmanager_Customize_Setting( $this->manager, $this->field->name, array(
+			'context' => $this->context,
+			'default' => 123456,
+			'sanitize_callback' => 'absint',
+			'type' => 'bar',
+		) );
+
+		$this->assertInstanceOf( 'Fieldmanager_Customize_Setting', $actual );
+		$this->assertSame( 123456, $actual->default );
+		$this->assertSame( 'absint', $actual->sanitize_callback );
+		$this->assertSame( 'bar', $actual->type );
+	}
+
+	/**
+	 * @expectedException FM_Developer_Exception
+	 */
+	function test_invalid_construction() {
+		new Fieldmanager_Customize_Setting( $this->manager, $this->field->name, array() );
+	}
+
+	function test_preview_filter() {
+		global $wp_current_filter;
+		$_current_filter = $wp_current_filter;
+
+		$original = rand_str();
+		$preview  = rand_str();
+
+		update_option( $this->field->name, $original );
+
+		// Spoof a POSTed value so the manager thinks this is a preview.
+		$this->manager->set_post_value( $this->field->name, $preview );
+
+		$setting = new Fieldmanager_Customize_Setting( $this->manager, $this->field->name, array(
+			'context' => $this->context,
+		) );
+
+		// Verify the preview filter was added.
+		$this->assertNotFalse( $setting->preview() );
+		// Verify that the option value is filtered to return the previewed value.
+		$this->assertSame( $preview, $setting->_preview_filter( $original ) );
+
+		// Spoof the current filter.
+		$wp_current_filter = array( "customize_sanitize_{$this->field->name}" );
+
+		// Verify that the option value is not filtered with the previewed value.
+		$this->assertSame( $original, $setting->_preview_filter( $original ) );
+
+		$wp_current_filter = $_current_filter;
+	}
+}
diff --git a/tests/php/test-fieldmanager-script-loading.php b/tests/php/test-fieldmanager-script-loading.php
index 63b309a779..8853e166ea 100644
--- a/tests/php/test-fieldmanager-script-loading.php
+++ b/tests/php/test-fieldmanager-script-loading.php
@@ -42,7 +42,11 @@ public function setUp() {
 		$control = new Fieldmanager_Customize_Control(
 			$customize_manager,
 			'test',
-			array( 'context' => $this->getMock( 'Fieldmanager_Context' ) )
+			array(
+				'context' => $this->getMockBuilder( 'Fieldmanager_Context_Customizer' )
+					->disableOriginalConstructor()
+					->getMock()
+			)
 		);
 		$control->enqueue();
 
diff --git a/tests/php/testcase/class-fieldmanager-customizer-unittestcase.php b/tests/php/testcase/class-fieldmanager-customizer-unittestcase.php
new file mode 100644
index 0000000000..239ce57bba
--- /dev/null
+++ b/tests/php/testcase/class-fieldmanager-customizer-unittestcase.php
@@ -0,0 +1,15 @@
+<?php
+class Fieldmanager_Customizer_UnitTestCase extends WP_UnitTestCase {
+	protected $manager;
+
+	function setUp() {
+		parent::setUp();
+		require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
+		$this->manager = new WP_Customize_Manager();
+	}
+
+
+	function register() {
+		do_action( 'customize_register', $this->manager );
+	}
+}

From 9b2a851a3856c2d76f47a72f4aafe95cfca32b2a Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Wed, 10 Feb 2016 22:46:58 -0500
Subject: [PATCH 28/76] Document more of Fieldmanager_Context_Customizer tests

---
 .../test-fieldmanager-context-customizer.php    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tests/php/test-fieldmanager-context-customizer.php b/tests/php/test-fieldmanager-context-customizer.php
index 8176034710..65d4140d39 100644
--- a/tests/php/test-fieldmanager-context-customizer.php
+++ b/tests/php/test-fieldmanager-context-customizer.php
@@ -10,12 +10,14 @@ function setUp() {
 		$this->field = new Fieldmanager_TextField( array( 'name' => 'foo' ) );
 	}
 
+	// Test that a section is created even without constructor args.
 	function test_bare_section() {
 		new Fieldmanager_Context_Customizer( array(), $this->field );
 		$this->register();
 		$this->assertInstanceOf( 'WP_Customize_Section', $this->manager->get_section( $this->field->name ) );
 	}
 
+	// Test that a section is created even with a title string.
 	function test_section_title() {
 		$title = rand_str();
 
@@ -24,6 +26,7 @@ function test_section_title() {
 		$this->assertSame( $title, $this->manager->get_section( $this->field->name )->title );
 	}
 
+	// Test that a section is created with constructor args.
 	function test_section_args() {
 		$title = rand_str();
 		$priority = rand( 0, 100 );
@@ -42,12 +45,14 @@ function test_section_args() {
 		$this->assertSame( $priority, $actual->priority );
 	}
 
+	// Test that a setting is created even without constructor args.
 	function test_bare_setting() {
 		new Fieldmanager_Context_Customizer( 'Foo', $this->field );
 		$this->register();
 		$this->assertInstanceOf( 'Fieldmanager_Customize_Setting', $this->manager->get_setting( $this->field->name ) );
 	}
 
+	// Test that a setting is created with constructor args.
 	function test_setting_args() {
 		$capability = 'edit_thing';
 		$default = rand_str();
@@ -66,6 +71,7 @@ function test_setting_args() {
 		$this->assertSame( $default, $actual->default );
 	}
 
+	// Test that a control is created even without constructor args.
 	function test_bare_control() {
 		new Fieldmanager_Context_Customizer( 'Foo', $this->field );
 
@@ -77,6 +83,7 @@ function test_bare_control() {
 		$this->assertInstanceOf( 'Fieldmanager_Customize_Setting', $actual->settings['default'] );
 	}
 
+	// Test that a control is created with constructor args.
 	function test_control_args() {
 		$label = rand_str();
 		$section = rand_str();
@@ -95,6 +102,7 @@ function test_control_args() {
 		$this->assertSame( $label, $actual->label );
 	}
 
+	// Test that multiple objects are created with constructor args.
 	function test_multiple_args() {
 		$title = rand_str();
 		$theme_supports = rand_str();
@@ -131,6 +139,9 @@ function test_multiple_args() {
 	}
 
 	/**
+	 * Test that a textfield is sanitized the same way when the value is passed
+     * as a bare string and a query string.
+	 *
 	 * @expectedException FM_Exception
 	 */
 	function test_sanitize_string() {
@@ -145,6 +156,10 @@ function test_sanitize_string() {
 		$context->sanitize_callback( array( 'Not', 'a', 'string' ), $setting );
 	}
 
+	/**
+	 * Test that a group is sanitized the same way when the value is passed as
+	 * an array or a query string.
+	 */
 	function test_sanitize_group() {
 		$fm = new Fieldmanager_Group( array(
 			'name'           => 'option_fields',
@@ -286,6 +301,7 @@ function test_sanitize_group() {
 		$this->assertSame( $expected, $context->sanitize_callback( $in_as_serialized, $setting ) );
 	}
 
+	// Make sure sanitizing strips slashes.
 	function test_sanitize_stripslashes() {
 		$context = new Fieldmanager_Context_Customizer( 'Foo', $this->field );
 		$this->register();
@@ -293,6 +309,7 @@ function test_sanitize_stripslashes() {
 	}
 
 
+	// Make sure the context's rendering method calls the field rendering method.
 	function test_render_field() {
 		$field = $this->getMockBuilder( 'Fieldmanager_Textfield' )->disableOriginalConstructor()->getMock();
 		$context = new Fieldmanager_Context_Customizer( 'Foo', $field );

From ac92831d8119956c4f01bb44cbf337a50b80c4a4 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Fri, 19 Feb 2016 09:41:42 -0500
Subject: [PATCH 29/76] Expose the target selector in fm.customize

This should make it easier to change the selector if someone happens to
be overriding the class.
---
 js/fieldmanager-customize.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/js/fieldmanager-customize.js b/js/fieldmanager-customize.js
index b68e55a3d8..2aea4106d1 100644
--- a/js/fieldmanager-customize.js
+++ b/js/fieldmanager-customize.js
@@ -11,6 +11,13 @@
 	'use strict';
 
 	fm.customize = {
+		/**
+		 * jQuery selector targeting all elements to include in a Fieldmanager setting value.
+		 *
+		 * @type {String}
+		 */
+		targetSelector: '.fm-element',
+
 		/**
 		 * Set the values of all Fieldmanager controls.
 		 */
@@ -47,7 +54,7 @@
 				return;
 			}
 
-			$element = control.container.find( '.fm-element' );
+			$element = control.container.find( this.targetSelector );
 
 			if ( $.serializeJSON ) {
 				serialized = $element.serializeJSON();

From 738d1edd73c277c1898eae4076ab04c351b55b5f Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Fri, 19 Feb 2016 09:44:14 -0500
Subject: [PATCH 30/76] Fix reference to 'this' in setEachControl()

---
 js/fieldmanager-customize.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/js/fieldmanager-customize.js b/js/fieldmanager-customize.js
index 2aea4106d1..42472f8d91 100644
--- a/js/fieldmanager-customize.js
+++ b/js/fieldmanager-customize.js
@@ -22,7 +22,11 @@
 		 * Set the values of all Fieldmanager controls.
 		 */
 		setEachControl: function () {
-			api.control.each( this.setControl );
+			var that = this;
+
+			api.control.each(function( control ) {
+				that.setControl( control );
+			});
 		},
 
 		/**

From fa1c3502b2f49a22401b7c2017bb45a09d8efa7d Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Fri, 19 Feb 2016 09:45:04 -0500
Subject: [PATCH 31/76] Check for serializeJSON() on found element itself

As opposed to whether it exists in the abstract.
---
 js/fieldmanager-customize.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/fieldmanager-customize.js b/js/fieldmanager-customize.js
index 42472f8d91..4a425614f0 100644
--- a/js/fieldmanager-customize.js
+++ b/js/fieldmanager-customize.js
@@ -60,7 +60,7 @@
 
 			$element = control.container.find( this.targetSelector );
 
-			if ( $.serializeJSON ) {
+			if ( $element.serializeJSON ) {
 				serialized = $element.serializeJSON();
 				value = serialized[ control.id ];
 			} else {

From 4005cf3e0be898a5c43a285306fc75eb45ceba4f Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Fri, 19 Feb 2016 09:47:47 -0500
Subject: [PATCH 32/76] Return the control, not nothing, after setControl()

---
 js/fieldmanager-customize.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/fieldmanager-customize.js b/js/fieldmanager-customize.js
index 4a425614f0..4b0b6f4721 100644
--- a/js/fieldmanager-customize.js
+++ b/js/fieldmanager-customize.js
@@ -48,6 +48,7 @@
 		 * Set a Fieldmanager setting to its control's form values.
 		 *
 		 * @param {Object} control Customizer Control object.
+		 * @return {Object} The updated Control.
 		 */
 		setControl: function ( control ) {
 			var $element;
@@ -67,7 +68,7 @@
 				value = $element.serialize();
 			}
 
-			control.setting.set( value );
+			return control.setting.set( value );
 		},
 	};
 

From affc2ce75e5e228f43afdca4f3d6e03919457f63 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Fri, 19 Feb 2016 14:19:12 -0500
Subject: [PATCH 33/76] Update to QUnit 1.21.0

---
 tests/js/index.html                           |   4 +-
 .../{qunit-1.19.0.css => qunit-1.21.0.css}    |  24 +-
 .../{qunit-1.19.0.js => qunit-1.21.0.js}      | 712 +++++++++++-------
 3 files changed, 456 insertions(+), 284 deletions(-)
 rename tests/js/vendor/{qunit-1.19.0.css => qunit-1.21.0.css} (89%)
 rename tests/js/vendor/{qunit-1.19.0.js => qunit-1.21.0.js} (89%)

diff --git a/tests/js/index.html b/tests/js/index.html
index 929c42d98a..aa421377b9 100644
--- a/tests/js/index.html
+++ b/tests/js/index.html
@@ -5,8 +5,8 @@
 	<title>Fieldmanager QUnit Test Suite</title>
 
 	<!-- QUnit -->
-	<link rel="stylesheet" href="vendor/qunit-1.19.0.css">
-	<script src="vendor/qunit-1.19.0.js"></script>
+	<link rel="stylesheet" href="vendor/qunit-1.21.0.css">
+	<script src="vendor/qunit-1.21.0.js"></script>
 
 	<script>
 		var scripts = [];
diff --git a/tests/js/vendor/qunit-1.19.0.css b/tests/js/vendor/qunit-1.21.0.css
similarity index 89%
rename from tests/js/vendor/qunit-1.19.0.css
rename to tests/js/vendor/qunit-1.21.0.css
index bf224b30a0..b23d647a24 100644
--- a/tests/js/vendor/qunit-1.19.0.css
+++ b/tests/js/vendor/qunit-1.21.0.css
@@ -1,27 +1,27 @@
 /*!
- * QUnit 1.19.0
- * http://qunitjs.com/
+ * QUnit 1.21.0
+ * https://qunitjs.com/
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license
- * http://jquery.org/license
+ * https://jquery.org/license
  *
- * Date: 2015-09-01T15:00Z
+ * Date: 2016-02-01T13:07Z
  */
 
 /** Font Family and Sizes */
 
-#qunit-tests, #qunit-header, #qunit-banner, #qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult {
+#qunit-tests, #qunit-header, #qunit-banner, #qunit-testrunner-toolbar, #qunit-filteredTest, #qunit-userAgent, #qunit-testresult {
 	font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif;
 }
 
-#qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult, #qunit-tests li { font-size: small; }
+#qunit-testrunner-toolbar, #qunit-filteredTest, #qunit-userAgent, #qunit-testresult, #qunit-tests li { font-size: small; }
 #qunit-tests { font-size: smaller; }
 
 
 /** Resets */
 
-#qunit-tests, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult, #qunit-modulefilter {
+#qunit-tests, #qunit-header, #qunit-banner, #qunit-filteredTest, #qunit-userAgent, #qunit-testresult, #qunit-modulefilter {
 	margin: 0;
 	padding: 0;
 }
@@ -68,6 +68,12 @@
 	overflow: hidden;
 }
 
+#qunit-filteredTest {
+	padding: 0.5em 1em 0.5em 1em;
+	background-color: #F4FF77;
+	color: #366097;
+}
+
 #qunit-userAgent {
 	padding: 0.5em 1em 0.5em 1em;
 	background-color: #2B81AF;
@@ -114,6 +120,10 @@
 	display: list-item;
 }
 
+#qunit-tests.hidepass {
+	position: relative;
+}
+
 #qunit-tests.hidepass li.running,
 #qunit-tests.hidepass li.pass {
 	visibility: hidden;
diff --git a/tests/js/vendor/qunit-1.19.0.js b/tests/js/vendor/qunit-1.21.0.js
similarity index 89%
rename from tests/js/vendor/qunit-1.19.0.js
rename to tests/js/vendor/qunit-1.21.0.js
index 2fbd37d7e2..2d740f1b80 100644
--- a/tests/js/vendor/qunit-1.19.0.js
+++ b/tests/js/vendor/qunit-1.21.0.js
@@ -1,12 +1,12 @@
 /*!
- * QUnit 1.19.0
- * http://qunitjs.com/
+ * QUnit 1.21.0
+ * https://qunitjs.com/
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license
- * http://jquery.org/license
+ * https://jquery.org/license
  *
- * Date: 2015-09-01T15:00Z
+ * Date: 2016-02-01T13:07Z
  */
 
 (function( global ) {
@@ -128,7 +128,7 @@ function objectType( obj ) {
 	}
 
 	var match = toString.call( obj ).match( /^\[object\s(.*)\]$/ ),
-		type = match && match[ 1 ] || "";
+		type = match && match[ 1 ];
 
 	switch ( type ) {
 		case "Number":
@@ -144,12 +144,12 @@ function objectType( obj ) {
 		case "Date":
 		case "RegExp":
 		case "Function":
+		case "Symbol":
 			return type.toLowerCase();
 	}
 	if ( typeof obj === "object" ) {
 		return "object";
 	}
-	return undefined;
 }
 
 // Safe object type checking
@@ -256,6 +256,10 @@ var config = {
 	// by default, modify document.title when suite is done
 	altertitle: true,
 
+	// HTML Reporter: collapse every test except the first failing test
+	// If false, all failing tests will be expanded
+	collapse: true,
+
 	// by default, scroll to top of the page when suite is done
 	scrolltop: true,
 
@@ -290,6 +294,9 @@ var config = {
 	// Set of all modules.
 	modules: [],
 
+	// Stack of nested modules
+	moduleStack: [],
+
 	// The first unnamed module
 	currentModule: {
 		name: "",
@@ -389,7 +396,7 @@ function verifyLoggingCallbacks() {
 				global.console.warn(
 					"QUnit." + loggingCallback + " was replaced with a new value.\n" +
 					"Please, check out the documentation on how to apply logging callbacks.\n" +
-					"Reference: http://api.qunitjs.com/category/callbacks/"
+					"Reference: https://api.qunitjs.com/category/callbacks/"
 				);
 			}
 		}
@@ -440,17 +447,21 @@ QUnit.urlParams = urlParams;
 QUnit.isLocal = !( defined.document && window.location.protocol !== "file:" );
 
 // Expose the current QUnit version
-QUnit.version = "1.19.0";
+QUnit.version = "1.21.0";
 
 extend( QUnit, {
 
 	// call on start of module test to prepend name to all tests
-	module: function( name, testEnvironment ) {
-		var currentModule = {
-			name: name,
-			testEnvironment: testEnvironment,
-			tests: []
-		};
+	module: function( name, testEnvironment, executeNow ) {
+		var module, moduleFns;
+		var currentModule = config.currentModule;
+
+		if ( arguments.length === 2 ) {
+			if ( testEnvironment instanceof Function ) {
+				executeNow = testEnvironment;
+				testEnvironment = undefined;
+			}
+		}
 
 		// DEPRECATED: handles setup/teardown functions,
 		// beforeEach and afterEach should be used instead
@@ -463,8 +474,51 @@ extend( QUnit, {
 			delete testEnvironment.teardown;
 		}
 
-		config.modules.push( currentModule );
-		config.currentModule = currentModule;
+		module = createModule();
+
+		moduleFns = {
+			beforeEach: setHook( module, "beforeEach" ),
+			afterEach: setHook( module, "afterEach" )
+		};
+
+		if ( executeNow instanceof Function ) {
+			config.moduleStack.push( module );
+			setCurrentModule( module );
+			executeNow.call( module.testEnvironment, moduleFns );
+			config.moduleStack.pop();
+			module = module.parentModule || currentModule;
+		}
+
+		setCurrentModule( module );
+
+		function createModule() {
+			var parentModule = config.moduleStack.length ?
+				config.moduleStack.slice( -1 )[ 0 ] : null;
+			var moduleName = parentModule !== null ?
+				[ parentModule.name, name ].join( " > " ) : name;
+			var module = {
+				name: moduleName,
+				parentModule: parentModule,
+				tests: []
+			};
+
+			var env = {};
+			if ( parentModule ) {
+				extend( env, parentModule.testEnvironment );
+				delete env.beforeEach;
+				delete env.afterEach;
+			}
+			extend( env, testEnvironment );
+			module.testEnvironment = env;
+
+			config.modules.push( module );
+			return module;
+		}
+
+		function setCurrentModule( module ) {
+			config.currentModule = module;
+		}
+
 	},
 
 	// DEPRECATED: QUnit.asyncTest() will be removed in QUnit 2.0.
@@ -474,6 +528,8 @@ extend( QUnit, {
 
 	skip: skip,
 
+	only: only,
+
 	// DEPRECATED: The functionality of QUnit.start() will be altered in QUnit 2.0.
 	// In QUnit 2.0, invoking it will ONLY affect the `QUnit.config.autostart` blocking behavior.
 	start: function( count ) {
@@ -500,6 +556,17 @@ extend( QUnit, {
 			// If a test is running, adjust its semaphore
 			config.current.semaphore -= count || 1;
 
+			// If semaphore is non-numeric, throw error
+			if ( isNaN( config.current.semaphore ) ) {
+				config.current.semaphore = 0;
+
+				QUnit.pushFailure(
+					"Called start() with a non-numeric decrement.",
+					sourceFromStacktrace( 2 )
+				);
+				return;
+			}
+
 			// Don't start until equal number of stop-calls
 			if ( config.current.semaphore > 0 ) {
 				return;
@@ -699,6 +766,19 @@ function done() {
 	});
 }
 
+function setHook( module, hookName ) {
+	if ( module.testEnvironment === undefined ) {
+		module.testEnvironment = {};
+	}
+
+	return function( callback ) {
+		module.testEnvironment[ hookName ] = callback;
+	};
+}
+
+var focused = false;
+var priorityCount = 0;
+
 function Test( settings ) {
 	var i, l;
 
@@ -801,14 +881,12 @@ Test.prototype = {
 		this.callbackStarted = now();
 
 		if ( config.notrycatch ) {
-			promise = this.callback.call( this.testEnvironment, this.assert );
-			this.resolvePromise( promise );
+			runTest( this );
 			return;
 		}
 
 		try {
-			promise = this.callback.call( this.testEnvironment, this.assert );
-			this.resolvePromise( promise );
+			runTest( this );
 		} catch ( e ) {
 			this.pushFailure( "Died on test #" + ( this.assertions.length + 1 ) + " " +
 				this.stack + ": " + ( e.message || e ), extractStacktrace( e, 0 ) );
@@ -821,6 +899,11 @@ Test.prototype = {
 				QUnit.start();
 			}
 		}
+
+		function runTest( test ) {
+			promise = test.callback.call( test.testEnvironment, test.assert );
+			test.resolvePromise( promise );
+		}
 	},
 
 	after: function() {
@@ -833,16 +916,19 @@ Test.prototype = {
 		return function runHook() {
 			config.current = test;
 			if ( config.notrycatch ) {
-				promise = hook.call( test.testEnvironment, test.assert );
-				test.resolvePromise( promise, hookName );
+				callHook();
 				return;
 			}
 			try {
-				promise = hook.call( test.testEnvironment, test.assert );
-				test.resolvePromise( promise, hookName );
+				callHook();
 			} catch ( error ) {
 				test.pushFailure( hookName + " failed on " + test.testName + ": " +
-					( error.message || error ), extractStacktrace( error, 0 ) );
+				( error.message || error ), extractStacktrace( error, 0 ) );
+			}
+
+			function callHook() {
+				promise = hook.call( test.testEnvironment, test.assert );
+				test.resolvePromise( promise, hookName );
 			}
 		};
 	},
@@ -851,16 +937,20 @@ Test.prototype = {
 	hooks: function( handler ) {
 		var hooks = [];
 
-		// Hooks are ignored on skipped tests
-		if ( this.skip ) {
-			return hooks;
+		function processHooks( test, module ) {
+			if ( module.parentModule ) {
+				processHooks( test, module.parentModule );
+			}
+			if ( module.testEnvironment &&
+				QUnit.objectType( module.testEnvironment[ handler ] ) === "function" ) {
+				hooks.push( test.queueHook( module.testEnvironment[ handler ], handler ) );
+			}
 		}
 
-		if ( this.module.testEnvironment &&
-				QUnit.objectType( this.module.testEnvironment[ handler ] ) === "function" ) {
-			hooks.push( this.queueHook( this.module.testEnvironment[ handler ], handler ) );
+		// Hooks are ignored on skipped tests
+		if ( !this.skip ) {
+			processHooks( this, this.module );
 		}
-
 		return hooks;
 	},
 
@@ -921,7 +1011,7 @@ Test.prototype = {
 	},
 
 	queue: function() {
-		var bad,
+		var priority,
 			test = this;
 
 		if ( !this.valid() ) {
@@ -937,7 +1027,6 @@ Test.prototype = {
 				},
 
 				test.hooks( "beforeEach" ),
-
 				function() {
 					test.run();
 				},
@@ -953,16 +1042,11 @@ Test.prototype = {
 			]);
 		}
 
-		// `bad` initialized at top of scope
-		// defer when previous test run passed, if storage is available
-		bad = QUnit.config.reorder && defined.sessionStorage &&
+		// Prioritize previously failed tests, detected from sessionStorage
+		priority = QUnit.config.reorder && defined.sessionStorage &&
 				+sessionStorage.getItem( "qunit-test-" + this.module.name + "-" + this.testName );
 
-		if ( bad ) {
-			run();
-		} else {
-			synchronize( run, true );
-		}
+		return synchronize( run, priority );
 	},
 
 	push: function( result, actual, expected, message, negative ) {
@@ -1051,10 +1135,21 @@ Test.prototype = {
 	},
 
 	valid: function() {
-		var include,
-			filter = config.filter && config.filter.toLowerCase(),
+		var filter = config.filter,
+			regexFilter = /^(!?)\/([\w\W]*)\/(i?$)/.exec( filter ),
 			module = QUnit.urlParams.module && QUnit.urlParams.module.toLowerCase(),
-			fullName = ( this.module.name + ": " + this.testName ).toLowerCase();
+			fullName = ( this.module.name + ": " + this.testName );
+
+		function testInModuleChain( testModule ) {
+			var testModuleName = testModule.name ? testModule.name.toLowerCase() : null;
+			if ( testModuleName === module ) {
+				return true;
+			} else if ( testModule.parentModule ) {
+				return testInModuleChain( testModule.parentModule );
+			} else {
+				return false;
+			}
+		}
 
 		// Internally-generated tests are always valid
 		if ( this.callback && this.callback.validTest ) {
@@ -1065,7 +1160,7 @@ Test.prototype = {
 			return false;
 		}
 
-		if ( module && ( !this.module.name || this.module.name.toLowerCase() !== module ) ) {
+		if ( module && !testInModuleChain( this.module ) ) {
 			return false;
 		}
 
@@ -1073,7 +1168,23 @@ Test.prototype = {
 			return true;
 		}
 
-		include = filter.charAt( 0 ) !== "!";
+		return regexFilter ?
+			this.regexFilter( !!regexFilter[1], regexFilter[2], regexFilter[3], fullName ) :
+			this.stringFilter( filter, fullName );
+	},
+
+	regexFilter: function( exclude, pattern, flags, fullName ) {
+		var regex = new RegExp( pattern, flags );
+		var match = regex.test( fullName );
+
+		return match !== exclude;
+	},
+
+	stringFilter: function( filter, fullName ) {
+		filter = filter.toLowerCase();
+		fullName = fullName.toLowerCase();
+
+		var include = filter.charAt( 0 ) !== "!";
 		if ( !include ) {
 			filter = filter.slice( 1 );
 		}
@@ -1086,7 +1197,6 @@ Test.prototype = {
 		// Otherwise, do the opposite
 		return !include;
 	}
-
 };
 
 // Resets the test setup. Useful for tests that modify the DOM.
@@ -1147,14 +1257,21 @@ function generateHash( module, testName ) {
 	return hex.slice( -8 );
 }
 
-function synchronize( callback, last ) {
+function synchronize( callback, priority ) {
+	var last = !priority;
+
 	if ( QUnit.objectType( callback ) === "array" ) {
 		while ( callback.length ) {
 			synchronize( callback.shift() );
 		}
 		return;
 	}
-	config.queue.push( callback );
+
+	if ( priority ) {
+		config.queue.splice( priorityCount++, 0, callback );
+	} else {
+		config.queue.push( callback );
+	}
 
 	if ( config.autorun && !config.blocking ) {
 		process( last );
@@ -1208,6 +1325,8 @@ function asyncTest( testName, expected, callback ) {
 
 // Will be exposed as QUnit.test
 function test( testName, expected, callback, async ) {
+	if ( focused )  { return; }
+
 	var newTest;
 
 	if ( arguments.length === 2 ) {
@@ -1227,6 +1346,8 @@ function test( testName, expected, callback, async ) {
 
 // Will be exposed as QUnit.skip
 function skip( testName ) {
+	if ( focused )  { return; }
+
 	var test = new Test({
 		testName: testName,
 		skip: true
@@ -1235,6 +1356,30 @@ function skip( testName ) {
 	test.queue();
 }
 
+// Will be exposed as QUnit.only
+function only( testName, expected, callback, async ) {
+	var newTest;
+
+	if ( focused )  { return; }
+
+	QUnit.config.queue.length = 0;
+	focused = true;
+
+	if ( arguments.length === 2 ) {
+		callback = expected;
+		expected = null;
+	}
+
+	newTest = new Test({
+		testName: testName,
+		expected: expected,
+		async: async,
+		callback: callback
+	});
+
+	newTest.queue();
+}
+
 function Assert( testContext ) {
 	this.test = testContext;
 }
@@ -1252,25 +1397,36 @@ QUnit.assert = Assert.prototype = {
 		}
 	},
 
-	// Increment this Test's semaphore counter, then return a single-use function that
+	// Increment this Test's semaphore counter, then return a function that
 	// decrements that counter a maximum of once.
-	async: function() {
+	async: function( count ) {
 		var test = this.test,
-			popped = false;
+			popped = false,
+			acceptCallCount = count;
+
+		if ( typeof acceptCallCount === "undefined" ) {
+			acceptCallCount = 1;
+		}
 
 		test.semaphore += 1;
 		test.usedAsync = true;
 		pauseProcessing();
 
 		return function done() {
-			if ( !popped ) {
-				test.semaphore -= 1;
-				popped = true;
-				resumeProcessing();
-			} else {
-				test.pushFailure( "Called the callback returned from `assert.async` more than once",
+
+			if ( popped ) {
+				test.pushFailure( "Too many calls to the `assert.async` callback",
 					sourceFromStacktrace( 2 ) );
+				return;
+			}
+			acceptCallCount -= 1;
+			if ( acceptCallCount > 0 ) {
+				return;
 			}
+
+			test.semaphore -= 1;
+			popped = true;
+			resumeProcessing();
 		};
 	},
 
@@ -1310,7 +1466,7 @@ QUnit.assert = Assert.prototype = {
 	notOk: function( result, message ) {
 		message = message || ( !result ? "okay" : "failed, expected argument to be falsy, was: " +
 			QUnit.dump.parse( result ) );
-		this.push( !result, result, false, message, true );
+		this.push( !result, result, false, message );
 	},
 
 	equal: function( actual, expected, message ) {
@@ -1408,7 +1564,7 @@ QUnit.assert = Assert.prototype = {
 	}
 };
 
-// Provide an alternative to assert.throws(), for enviroments that consider throws a reserved word
+// Provide an alternative to assert.throws(), for environments that consider throws a reserved word
 // Known to us are: Closure Compiler, Narwhal
 (function() {
 	/*jshint sub:true */
@@ -1439,258 +1595,240 @@ function errorString( error ) {
 // Author: Philippe Rathé <prathe@gmail.com>
 QUnit.equiv = (function() {
 
-	// Call the o related callback with the given arguments.
-	function bindCallbacks( o, callbacks, args ) {
-		var prop = QUnit.objectType( o );
-		if ( prop ) {
-			if ( QUnit.objectType( callbacks[ prop ] ) === "function" ) {
-				return callbacks[ prop ].apply( callbacks, args );
-			} else {
-				return callbacks[ prop ]; // or undefined
-			}
-		}
-	}
+	// Stack to decide between skip/abort functions
+	var callers = [];
 
-	// the real equiv function
-	var innerEquiv,
+	// Stack to avoiding loops from circular referencing
+	var parents = [];
+	var parentsB = [];
 
-		// stack to decide between skip/abort functions
-		callers = [],
+	var getProto = Object.getPrototypeOf || function( obj ) {
 
-		// stack to avoiding loops from circular referencing
-		parents = [],
-		parentsB = [],
+		/*jshint proto: true */
+		return obj.__proto__;
+	};
 
-		getProto = Object.getPrototypeOf || function( obj ) {
-			/* jshint camelcase: false, proto: true */
-			return obj.__proto__;
-		},
-		callbacks = (function() {
+	function useStrictEquality( b, a ) {
 
-			// for string, boolean, number and null
-			function useStrictEquality( b, a ) {
+		// To catch short annotation VS 'new' annotation of a declaration. e.g.:
+		// `var i = 1;`
+		// `var j = new Number(1);`
+		if ( typeof a === "object" ) {
+			a = a.valueOf();
+		}
+		if ( typeof b === "object" ) {
+			b = b.valueOf();
+		}
 
-				/*jshint eqeqeq:false */
-				if ( b instanceof a.constructor || a instanceof b.constructor ) {
+		return a === b;
+	}
 
-					// to catch short annotation VS 'new' annotation of a
-					// declaration
-					// e.g. var i = 1;
-					// var j = new Number(1);
-					return a == b;
-				} else {
-					return a === b;
-				}
-			}
+	function compareConstructors( a, b ) {
+		var protoA = getProto( a );
+		var protoB = getProto( b );
 
-			return {
-				"string": useStrictEquality,
-				"boolean": useStrictEquality,
-				"number": useStrictEquality,
-				"null": useStrictEquality,
-				"undefined": useStrictEquality,
+		// Comparing constructors is more strict than using `instanceof`
+		if ( a.constructor === b.constructor ) {
+			return true;
+		}
 
-				"nan": function( b ) {
-					return isNaN( b );
-				},
+		// Ref #851
+		// If the obj prototype descends from a null constructor, treat it
+		// as a null prototype.
+		if ( protoA && protoA.constructor === null ) {
+			protoA = null;
+		}
+		if ( protoB && protoB.constructor === null ) {
+			protoB = null;
+		}
 
-				"date": function( b, a ) {
-					return QUnit.objectType( b ) === "date" && a.valueOf() === b.valueOf();
-				},
+		// Allow objects with no prototype to be equivalent to
+		// objects with Object as their constructor.
+		if ( ( protoA === null && protoB === Object.prototype ) ||
+				( protoB === null && protoA === Object.prototype ) ) {
+			return true;
+		}
 
-				"regexp": function( b, a ) {
-					return QUnit.objectType( b ) === "regexp" &&
+		return false;
+	}
 
-						// the regex itself
-						a.source === b.source &&
+	function getRegExpFlags( regexp ) {
+		return "flags" in regexp ? regexp.flags : regexp.toString().match( /[gimuy]*$/ )[ 0 ];
+	}
 
-						// and its modifiers
-						a.global === b.global &&
+	var callbacks = {
+		"string": useStrictEquality,
+		"boolean": useStrictEquality,
+		"number": useStrictEquality,
+		"null": useStrictEquality,
+		"undefined": useStrictEquality,
+		"symbol": useStrictEquality,
+		"date": useStrictEquality,
 
-						// (gmi) ...
-						a.ignoreCase === b.ignoreCase &&
-						a.multiline === b.multiline &&
-						a.sticky === b.sticky;
-				},
+		"nan": function() {
+			return true;
+		},
 
-				// - skip when the property is a method of an instance (OOP)
-				// - abort otherwise,
-				// initial === would have catch identical references anyway
-				"function": function() {
-					var caller = callers[ callers.length - 1 ];
-					return caller !== Object && typeof caller !== "undefined";
-				},
+		"regexp": function( b, a ) {
+			return a.source === b.source &&
 
-				"array": function( b, a ) {
-					var i, j, len, loop, aCircular, bCircular;
+				// Include flags in the comparison
+				getRegExpFlags( a ) === getRegExpFlags( b );
+		},
 
-					// b could be an object literal here
-					if ( QUnit.objectType( b ) !== "array" ) {
-						return false;
-					}
+		// - skip when the property is a method of an instance (OOP)
+		// - abort otherwise,
+		// initial === would have catch identical references anyway
+		"function": function() {
+			var caller = callers[ callers.length - 1 ];
+			return caller !== Object && typeof caller !== "undefined";
+		},
 
-					len = a.length;
-					if ( len !== b.length ) {
-						// safe and faster
-						return false;
-					}
+		"array": function( b, a ) {
+			var i, j, len, loop, aCircular, bCircular;
 
-					// track reference to avoid circular references
-					parents.push( a );
-					parentsB.push( b );
-					for ( i = 0; i < len; i++ ) {
-						loop = false;
-						for ( j = 0; j < parents.length; j++ ) {
-							aCircular = parents[ j ] === a[ i ];
-							bCircular = parentsB[ j ] === b[ i ];
-							if ( aCircular || bCircular ) {
-								if ( a[ i ] === b[ i ] || aCircular && bCircular ) {
-									loop = true;
-								} else {
-									parents.pop();
-									parentsB.pop();
-									return false;
-								}
-							}
-						}
-						if ( !loop && !innerEquiv( a[ i ], b[ i ] ) ) {
+			len = a.length;
+			if ( len !== b.length ) {
+				// safe and faster
+				return false;
+			}
+
+			// Track reference to avoid circular references
+			parents.push( a );
+			parentsB.push( b );
+			for ( i = 0; i < len; i++ ) {
+				loop = false;
+				for ( j = 0; j < parents.length; j++ ) {
+					aCircular = parents[ j ] === a[ i ];
+					bCircular = parentsB[ j ] === b[ i ];
+					if ( aCircular || bCircular ) {
+						if ( a[ i ] === b[ i ] || aCircular && bCircular ) {
+							loop = true;
+						} else {
 							parents.pop();
 							parentsB.pop();
 							return false;
 						}
 					}
+				}
+				if ( !loop && !innerEquiv( a[ i ], b[ i ] ) ) {
 					parents.pop();
 					parentsB.pop();
-					return true;
-				},
-
-				"set": function( b, a ) {
-					var aArray, bArray;
-
-					// b could be any object here
-					if ( QUnit.objectType( b ) !== "set" ) {
-						return false;
-					}
-
-					aArray = [];
-					a.forEach( function( v ) {
-						aArray.push( v );
-					});
-					bArray = [];
-					b.forEach( function( v ) {
-						bArray.push( v );
-					});
+					return false;
+				}
+			}
+			parents.pop();
+			parentsB.pop();
+			return true;
+		},
 
-					return innerEquiv( bArray, aArray );
-				},
+		"set": function( b, a ) {
+			var aArray, bArray;
 
-				"map": function( b, a ) {
-					var aArray, bArray;
+			aArray = [];
+			a.forEach( function( v ) {
+				aArray.push( v );
+			});
+			bArray = [];
+			b.forEach( function( v ) {
+				bArray.push( v );
+			});
 
-					// b could be any object here
-					if ( QUnit.objectType( b ) !== "map" ) {
-						return false;
-					}
+			return innerEquiv( bArray, aArray );
+		},
 
-					aArray = [];
-					a.forEach( function( v, k ) {
-						aArray.push( [ k, v ] );
-					});
-					bArray = [];
-					b.forEach( function( v, k ) {
-						bArray.push( [ k, v ] );
-					});
+		"map": function( b, a ) {
+			var aArray, bArray;
 
-					return innerEquiv( bArray, aArray );
-				},
+			aArray = [];
+			a.forEach( function( v, k ) {
+				aArray.push( [ k, v ] );
+			});
+			bArray = [];
+			b.forEach( function( v, k ) {
+				bArray.push( [ k, v ] );
+			});
 
-				"object": function( b, a ) {
+			return innerEquiv( bArray, aArray );
+		},
 
-					/*jshint forin:false */
-					var i, j, loop, aCircular, bCircular,
-						// Default to true
-						eq = true,
-						aProperties = [],
-						bProperties = [];
+		"object": function( b, a ) {
+			var i, j, loop, aCircular, bCircular;
 
-					// comparing constructors is more strict than using
-					// instanceof
-					if ( a.constructor !== b.constructor ) {
+			// Default to true
+			var eq = true;
+			var aProperties = [];
+			var bProperties = [];
 
-						// Allow objects with no prototype to be equivalent to
-						// objects with Object as their constructor.
-						if ( !( ( getProto( a ) === null && getProto( b ) === Object.prototype ) ||
-							( getProto( b ) === null && getProto( a ) === Object.prototype ) ) ) {
-							return false;
-						}
-					}
+			if ( compareConstructors( a, b ) === false ) {
+				return false;
+			}
 
-					// stack constructor before traversing properties
-					callers.push( a.constructor );
-
-					// track reference to avoid circular references
-					parents.push( a );
-					parentsB.push( b );
-
-					// be strict: don't ensure hasOwnProperty and go deep
-					for ( i in a ) {
-						loop = false;
-						for ( j = 0; j < parents.length; j++ ) {
-							aCircular = parents[ j ] === a[ i ];
-							bCircular = parentsB[ j ] === b[ i ];
-							if ( aCircular || bCircular ) {
-								if ( a[ i ] === b[ i ] || aCircular && bCircular ) {
-									loop = true;
-								} else {
-									eq = false;
-									break;
-								}
-							}
-						}
-						aProperties.push( i );
-						if ( !loop && !innerEquiv( a[ i ], b[ i ] ) ) {
+			// Stack constructor before traversing properties
+			callers.push( a.constructor );
+
+			// Track reference to avoid circular references
+			parents.push( a );
+			parentsB.push( b );
+
+			// Be strict: don't ensure hasOwnProperty and go deep
+			for ( i in a ) {
+				loop = false;
+				for ( j = 0; j < parents.length; j++ ) {
+					aCircular = parents[ j ] === a[ i ];
+					bCircular = parentsB[ j ] === b[ i ];
+					if ( aCircular || bCircular ) {
+						if ( a[ i ] === b[ i ] || aCircular && bCircular ) {
+							loop = true;
+						} else {
 							eq = false;
 							break;
 						}
 					}
+				}
+				aProperties.push( i );
+				if ( !loop && !innerEquiv( a[ i ], b[ i ] ) ) {
+					eq = false;
+					break;
+				}
+			}
 
-					parents.pop();
-					parentsB.pop();
-					callers.pop(); // unstack, we are done
+			parents.pop();
+			parentsB.pop();
 
-					for ( i in b ) {
-						bProperties.push( i ); // collect b's properties
-					}
+			// Unstack, we are done
+			callers.pop();
 
-					// Ensures identical properties name
-					return eq && innerEquiv( aProperties.sort(), bProperties.sort() );
-				}
-			};
-		}());
+			for ( i in b ) {
+
+				// Collect b's properties
+				bProperties.push( i );
+			}
 
-	innerEquiv = function() { // can take multiple arguments
-		var args = [].slice.apply( arguments );
-		if ( args.length < 2 ) {
-			return true; // end transition
+			// Ensures identical properties name
+			return eq && innerEquiv( aProperties.sort(), bProperties.sort() );
 		}
+	};
 
-		return ( (function( a, b ) {
-			if ( a === b ) {
-				return true; // catch the most you can
-			} else if ( a === null || b === null || typeof a === "undefined" ||
-					typeof b === "undefined" ||
-					QUnit.objectType( a ) !== QUnit.objectType( b ) ) {
+	function typeEquiv( a, b ) {
+		var type = QUnit.objectType( a );
+		return QUnit.objectType( b ) === type && callbacks[ type ]( b, a );
+	}
 
-				// don't lose time with error prone cases
-				return false;
-			} else {
-				return bindCallbacks( a, callbacks, [ b, a ] );
-			}
+	// The real equiv function
+	function innerEquiv( a, b ) {
 
-			// apply transition with (1..n) arguments
-		}( args[ 0 ], args[ 1 ] ) ) &&
-			innerEquiv.apply( this, args.splice( 1, args.length - 1 ) ) );
-	};
+		// We're done when there's nothing more to compare
+		if ( arguments.length < 2 ) {
+			return true;
+		}
+
+		// Require type-specific equality
+		return ( a === b || typeEquiv( a, b ) ) &&
+
+			// ...across all consecutive argument pairs
+			( arguments.length === 2 || innerEquiv.apply( this, [].slice.call( arguments, 1 ) ) );
+	}
 
 	return innerEquiv;
 }());
@@ -1937,7 +2075,7 @@ QUnit.dump = (function() {
 				key: quote,
 				// function calls it internally, it's the content of the function
 				functionCode: "[code]",
-				// node calls it internally, it's an html attribute value
+				// node calls it internally, it's a html attribute value
 				attribute: quote,
 				string: quote,
 				date: quote,
@@ -1999,7 +2137,8 @@ if ( defined.document ) {
 				"notDeepEqual",
 				"strictEqual",
 				"notStrictEqual",
-				"throws"
+				"throws",
+				"raises"
 			];
 
 		for ( i = 0, l = keys.length; i < l; i++ ) {
@@ -2038,13 +2177,13 @@ if ( typeof define === "function" && define.amd ) {
  * The original source of google-diff-match-patch is attributable and licensed as follows:
  *
  * Copyright 2006 Google Inc.
- * http://code.google.com/p/google-diff-match-patch/
+ * https://code.google.com/p/google-diff-match-patch/
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -2271,7 +2410,7 @@ QUnit.diff = ( function() {
 			return 0;
 		}
 		// Binary search.
-		// Performance analysis: http://neil.fraser.name/news/2007/10/09/
+		// Performance analysis: https://neil.fraser.name/news/2007/10/09/
 		pointermin = 0;
 		pointermax = Math.min( text1.length, text2.length );
 		pointermid = pointermax;
@@ -2304,7 +2443,7 @@ QUnit.diff = ( function() {
 			return 0;
 		}
 		// Binary search.
-		// Performance analysis: http://neil.fraser.name/news/2007/10/09/
+		// Performance analysis: https://neil.fraser.name/news/2007/10/09/
 		pointermin = 0;
 		pointermax = Math.min( text1.length, text2.length );
 		pointermid = pointermax;
@@ -2886,7 +3025,7 @@ QUnit.diff = ( function() {
 
 		// Start by looking for a single character match
 		// and increase length until no match is found.
-		// Performance analysis: http://neil.fraser.name/news/2010/11/04/
+		// Performance analysis: https://neil.fraser.name/news/2010/11/04/
 		best = 0;
 		length = 1;
 		while ( true ) {
@@ -3021,7 +3160,7 @@ QUnit.diff = ( function() {
 				// Upon reaching an equality, check for prior redundancies.
 				if ( countDelete + countInsert > 1 ) {
 					if ( countDelete !== 0 && countInsert !== 0 ) {
-						// Factor out any common prefixies.
+						// Factor out any common prefixes.
 						commonlength = this.diffCommonPrefix( textInsert, textDelete );
 						if ( commonlength !== 0 ) {
 							if ( ( pointer - countDelete - countInsert ) > 0 &&
@@ -3212,6 +3351,7 @@ QUnit.init = function() {
 };
 
 var config = QUnit.config,
+	collapseNext = false,
 	hasOwn = Object.prototype.hasOwnProperty,
 	defined = {
 		document: window.document !== undefined,
@@ -3608,6 +3748,17 @@ function storeFixture() {
 	}
 }
 
+function appendFilteredTest() {
+	var testId = QUnit.config.testId;
+	if ( !testId || testId.length <= 0 ) {
+		return "";
+	}
+	return "<div id='qunit-filteredTest'>Rerunning selected tests: " + testId.join(", ") +
+		" <a id='qunit-clearFilter' href='" +
+		setUrl({ filter: undefined, module: undefined, testId: undefined }) +
+		"'>" + "Run all tests" + "</a></div>";
+}
+
 function appendUserAgent() {
 	var userAgent = id( "qunit-userAgent" );
 
@@ -3615,7 +3766,7 @@ function appendUserAgent() {
 		userAgent.innerHTML = "";
 		userAgent.appendChild(
 			document.createTextNode(
-				"QUnit " + QUnit.version  + "; " + navigator.userAgent
+				"QUnit " + QUnit.version + "; " + navigator.userAgent
 			)
 		);
 	}
@@ -3679,6 +3830,7 @@ QUnit.begin(function( details ) {
 			"<h1 id='qunit-header'>" + escapeText( document.title ) + "</h1>" +
 			"<h2 id='qunit-banner'></h2>" +
 			"<div id='qunit-testrunner-toolbar'></div>" +
+			appendFilteredTest() +
 			"<h2 id='qunit-userAgent'></h2>" +
 			"<ol id='qunit-tests'></ol>";
 	}
@@ -3853,7 +4005,7 @@ QUnit.log(function( details ) {
 
 		message += "</table>";
 
-	// this occours when pushFailure is set and we have an extracted stack trace
+	// this occurs when pushFailure is set and we have an extracted stack trace
 	} else if ( !details.result && details.source ) {
 		message += "<table>" +
 			"<tr class='test-source'><th>Source: </th><td><pre>" +
@@ -3895,6 +4047,16 @@ QUnit.testDone(function( details ) {
 	}
 
 	if ( bad === 0 ) {
+
+		// Collapse the passing tests
+		addClass( assertList, "qunit-collapsed" );
+	} else if ( bad && config.collapse && !collapseNext ) {
+
+		// Skip collapsing the first failing test
+		collapseNext = true;
+	} else {
+
+		// Collapse remaining tests
 		addClass( assertList, "qunit-collapsed" );
 	}
 

From c9cb7e58776a095fdbc1a8ddeae8bb4fee5b97ce Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Fri, 19 Feb 2016 15:50:19 -0500
Subject: [PATCH 34/76] Add Customizer JS unit tests, save one event

---
 tests/js/index.html           |  16 ++
 tests/js/test-fieldmanager.js | 335 ++++++++++++++++++++++++++++++++++
 2 files changed, 351 insertions(+)

diff --git a/tests/js/index.html b/tests/js/index.html
index aa421377b9..8fbfd71759 100644
--- a/tests/js/index.html
+++ b/tests/js/index.html
@@ -23,6 +23,9 @@
 
 		scripts = [
 			svn + '/src/wp-includes/js/jquery/jquery.js',
+			svn + '/src/wp-includes/js/underscore.min.js',
+			svn + '/src/wp-includes/js/backbone.min.js',
+			svn + '/src/wp-includes/js/wp-util.js',
 			svn + '/src/wp-includes/js/jquery/ui/core.js',
 			svn + '/src/wp-includes/js/jquery/ui/widget.js',
 			svn + '/src/wp-includes/js/jquery/ui/mouse.js',
@@ -31,11 +34,16 @@
 			svn + '/src/wp-includes/js/jquery/ui/droppable.js',
 			svn + '/src/wp-includes/js/jquery/ui/menu.js',
 			svn + '/src/wp-includes/js/jquery/ui/autocomplete.js',
+			svn + '/src/wp-includes/js/customize-base.js',
+			svn + '/src/wp-includes/js/customize-models.js',
+			svn + '/src/wp-admin/js/customize-controls.js',
 		];
 
 		// Fieldmanager.
 		scripts.push( '../../js/fieldmanager.js' );
 		scripts.push( '../../js/fieldmanager-autocomplete.js' );
+		scripts.push( '../../js/jquery-serializejson/jquery.serializejson.min.js' );
+		scripts.push( '../../js/fieldmanager-customize.js' );
 
 		// Tests.
 		scripts.push( 'test-fieldmanager.js' );
@@ -107,6 +115,14 @@
 			<input type="text" id="ac-invisible" class="fm-autocomplete" style="display: none;">
 		</div>
 
+		<div id="customizer-events" class="fm-wrapper">
+			<a href="#" class="fmjs-remove">Remove</a>
+			<a class="fm-media-remove fm-delete" href="#">Remove</a>
+			<textarea class="tinymce"></textarea>
+			<input type="text" class="fm-autocomplete" />
+			<input type="text" class="fm-element" name="customize-text" value="First" />
+		</div>
+
 		<div id="renumbered" class="fm-wrapper" data-fm-array-position="1">
 			<div class="fm-item">
 				<div class="fm-element" name="mytest[0]">First</div>
diff --git a/tests/js/test-fieldmanager.js b/tests/js/test-fieldmanager.js
index 05dbc43d67..8d181b82ea 100644
--- a/tests/js/test-fieldmanager.js
+++ b/tests/js/test-fieldmanager.js
@@ -1,4 +1,9 @@
+/* global wp */
+
 (function( QUnit, $ ) {
+	function randStr() {
+		return Math.random().toString( 36 ).replace( '0.', '' );
+	}
 
 	QUnit.begin(function( details ) {
 		// Don't hide the fixture div by default: FM relies on visibility.
@@ -107,4 +112,334 @@
 		assert.equal( $( '[name="mytest[2][mysubtest][0]"]' ).text(), 'Delta', "Corresponding name attributes and text values in the reordered top-level group" );
 	});
 
+	QUnit.module( 'Customizer', function ( hooks ) {
+		QUnit.module( 'fm.customize API', function ( hooks ) {
+			QUnit.test( 'setControl sets Fieldmanager control setting', function ( assert ) {
+				var initialValue = randStr();
+
+				var setting = new wp.customize.Setting( randStr(), initialValue, {
+					transport: 'noop',
+					previewer: wp.customize.previewer,
+				});
+
+				var control = new wp.customize.Control( randStr(), {
+					setting: setting,
+					params: {
+						type: 'fieldmanager',
+					},
+				});
+
+				assert.equal( fm.customize.setControl( control ), setting, 'Should return setting' );
+				assert.notEqual( setting.get(), initialValue, 'Setting value should change' );
+			});
+
+			QUnit.test( 'setControl ignores non-Fieldmanager controls', function ( assert ) {
+				var value     = randStr();
+				var settingId = randStr();
+
+				var setting = new wp.customize.Setting( settingId, value, {
+					transport: 'noop',
+					previewer: wp.customize.previewer
+				});
+
+				var control = new wp.customize.Control( randStr(), {
+					setting: setting,
+					params: {
+						content: $( '<li>' ).append(
+							$( '<input />' )
+								.addClass( 'fm-element' )
+								.attr( 'type', 'text' )
+								.attr( 'name', settingId )
+						),
+						type: 'text',
+					},
+				});
+
+				assert.notOk( fm.customize.setControl( control ), 'Should not return setting' );
+				assert.equal( setting.get(), value, 'Setting value should not change' );
+			});
+
+			QUnit.test( 'setControl serializes only values in targetSelector', function ( assert ) {
+				var settingId         = randStr();
+				var settingValue      = randStr();
+				var fmElementValue    = randStr();
+				var notFmElementValue = randStr();
+
+				var markup = $( '<li>' ).append(
+					$( '<input />' )
+						.addClass( 'fm-element' )
+						.attr( 'name', settingId )
+						.attr( 'value', fmElementValue ),
+					$( '<input />' )
+						.addClass( 'not-fm-element' )
+						.attr( 'name', 'bar' )
+						.attr( 'value', notFmElementValue )
+				);
+
+				var setting = new wp.customize.Setting( settingId, settingValue, {
+					transport: 'noop',
+					previewer: wp.customize.previewer,
+				});
+
+				var control = new wp.customize.Control( settingId, {
+					setting: setting,
+					params: {
+						content: markup,
+						type: 'fieldmanager',
+					}
+				});
+
+				assert.ok( fm.customize.setControl( control ), 'successfully returned setting' );
+				assert.ok( -1 !== setting.get().indexOf( fmElementValue ), 'setting now contains "fm-element" value' );
+				assert.ok( -1 === setting.get().indexOf( notFmElementValue ), 'setting does not contain "not-fm-element" value' );
+			});
+
+			QUnit.test( 'setControl sets value with serializeJSON()', function ( assert ) {
+				var settingId = 'option_fields';
+				var textValue = randStr();
+
+				var expected = {
+					0: {
+						'repeatable_group': {
+							0: {
+								'text': textValue,
+							}
+						}
+					}
+				};
+
+				var setting = new wp.customize.Setting( settingId, '', {
+					transport: 'noop',
+					previewer: wp.customize.previewer,
+				});
+
+				var control = new wp.customize.Control( settingId, {
+					setting: setting,
+					params: {
+						content: $( '<li>' ).append(
+							$( '<input />' )
+								.addClass( 'fm-element' )
+								.attr( 'name', 'option_fields[0][repeatable_group][0][text]' )
+								.attr( 'value', textValue )
+						),
+						type: 'fieldmanager',
+					}
+				});
+
+				fm.customize.setControl( control );
+				assert.deepEqual( setting.get(), expected );
+			});
+
+			QUnit.test( 'setControl falls back to serialize()', function ( assert ) {
+				var plugin = $.fn.serializeJSON;
+				$.fn.serializeJSON = undefined;
+
+				var settingId = 'option_fields';
+				var textValue = randStr();
+
+				var expected = 'option_fields%5B0%5D%5Brepeatable_group%5D%5B0%5D%5Btext%5D=' + textValue;
+
+				var setting = new wp.customize.Setting( settingId, '', {
+					transport: 'noop',
+					previewer: wp.customize.previewer,
+				});
+
+				var control = new wp.customize.Control( settingId, {
+					setting: setting,
+					params: {
+						content: $( '<li>' ).append(
+							$( '<input />' )
+								.addClass( 'fm-element' )
+								.attr( 'name', 'option_fields[0][repeatable_group][0][text]' )
+								.attr( 'value', textValue )
+						),
+						type: 'fieldmanager',
+					}
+				});
+
+				fm.customize.setControl( control );
+				assert.strictEqual( setting.get(), expected );
+
+				$.fn.serializeJSON = plugin;
+			});
+
+			QUnit.test( 'setControlsContainingElement() sets only controls containing element', function ( assert ) {
+				var initialValue = randStr();
+				var newValue = randStr();
+				var id1 = randStr();
+				var id2 = randStr();
+
+				var setting1 = wp.customize.create( id1, id1, initialValue, {
+					transport: 'noop',
+					previewer: wp.customize.previewer,
+				} );
+
+				var $element1 = $( '<input />' )
+					.addClass( 'fm-element' )
+					.attr( 'name', id1 )
+					.attr( 'value', newValue );
+
+				var control1 = wp.customize.control.create( id1, id1, {
+					setting: setting1,
+					params: {
+						content: $( '<li>' ).append( $element1 ),
+						type: 'fieldmanager',
+					},
+				});
+
+				var setting2 = wp.customize.create( id2, id2, initialValue, {
+					transport: 'noop',
+					previewer: wp.customize.previewer,
+				});
+
+				var control2 = wp.customize.control.create( id2, id2, {
+					setting: setting2,
+					params: {
+						content: $( '<li>' ).append(
+							$( '<input />' )
+								.addClass( 'fm-element' )
+								.attr( 'name', id2 )
+								.attr( 'value', newValue )
+						),
+						type: 'fieldmanager',
+					}
+				});
+
+				fm.customize.setControlsContainingElement( $element1 );
+				assert.equal( setting1.get(), newValue, 'First setting value was in the control and should change' );
+				assert.equal( setting2.get(), initialValue, 'Second setting value was not in the control and should not change' );
+			});
+
+			QUnit.test( 'setEachControl should set each control', function ( assert ) {
+				var id1 = randStr();
+				var initialValue1 = randStr();
+				var newValue1 = randStr();
+
+				var id2 = randStr();
+				var initialValue2 = randStr();
+				var newValue2 = randStr();
+
+				var setting1 = wp.customize.create( id1, id1, initialValue1, {
+					transport: 'noop',
+					previewer: wp.customize.previewer,
+				} );
+
+				wp.customize.control.create( id1, id1, {
+					setting: setting1,
+					params: {
+						content: $( '<li>' ).append(
+							$( '<input />' )
+								.addClass( 'fm-element' )
+								.attr( 'name', id1 )
+								.attr( 'value', newValue1 )
+						 ),
+						type: 'fieldmanager',
+					},
+				});
+
+				var setting2 = wp.customize.create( id2, id2, initialValue2, {
+					transport: 'noop',
+					previewer: wp.customize.previewer,
+				});
+
+				wp.customize.control.create( id2, id2, {
+					setting: setting2,
+					params: {
+						content: $( '<li>' ).append(
+							$( '<input />' )
+								.addClass( 'fm-element' )
+								.attr( 'name', id2 )
+								.attr( 'value', newValue2 )
+						),
+						type: 'fieldmanager',
+					}
+				});
+
+				fm.customize.setEachControl();
+				assert.equal( setting1.get(), newValue1, 'First setting value changed' );
+				assert.equal( setting2.get(), newValue2, 'Second setting value changed' );
+			});
+		});
+
+		QUnit.module( 'Events', function ( hooks ) {
+			var initialValue = 'Wrong';
+			var expected = 'First';
+			var id = 'customize-text';
+
+			hooks.beforeEach(function( assert ) {
+				var setting = wp.customize.create( id, id, initialValue, {
+					transport: 'noop',
+					previewer: wp.customize.previewer,
+				});
+
+				wp.customize.control.create( id, id, {
+					setting: setting,
+					params: {
+						content: $( document ).find( '#customizer-events' ),
+						type: 'fieldmanager',
+					}
+				});
+
+				wp.customize.trigger( 'ready' );
+			});
+
+			hooks.afterEach(function( assert ) {
+				wp.customize.remove( id );
+				wp.customize.control.remove( id );
+			});
+
+			function assertStrictEqualSettingValue( assert ) {
+				assert.strictEqual( wp.customize.instance( id ).get(), expected, 'Setting value updated' );
+			}
+
+			QUnit.test( '.fm-element keyup', function ( assert ) {
+				var done = assert.async();
+				$( document ).find( '#customizer-events' ).find( '.fm-element' ).trigger( 'keyup' );
+				// Account for the _.debounce() attached to this event.
+				setTimeout(function() {
+					assertStrictEqualSettingValue( assert );
+					done();
+				}, 500 );
+			});
+
+			QUnit.test( '.fm-autocomplete keyup', function ( assert ) {
+				$( document ).find( '#customizer-events' ).find( '.fm-autocomplete' ).trigger( 'keyup' );
+				assertStrictEqualSettingValue( assert );
+			});
+
+			QUnit.test( '.fm-element change', function ( assert ) {
+				$( document ).find( '#customizer-events' ).find( '.fm-element' ).trigger( 'change' );
+				assertStrictEqualSettingValue( assert );
+			});
+
+			QUnit.test( '.fm-media-remove click ', function ( assert ) {
+				$( document ).find( '#customizer-events').find( '.fm-media-remove' ).trigger( 'click' );
+				assertStrictEqualSettingValue( assert );
+			});
+
+			QUnit.test( '.fmjs-remove click ', function ( assert ) {
+				$( document ).find( '#customizer-events').find( '.fmjs-remove' ).trigger( 'click' );
+				assertStrictEqualSettingValue( assert );
+			});
+
+			QUnit.test( 'fm_sortable_drop', function ( assert ) {
+				$( document ).trigger( 'fm_sortable_drop', $( document ).find( '#customizer-events' ).find( '.fm-element' )[0] );
+				assertStrictEqualSettingValue( assert );
+			});
+
+			QUnit.test( 'fieldmanager_media_preview', function ( assert ) {
+				$( document ).find( '#customizer-events' ).find( '.fm-element' ).trigger( 'fieldmanager_media_preview' );
+				assertStrictEqualSettingValue( assert );
+			});
+
+			// Needs a test with TinyMCE.
+			// QUnit.test( 'fm_richtext_init', function ( assert ) {
+			// });
+
+			QUnit.test( 'fm_colorpicker_update', function ( assert ) {
+				$( document ).trigger( 'fm_colorpicker_update', $( document ).find( '#customizer-events' ).find( '.fm-element' )[0] );
+				assertStrictEqualSettingValue( assert );
+			});
+		});
+	});
 })( window.QUnit, window.jQuery );

From d71c9aad7a0eca3c204ed87dbddc191b1a890fe1 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Fri, 19 Feb 2016 17:13:52 -0500
Subject: [PATCH 35/76] Fix default RichTextArea 'teeny' setting

---
 php/class-fieldmanager-richtextarea.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php/class-fieldmanager-richtextarea.php b/php/class-fieldmanager-richtextarea.php
index c694acd078..e9bfa0b228 100644
--- a/php/class-fieldmanager-richtextarea.php
+++ b/php/class-fieldmanager-richtextarea.php
@@ -120,13 +120,16 @@ public function form_element( $value = '' ) {
 			'textarea_name'  => $this->get_form_name(),
 			'editor_class'   => 'fm-element fm-richtext',
 			'tinymce'        => array( 'wp_skip_init' => true ),
-			'teeny'          => is_customize_preview(),
 		) );
 
 		if ( $proto ) {
 			add_filter( 'the_editor', array( $this, 'add_proto_id' ) );
 		}
 
+		if ( ! isset( $settings['teeny'] ) ) {
+			$settings['teeny'] = is_customize_preview();
+		}
+
 		if ( ! isset( $settings['default_editor'] ) ) {
 			$settings['default_editor'] = 'tinymce';
 		} elseif ( 'cookie' == $settings['default_editor'] ) {

From 75e5544856f74aebc1afdb9ccb98d22ec0b4a347 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Fri, 19 Feb 2016 17:39:47 -0500
Subject: [PATCH 36/76] Update WordPress versions QUnit tests againsts

---
 Gruntfile.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 9a361529f8..419e573934 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -24,8 +24,8 @@ module.exports = function( grunt ) {
 				options: {
 					urls: [
 						'http://localhost:8000/tests/js/index.html',
-						'http://localhost:8000/tests/js/index.html?wp=4.3',
-						'http://localhost:8000/tests/js/index.html?wp=4.2'
+						'http://localhost:8000/tests/js/index.html?wp=4.4',
+						'http://localhost:8000/tests/js/index.html?wp=4.3'
 					]
 				}
 			},

From d4e009361a42a1f9c4b3fc19ec23efff59d0e65e Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Fri, 19 Feb 2016 17:40:15 -0500
Subject: [PATCH 37/76] Provide 'settings' in test control params

Base Customizer JS expects it to be there.
---
 tests/js/test-fieldmanager.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/js/test-fieldmanager.js b/tests/js/test-fieldmanager.js
index 8d181b82ea..c4105e9818 100644
--- a/tests/js/test-fieldmanager.js
+++ b/tests/js/test-fieldmanager.js
@@ -125,6 +125,7 @@
 				var control = new wp.customize.Control( randStr(), {
 					setting: setting,
 					params: {
+						settings: {},
 						type: 'fieldmanager',
 					},
 				});
@@ -151,6 +152,7 @@
 								.attr( 'type', 'text' )
 								.attr( 'name', settingId )
 						),
+						settings: {},
 						type: 'text',
 					},
 				});
@@ -185,6 +187,7 @@
 					setting: setting,
 					params: {
 						content: markup,
+						settings: {},
 						type: 'fieldmanager',
 					}
 				});
@@ -222,6 +225,7 @@
 								.attr( 'name', 'option_fields[0][repeatable_group][0][text]' )
 								.attr( 'value', textValue )
 						),
+						settings: {},
 						type: 'fieldmanager',
 					}
 				});
@@ -253,6 +257,7 @@
 								.attr( 'name', 'option_fields[0][repeatable_group][0][text]' )
 								.attr( 'value', textValue )
 						),
+						settings: {},
 						type: 'fieldmanager',
 					}
 				});
@@ -283,6 +288,7 @@
 					setting: setting1,
 					params: {
 						content: $( '<li>' ).append( $element1 ),
+						settings: {},
 						type: 'fieldmanager',
 					},
 				});
@@ -301,6 +307,7 @@
 								.attr( 'name', id2 )
 								.attr( 'value', newValue )
 						),
+						settings: {},
 						type: 'fieldmanager',
 					}
 				});
@@ -333,6 +340,7 @@
 								.attr( 'name', id1 )
 								.attr( 'value', newValue1 )
 						 ),
+						settings: {},
 						type: 'fieldmanager',
 					},
 				});
@@ -351,6 +359,7 @@
 								.attr( 'name', id2 )
 								.attr( 'value', newValue2 )
 						),
+						settings: {},
 						type: 'fieldmanager',
 					}
 				});
@@ -376,6 +385,7 @@
 					setting: setting,
 					params: {
 						content: $( document ).find( '#customizer-events' ),
+						settings: {},
 						type: 'fieldmanager',
 					}
 				});

From 8bb2f5d77b3dca480abaa6a435d6cfe5bbf0d907 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sat, 20 Feb 2016 15:03:56 -0500
Subject: [PATCH 38/76] Add explanatory comment around creating field Setting

---
 php/context/class-fieldmanager-context-customizer.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/php/context/class-fieldmanager-context-customizer.php b/php/context/class-fieldmanager-context-customizer.php
index 78cfc48d09..bceb83bf59 100644
--- a/php/context/class-fieldmanager-context-customizer.php
+++ b/php/context/class-fieldmanager-context-customizer.php
@@ -107,6 +107,11 @@ protected function register_section( $manager ) {
 	/**
 	 * Add a Customizer setting for this field.
 	 *
+	 * By default, Fieldmanager registers one setting for a group and sends all
+	 * of the group data from the Customizer, rather than individual settings
+	 * for its children, so sanitization and validation routines can access the
+	 * full group data.
+	 *
 	 * @param WP_Customize_Manager $manager
 	 * @return Fieldmanager_Customize_Setting Setting object, where supported.
 	 */

From 0b13e64e7a73150133f5dc7b53c4cb7515ea33d1 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sat, 20 Feb 2016 17:13:06 -0500
Subject: [PATCH 39/76] Remove autocomplete shim

This behavior is in FM core as of 7ede93a.
---
 js/fieldmanager-customize.js | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/js/fieldmanager-customize.js b/js/fieldmanager-customize.js
index 4b0b6f4721..e841c77208 100644
--- a/js/fieldmanager-customize.js
+++ b/js/fieldmanager-customize.js
@@ -102,19 +102,11 @@
 		}
 
 		if ( $target.hasClass( 'fm-autocomplete' ) ) {
-			// Update an autocomplete setting object when the input's text is deleted.
-			if ( '' === $target.val() ) {
-				// See fm.autocomplete.enable_autocomplete() for this tree.
-				// @todo Risky? Autocomplete hidden fields don't typically get set to value="".
-				$target.siblings( 'input[type=hidden]' ).first().val( '' );
-
 			/*
 			 * Don't update when typing into the autocomplete input. The hidden
 			 * field actually contains the value and is handled onFmElementChange().
 			 */
-			} else {
-				return;
-			}
+			return;
 		}
 
 		fm.customize.setControlsContainingElement( e.target );

From d72e3dc2ccd56b5dbe3b62e860ca914143c2a138 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Thu, 3 Mar 2016 00:35:43 -0500
Subject: [PATCH 40/76] Update test control constructors after r36689

---
 tests/js/test-fieldmanager.js | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/tests/js/test-fieldmanager.js b/tests/js/test-fieldmanager.js
index d070b53d13..82abbdac4e 100644
--- a/tests/js/test-fieldmanager.js
+++ b/tests/js/test-fieldmanager.js
@@ -150,7 +150,8 @@
 				var control = new wp.customize.Control( randStr(), {
 					setting: setting,
 					params: {
-						settings: {},
+						// Hack so the setting isn't overwritten.
+						settings: [ '' ],
 						type: 'fieldmanager',
 					},
 				});
@@ -177,7 +178,7 @@
 								.attr( 'type', 'text' )
 								.attr( 'name', settingId )
 						),
-						settings: {},
+						settings: [ '' ],
 						type: 'text',
 					},
 				});
@@ -212,7 +213,8 @@
 					setting: setting,
 					params: {
 						content: markup,
-						settings: {},
+						// Hack so the setting isn't overwritten.
+						settings: [ '' ],
 						type: 'fieldmanager',
 					}
 				});
@@ -250,7 +252,7 @@
 								.attr( 'name', 'option_fields[0][repeatable_group][0][text]' )
 								.attr( 'value', textValue )
 						),
-						settings: {},
+						settings: [ '' ],
 						type: 'fieldmanager',
 					}
 				});
@@ -282,7 +284,7 @@
 								.attr( 'name', 'option_fields[0][repeatable_group][0][text]' )
 								.attr( 'value', textValue )
 						),
-						settings: {},
+						settings: [ '' ],
 						type: 'fieldmanager',
 					}
 				});
@@ -313,7 +315,7 @@
 					setting: setting1,
 					params: {
 						content: $( '<li>' ).append( $element1 ),
-						settings: {},
+						settings: [ '' ],
 						type: 'fieldmanager',
 					},
 				});
@@ -332,7 +334,7 @@
 								.attr( 'name', id2 )
 								.attr( 'value', newValue )
 						),
-						settings: {},
+						settings: [ '' ],
 						type: 'fieldmanager',
 					}
 				});
@@ -365,7 +367,7 @@
 								.attr( 'name', id1 )
 								.attr( 'value', newValue1 )
 						 ),
-						settings: {},
+						settings: [ '' ],
 						type: 'fieldmanager',
 					},
 				});
@@ -384,7 +386,7 @@
 								.attr( 'name', id2 )
 								.attr( 'value', newValue2 )
 						),
-						settings: {},
+						settings: [ '' ],
 						type: 'fieldmanager',
 					}
 				});
@@ -410,7 +412,7 @@
 					setting: setting,
 					params: {
 						content: $( document ).find( '#customizer-events' ),
-						settings: {},
+						settings: [ '' ],
 						type: 'fieldmanager',
 					}
 				});

From 70651965c84b666854b1e6dd028e876e1852763f Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Thu, 3 Mar 2016 00:38:15 -0500
Subject: [PATCH 41/76] Update autocomplete event test after 0b13e64

---
 tests/js/test-fieldmanager.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/js/test-fieldmanager.js b/tests/js/test-fieldmanager.js
index 82abbdac4e..42fd6f215a 100644
--- a/tests/js/test-fieldmanager.js
+++ b/tests/js/test-fieldmanager.js
@@ -441,7 +441,8 @@
 
 			QUnit.test( '.fm-autocomplete keyup', function ( assert ) {
 				$( document ).find( '#customizer-events' ).find( '.fm-autocomplete' ).trigger( 'keyup' );
-				assertStrictEqualSettingValue( assert );
+				// This in itself should *not* trigger a change.
+				assert.strictEqual( wp.customize.instance( id ).get(), initialValue, 'Setting value unchanged' );
 			});
 
 			QUnit.test( '.fm-element change', function ( assert ) {

From c24c240964d35157ae6a1351d40acbbfe2924363 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sat, 5 Mar 2016 15:54:26 -0500
Subject: [PATCH 42/76] Check control has setting before using it

---
 js/fieldmanager-customize.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/js/fieldmanager-customize.js b/js/fieldmanager-customize.js
index e841c77208..8508e895c7 100644
--- a/js/fieldmanager-customize.js
+++ b/js/fieldmanager-customize.js
@@ -59,6 +59,10 @@
 				return;
 			}
 
+			if ( ! control.setting ) {
+				return;
+			}
+
 			$element = control.container.find( this.targetSelector );
 
 			if ( $element.serializeJSON ) {

From 45bff86c72a59d2c3d85f788065b1447eb51974c Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sat, 5 Mar 2016 16:13:46 -0500
Subject: [PATCH 43/76] Remove debouncing from changes after 'keyup'

Debouncing updates to fields creates an FM-specific deviation to how
users experience the Customizer, with questionable benefit to them and
additional maintenance for the plugin.

Without debouncing, changes to settings using the `postMessage`
transport are faster. The Customizer's selective refresh framework also
[debounces natively][1], making FM debouncing redundant.

[1]: https://make.wordpress.org/core/2016/02/16/selective-refresh-in-the-customizer/
---
 js/fieldmanager-customize.js | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/js/fieldmanager-customize.js b/js/fieldmanager-customize.js
index 8508e895c7..d7e7878577 100644
--- a/js/fieldmanager-customize.js
+++ b/js/fieldmanager-customize.js
@@ -76,13 +76,6 @@
 		},
 	};
 
-	/**
-	 * Debounce interval between looking for changes after a 'keyup'.
-	 *
-	 * @type {Number}
-	 */
-	var keyupDebounceInterval = 500;
-
 	/**
 	 * Fires when an .fm-element input triggers a 'change' event.
 	 *
@@ -154,10 +147,10 @@
 	 * @param {Object} ed TinyMCE instance.
 	 */
 	var onFmRichtextInit = function( e, ed ) {
-		ed.on( 'keyup AddUndo', _.debounce( function () {
+		ed.on( 'keyup AddUndo', function () {
 			ed.save();
 			fm.customize.setControlsContainingElement( document.getElementById( ed.id ) );
-		}, keyupDebounceInterval ) );
+		}, keyupDebounceInterval );
 	};
 
 	/**
@@ -234,16 +227,8 @@
 	var ready = function() {
 		var $document = $( document );
 
-		/*
-		 * We debounce() most keyup events to avoid refreshing the Customizer
-		 * preview every single time the user types a letter. But typing into
-		 * the autocomplete input does not itself trigger a refresh -- the only
-		 * time it should affect the preview is when removing an autocomplete
-		 * selection. We allow that to occur normally.
-		 */
-		$document.on( 'keyup', '.fm-element:not(.fm-autocomplete)', _.debounce( onFmElementKeyup, keyupDebounceInterval ) );
+		$document.on( 'keyup', '.fm-element:not(.fm-autocomplete)', onFmElementKeyup );
 		$document.on( 'keyup', '.fm-autocomplete', onFmElementKeyup );
-
 		$document.on( 'change', '.fm-element', onFmElementChange );
 		$document.on( 'click', '.fm-media-remove', onFmMediaRemoveClick );
 		$document.on( 'click', '.fmjs-remove', onFmjsRemoveClick );

From 25c8fb0bfb76ceab6257613658ea8d0df236e2ce Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sat, 5 Mar 2016 16:27:43 -0500
Subject: [PATCH 44/76] Remove the other half of RichTextArea debouncing

---
 js/fieldmanager-customize.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/fieldmanager-customize.js b/js/fieldmanager-customize.js
index d7e7878577..2a029bcfd9 100644
--- a/js/fieldmanager-customize.js
+++ b/js/fieldmanager-customize.js
@@ -150,7 +150,7 @@
 		ed.on( 'keyup AddUndo', function () {
 			ed.save();
 			fm.customize.setControlsContainingElement( document.getElementById( ed.id ) );
-		}, keyupDebounceInterval );
+		} );
 	};
 
 	/**

From 82aaf302ce2ba10994ef9ffed4d01f0a6f6f98fc Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sat, 5 Mar 2016 16:29:50 -0500
Subject: [PATCH 45/76] Merge redundant keyup events

---
 js/fieldmanager-customize.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/js/fieldmanager-customize.js b/js/fieldmanager-customize.js
index 2a029bcfd9..d5b4edbaee 100644
--- a/js/fieldmanager-customize.js
+++ b/js/fieldmanager-customize.js
@@ -227,8 +227,7 @@
 	var ready = function() {
 		var $document = $( document );
 
-		$document.on( 'keyup', '.fm-element:not(.fm-autocomplete)', onFmElementKeyup );
-		$document.on( 'keyup', '.fm-autocomplete', onFmElementKeyup );
+		$document.on( 'keyup', '.fm-element', onFmElementKeyup );
 		$document.on( 'change', '.fm-element', onFmElementChange );
 		$document.on( 'click', '.fm-media-remove', onFmMediaRemoveClick );
 		$document.on( 'click', '.fmjs-remove', onFmjsRemoveClick );

From 163d44b1594dfaf0da63effb2a7a7713a0dc0447 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Thu, 17 Mar 2016 23:46:10 -0400
Subject: [PATCH 46/76] Hook into 'customize_register' at priority 100

Allows the context to use data created by callbacks during the default
priority. See Fieldmanager_Context_Post for precedent about '100'.
---
 php/context/class-fieldmanager-context-customizer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/context/class-fieldmanager-context-customizer.php b/php/context/class-fieldmanager-context-customizer.php
index bceb83bf59..dac6774886 100644
--- a/php/context/class-fieldmanager-context-customizer.php
+++ b/php/context/class-fieldmanager-context-customizer.php
@@ -40,7 +40,7 @@ public function __construct( $args, $fm ) {
 
 		$this->fm = $fm;
 
-		add_action( 'customize_register', array( $this, 'customize_register' ) );
+		add_action( 'customize_register', array( $this, 'customize_register' ), 100 );
 	}
 
 	/**

From 239629778f07798105be2991384dcacb80161d55 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Thu, 17 Mar 2016 23:52:37 -0400
Subject: [PATCH 47/76] Don't require each Customizer context to create a
 section

Customizer sections are now created only when arguments are provided,
which makes it much easier to add fields to an existing section. The
"pass a section title string" helper was moved to the Fieldmanager_Field
wrapper. The wrapper itself was also renamed for clarity.
---
 php/class-fieldmanager-field.php              | 13 ++++++++---
 .../class-fieldmanager-context-customizer.php | 22 +++++++++----------
 .../test-fieldmanager-context-customizer.php  | 14 ++++++++----
 3 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/php/class-fieldmanager-field.php b/php/class-fieldmanager-field.php
index 04eeab672d..bb9a9b9014 100644
--- a/php/class-fieldmanager-field.php
+++ b/php/class-fieldmanager-field.php
@@ -1084,11 +1084,18 @@ public function activate_submenu_page() {
 	/**
 	 * Add this field to the Customizer.
 	 *
-	 * @param string|array $args Customizer section title or arguments for the
-	 *     section and setting. @see Fieldmanager_Context_Customizer.
+	 * @param string|array $args @see Fieldmanager_Context_Customizer. Pass a
+	 *     string to add a Customizer section for this field that uses the
+	 *     string for its title and context defaults for the remaining
+	 *     arguments. Or, pass a full array of arguments for the context.
 	 */
-	public function add_customizer_section( $args ) {
+	public function add_to_customizer( $args = array() ) {
 		$this->require_base();
+
+		if ( is_string( $args ) ) {
+			$args = array( 'section_args' => array( 'title' => $args ) );
+		}
+
 		return new Fieldmanager_Context_Customizer( $args, $this );
 	}
 
diff --git a/php/context/class-fieldmanager-context-customizer.php b/php/context/class-fieldmanager-context-customizer.php
index dac6774886..1748029988 100644
--- a/php/context/class-fieldmanager-context-customizer.php
+++ b/php/context/class-fieldmanager-context-customizer.php
@@ -10,11 +10,11 @@
  */
 class Fieldmanager_Context_Customizer extends Fieldmanager_Context {
 	/**
-	 * @var string|array $args {
-	 *     The title to use with the {@see WP_Customize_Section}, or arrays of
-	 *     arguments to construct Customizer objects.
+	 * @var array $args {
+	 *     Arguments to construct Customizer objects.
 	 *
-	 *     @type array $section_args Arguments for constructing a WP_Customize_Section.
+	 *     @type array|bool $section_args Arguments for constructing a {@see WP_Customize_Section},
+	 *           or false to not create one for this context.
 	 *     @type array $setting_args Arguments for constructing a {@see Fieldmanager_Customize_Setting}.
 	 *     @type array $control_args Arguments for constructing a {@see Fieldmanager_Customize_Control}.
 	 * }
@@ -24,16 +24,12 @@ class Fieldmanager_Context_Customizer extends Fieldmanager_Context {
 	/**
 	 * Constructor.
 	 *
-	 * @param string|array $args Section title or Customizer object arguments.
+	 * @param array $args Customizer object arguments. @see Fieldmanager_Context_Customizer::args.
 	 * @param Fieldmanager_Field $fm Field object to add to the Customizer.
 	 */
 	public function __construct( $args, $fm ) {
-		if ( is_string( $args ) ) {
-			$args = array( 'section_args' => array( 'title' => $args ) );
-		}
-
 		$this->args = wp_parse_args( $args, array(
-			'section_args' => array(),
+			'section_args' => false,
 			'setting_args' => array(),
 			'control_args' => array(),
 		) );
@@ -98,9 +94,13 @@ protected function register( $manager ) {
 	 * Add a Customizer section for this field.
 	 *
 	 * @param WP_Customize_Manager $manager
-	 * @return WP_Customize_Section Section object, where supported.
+	 * @return WP_Customize_Section|void Section object, where supported, if created.
 	 */
 	protected function register_section( $manager ) {
+		if ( false === $this->args['section_args'] ) {
+			return;
+		}
+
 		return $manager->add_section( $this->fm->name, $this->args['section_args'] );
 	}
 
diff --git a/tests/php/test-fieldmanager-context-customizer.php b/tests/php/test-fieldmanager-context-customizer.php
index 65d4140d39..0e4275eb85 100644
--- a/tests/php/test-fieldmanager-context-customizer.php
+++ b/tests/php/test-fieldmanager-context-customizer.php
@@ -10,18 +10,24 @@ function setUp() {
 		$this->field = new Fieldmanager_TextField( array( 'name' => 'foo' ) );
 	}
 
-	// Test that a section is created even without constructor args.
-	function test_bare_section() {
+	// Test that no section is created if no section args are passed.
+	function test_no_section() {
 		new Fieldmanager_Context_Customizer( array(), $this->field );
+		$this->assertEmpty( $this->manager->get_section( $this->field->name ) );
+	}
+
+	// Test that a section is created even with empty constructor args.
+	function test_bare_section() {
+		new Fieldmanager_Context_Customizer( array( 'section_args' => array() ), $this->field );
 		$this->register();
 		$this->assertInstanceOf( 'WP_Customize_Section', $this->manager->get_section( $this->field->name ) );
 	}
 
-	// Test that a section is created even with a title string.
+	// Test that a section is created with a title string.
 	function test_section_title() {
 		$title = rand_str();
 
-		new Fieldmanager_Context_Customizer( $title, $this->field );
+		new Fieldmanager_Context_Customizer( array( 'section_args' => array( 'title' => $title ) ), $this->field );
 		$this->register();
 		$this->assertSame( $title, $this->manager->get_section( $this->field->name )->title );
 	}

From 2571c9d5738dc2a3728058d6181586d1952ee820 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Thu, 17 Mar 2016 23:58:49 -0400
Subject: [PATCH 48/76] Revert "Update test control constructors after r36689"

This reverts commit d72e3dc2ccd56b5dbe3b62e860ca914143c2a138.
---
 tests/js/test-fieldmanager.js | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/tests/js/test-fieldmanager.js b/tests/js/test-fieldmanager.js
index 42fd6f215a..d9ad18cf7d 100644
--- a/tests/js/test-fieldmanager.js
+++ b/tests/js/test-fieldmanager.js
@@ -150,8 +150,7 @@
 				var control = new wp.customize.Control( randStr(), {
 					setting: setting,
 					params: {
-						// Hack so the setting isn't overwritten.
-						settings: [ '' ],
+						settings: {},
 						type: 'fieldmanager',
 					},
 				});
@@ -178,7 +177,7 @@
 								.attr( 'type', 'text' )
 								.attr( 'name', settingId )
 						),
-						settings: [ '' ],
+						settings: {},
 						type: 'text',
 					},
 				});
@@ -213,8 +212,7 @@
 					setting: setting,
 					params: {
 						content: markup,
-						// Hack so the setting isn't overwritten.
-						settings: [ '' ],
+						settings: {},
 						type: 'fieldmanager',
 					}
 				});
@@ -252,7 +250,7 @@
 								.attr( 'name', 'option_fields[0][repeatable_group][0][text]' )
 								.attr( 'value', textValue )
 						),
-						settings: [ '' ],
+						settings: {},
 						type: 'fieldmanager',
 					}
 				});
@@ -284,7 +282,7 @@
 								.attr( 'name', 'option_fields[0][repeatable_group][0][text]' )
 								.attr( 'value', textValue )
 						),
-						settings: [ '' ],
+						settings: {},
 						type: 'fieldmanager',
 					}
 				});
@@ -315,7 +313,7 @@
 					setting: setting1,
 					params: {
 						content: $( '<li>' ).append( $element1 ),
-						settings: [ '' ],
+						settings: {},
 						type: 'fieldmanager',
 					},
 				});
@@ -334,7 +332,7 @@
 								.attr( 'name', id2 )
 								.attr( 'value', newValue )
 						),
-						settings: [ '' ],
+						settings: {},
 						type: 'fieldmanager',
 					}
 				});
@@ -367,7 +365,7 @@
 								.attr( 'name', id1 )
 								.attr( 'value', newValue1 )
 						 ),
-						settings: [ '' ],
+						settings: {},
 						type: 'fieldmanager',
 					},
 				});
@@ -386,7 +384,7 @@
 								.attr( 'name', id2 )
 								.attr( 'value', newValue2 )
 						),
-						settings: [ '' ],
+						settings: {},
 						type: 'fieldmanager',
 					}
 				});
@@ -412,7 +410,7 @@
 					setting: setting,
 					params: {
 						content: $( document ).find( '#customizer-events' ),
-						settings: [ '' ],
+						settings: {},
 						type: 'fieldmanager',
 					}
 				});

From 85f90e7994fc0b7f504327aa8f06faa6e2d37380 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Fri, 18 Mar 2016 00:04:10 -0400
Subject: [PATCH 49/76] Correctly instantiate controls in JS tests

See https://core.trac.wordpress.org/ticket/35926#comment:12
---
 tests/js/test-fieldmanager.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/js/test-fieldmanager.js b/tests/js/test-fieldmanager.js
index d9ad18cf7d..6bb570333e 100644
--- a/tests/js/test-fieldmanager.js
+++ b/tests/js/test-fieldmanager.js
@@ -150,7 +150,7 @@
 				var control = new wp.customize.Control( randStr(), {
 					setting: setting,
 					params: {
-						settings: {},
+						settings: { 'default': setting.id },
 						type: 'fieldmanager',
 					},
 				});
@@ -177,7 +177,7 @@
 								.attr( 'type', 'text' )
 								.attr( 'name', settingId )
 						),
-						settings: {},
+						settings: { 'default': setting.id },
 						type: 'text',
 					},
 				});
@@ -212,7 +212,7 @@
 					setting: setting,
 					params: {
 						content: markup,
-						settings: {},
+						settings: { 'default': setting.id },
 						type: 'fieldmanager',
 					}
 				});
@@ -250,7 +250,7 @@
 								.attr( 'name', 'option_fields[0][repeatable_group][0][text]' )
 								.attr( 'value', textValue )
 						),
-						settings: {},
+						settings: { 'default': setting.id },
 						type: 'fieldmanager',
 					}
 				});
@@ -282,7 +282,7 @@
 								.attr( 'name', 'option_fields[0][repeatable_group][0][text]' )
 								.attr( 'value', textValue )
 						),
-						settings: {},
+						settings: { 'default': setting.id },
 						type: 'fieldmanager',
 					}
 				});
@@ -313,7 +313,7 @@
 					setting: setting1,
 					params: {
 						content: $( '<li>' ).append( $element1 ),
-						settings: {},
+						settings: { 'default': setting1.id },
 						type: 'fieldmanager',
 					},
 				});
@@ -332,7 +332,7 @@
 								.attr( 'name', id2 )
 								.attr( 'value', newValue )
 						),
-						settings: {},
+						settings: { 'default': setting2.id },
 						type: 'fieldmanager',
 					}
 				});
@@ -365,7 +365,7 @@
 								.attr( 'name', id1 )
 								.attr( 'value', newValue1 )
 						 ),
-						settings: {},
+						settings: { 'default': setting1.id },
 						type: 'fieldmanager',
 					},
 				});
@@ -384,7 +384,7 @@
 								.attr( 'name', id2 )
 								.attr( 'value', newValue2 )
 						),
-						settings: {},
+						settings: { 'default': setting2.id },
 						type: 'fieldmanager',
 					}
 				});
@@ -410,7 +410,7 @@
 					setting: setting,
 					params: {
 						content: $( document ).find( '#customizer-events' ),
-						settings: {},
+						settings: { 'default': setting.id },
 						type: 'fieldmanager',
 					}
 				});

From af2ed0f679e51775bf30bc5a5323c8976690f023 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Fri, 18 Mar 2016 00:13:09 -0400
Subject: [PATCH 50/76] Remove extra line

---
 .../php/testcase/class-fieldmanager-customizer-unittestcase.php  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/php/testcase/class-fieldmanager-customizer-unittestcase.php b/tests/php/testcase/class-fieldmanager-customizer-unittestcase.php
index 239ce57bba..b08baecc7c 100644
--- a/tests/php/testcase/class-fieldmanager-customizer-unittestcase.php
+++ b/tests/php/testcase/class-fieldmanager-customizer-unittestcase.php
@@ -8,7 +8,6 @@ function setUp() {
 		$this->manager = new WP_Customize_Manager();
 	}
 
-
 	function register() {
 		do_action( 'customize_register', $this->manager );
 	}

From 9d94adb102ffa1f8e48d0eb2ac3c4f77850fcc05 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sun, 15 May 2016 03:28:40 -0400
Subject: [PATCH 51/76] Render Fieldmanager_Customize_Control::label and
 ::description

Although Fieldmanager has its own version of these properties, there
isn't a technical reason to ignore the `WP_Customize_Control` versions,
and developers might still want to use them if other Customizer
functionality hooks into the markup.
---
 php/class-fieldmanager-customize-control.php      | 12 ++++++++++++
 tests/php/test-fieldmanager-customize-control.php |  9 +++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/php/class-fieldmanager-customize-control.php b/php/class-fieldmanager-customize-control.php
index c3ce9db806..4f169460a8 100644
--- a/php/class-fieldmanager-customize-control.php
+++ b/php/class-fieldmanager-customize-control.php
@@ -64,8 +64,20 @@ public function enqueue() {
 		 * Render the control's content.
 		 *
 		 * @see Fieldmanager_Context::render_field().
+		 * @see WP_Customize_Control::render_content().
 		 */
 		protected function render_content() {
+			?>
+
+			<?php if ( ! empty( $this->label ) ) : ?>
+				<span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
+			<?php endif; ?>
+
+			<?php if ( ! empty( $this->description ) ) : ?>
+				<span class="description customize-control-description"><?php echo esc_html( $this->description ); ?></span>
+			<?php endif; ?>
+
+			<?php
 			$this->context->render_field( array( 'data' => $this->value() ) );
 		}
 	}
diff --git a/tests/php/test-fieldmanager-customize-control.php b/tests/php/test-fieldmanager-customize-control.php
index e281ba0217..d72cc014e8 100644
--- a/tests/php/test-fieldmanager-customize-control.php
+++ b/tests/php/test-fieldmanager-customize-control.php
@@ -71,13 +71,16 @@ function test_fm_add_scripts() {
 	}
 
 	function test_render_content() {
-		$name  = rand_str();
-		$value = rand_str();
+		$name        = rand_str();
+		$value       = rand_str();
+		$label       = rand_str();
+		$description = rand_str();
 
 		$context = new Fieldmanager_Context_Customizer( array(
 			// Bypass capability checks.
 			'section_args' => array( 'capability' => 'exist' ),
 			'setting_args' => array( 'capability' => 'exist' ),
+			'control_args' => array( 'label' => $label, 'description' => $description ),
 		), new Fieldmanager_Textfield( array( 'name' => $name ) ) );
 
 		update_option( $name, $value );
@@ -86,6 +89,8 @@ function test_render_content() {
 		$actual = $this->manager->get_control( $name )->get_content();
 		$this->assertContains( 'fm-element', $actual );
 		$this->assertContains( sprintf( 'name="%s"', $name ), $actual );
+		$this->assertRegExp( '#<([^ ]+)[^>]*?>' . $label . '</\1>#', $actual );
+		$this->assertRegExp( '#<([^ ]+)[^>]*?>' . $description . '</\1>#', $actual );
 		// Slip in a test that the option value is also used.
 		$this->assertContains( sprintf( 'value="%s"', $value ), $actual );
 	}

From 85f1efb47d7c27f389cb7f08f49193ed0759fd5d Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Fri, 3 Jun 2016 00:17:50 -0400
Subject: [PATCH 52/76] Support core's Customizer setting validation

When core's setting validation is not available, invalid values will
still be rejected, but there won't be a notice.

Reverts 0795c833e45844c946b694f65a652df7bdea9daa and
bd39fe88477f57a943125714489c630ea68014ef, which added kludgy support for
alerting users to validation errors.
---
 js/fieldmanager-customize.js                  | 15 -----
 php/class-fieldmanager-customize-setting.php  | 12 ++--
 php/class-fieldmanager-field.php              |  7 +--
 .../class-fieldmanager-context-customizer.php | 60 ++++++++++++++++++-
 .../test-fieldmanager-context-customizer.php  | 56 ++++++++++++++++-
 5 files changed, 122 insertions(+), 28 deletions(-)

diff --git a/js/fieldmanager-customize.js b/js/fieldmanager-customize.js
index d5b4edbaee..3d6a5cfe55 100644
--- a/js/fieldmanager-customize.js
+++ b/js/fieldmanager-customize.js
@@ -237,20 +237,6 @@
 		$document.on( 'fm_colorpicker_update', onFmColorpickerUpdate );
 	};
 
-	/**
-	 * Fires when a Customizer request to save values fails.
-	 *
-	 * @return {Mixed} response The response from the server.
-	 */
-	var error = function( response ) {
-		if ( ! response.fieldmanager ) {
-			return;
-		}
-
-		// There isn't yet an official way to signal a save failure, but this mimics the AYS prompt.
-		alert( response.fieldmanager );
-	};
-
 	/**
 	 * Fires when a Customizer Section is added.
 	 *
@@ -265,7 +251,6 @@
 
 	if ( typeof api !== 'undefined' ) {
 		api.bind( 'ready', ready );
-		api.bind( 'error', error );
 		api.section.bind( 'add', addSection );
 	}
 })( jQuery, wp.customize, _, fm );
diff --git a/php/class-fieldmanager-customize-setting.php b/php/class-fieldmanager-customize-setting.php
index f0629388bb..b8e285f8a9 100644
--- a/php/class-fieldmanager-customize-setting.php
+++ b/php/class-fieldmanager-customize-setting.php
@@ -29,8 +29,9 @@ public function __construct( $manager, $id, $args = array() ) {
 				// Set the default without checking isset() to support null values.
 				$this->default = $this->context->fm->default_value;
 
-				// Sanitize with the context.
+				// Sanitize and validate with the context.
 				$this->sanitize_callback = array( $this->context, 'sanitize_callback' );
+				$this->validate_callback = array( $this->context, 'validate_callback' );
 
 				// Use the Fieldmanager submenu default.
 				$this->type = 'option';
@@ -53,12 +54,13 @@ public function __construct( $manager, $id, $args = array() ) {
 		 */
 		public function _preview_filter( $original ) {
 			/*
-			 * Don't continue to the parent _preview_filter() while sanitizing.
-			 * _preview_filter() eventually calls sanitize_callback(), which
-			 * calls Fieldmanager_Context_Customizer::sanitize_callback(), which
+			 * Don't continue to the parent _preview_filter() while sanitizing
+			 * or validating. _preview_filter() eventually calls
+			 * sanitize_callback() and validate_callback(), which calls the
+			 * hooks to those methods in Fieldmanager_Context_Customizer, which
 			 * calls WP_Customize_Setting::value(), which ends up back here.
 			 */
-			if ( doing_filter( "customize_sanitize_{$this->id}" ) ) {
+			if ( doing_filter( "customize_sanitize_{$this->id}" ) || doing_filter( "customize_validate_{$this->id}" ) ) {
 				return $original;
 			}
 
diff --git a/php/class-fieldmanager-field.php b/php/class-fieldmanager-field.php
index bb9a9b9014..6af81f01d6 100644
--- a/php/class-fieldmanager-field.php
+++ b/php/class-fieldmanager-field.php
@@ -1125,15 +1125,10 @@ public function _unauthorized_access( $debug_message = '' ) {
 	 * @return void
 	 */
 	protected function _failed_validation( $debug_message = '' ) {
-		if ( self::$debug ) {
+		if ( self::$debug || is_customize_preview() ) {
 			throw new FM_Validation_Exception( $debug_message );
 		}
 
-		if ( is_customize_preview() ) {
-			// There isn't yet a way to catch this error during a preview refresh.
-			wp_send_json_error( array( 'fieldmanager' => sprintf( __( 'Error: %s. Please check your settings and save again.', 'fieldmanager' ), $debug_message ) ) );
-		}
-
 		wp_die( esc_html(
 			$debug_message . "\n\n" .
 			__( "You may be able to use your browser's back button to resolve this error.", 'fieldmanager' )
diff --git a/php/context/class-fieldmanager-context-customizer.php b/php/context/class-fieldmanager-context-customizer.php
index 1748029988..e60f8aa9fa 100644
--- a/php/context/class-fieldmanager-context-customizer.php
+++ b/php/context/class-fieldmanager-context-customizer.php
@@ -21,6 +21,16 @@ class Fieldmanager_Context_Customizer extends Fieldmanager_Context {
 	 */
 	protected $args;
 
+	/**
+	 * Whether to support the Customizer's setting validation model.
+	 *
+	 * By default, the context will automatically set this to true when it
+	 * detects that the Customizer's validation model is available.
+	 *
+	 * @var bool
+	 */
+	public $use_customize_validiation = false;
+
 	/**
 	 * Constructor.
 	 *
@@ -37,6 +47,7 @@ public function __construct( $args, $fm ) {
 		$this->fm = $fm;
 
 		add_action( 'customize_register', array( $this, 'customize_register' ), 100 );
+		add_action( 'customize_save_validation_before', array( $this, 'customize_save_validation_before' ) );
 	}
 
 	/**
@@ -48,6 +59,16 @@ public function customize_register( $manager ) {
 		$this->register( $manager );
 	}
 
+	/**
+	 * Fires before save validation happens.
+	 *
+	 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
+	 */
+	public function customize_save_validation_before( $manager ) {
+		// This hook facilitates "just-in-time" support for validation.
+		$this->use_customize_validiation = true;
+	}
+
 	/**
 	 * Exposes Fieldmanager_Context::render_field() for the control to call.
 	 *
@@ -62,7 +83,7 @@ public function render_field( $args = array() ) {
 	 *
 	 * @param mixed $value Setting value.
 	 * @param WP_Customize_Setting $setting WP_Customize_Setting instance.
-	 * @return mixed The sanitized setting value.
+	 * @return mixed The sanitized setting value; WP_Error on invalidity.
 	 */
 	public function sanitize_callback( $value, $setting ) {
 		if ( is_string( $value ) && 0 === strpos( $value, $this->fm->name ) ) {
@@ -75,10 +96,47 @@ public function sanitize_callback( $value, $setting ) {
 			$value = $value[ $this->fm->name ];
 		}
 
+		$validity = $this->validate_callback( new WP_Error(), $value, $setting );
+
+		if ( $validity->get_error_message() ) {
+			if ( $this->use_customize_validiation ) {
+				return $validity;
+			}
+
+			/*
+			 * Returning null is a backwards-compatible way to reject a value
+			 * from WP_Customize_Setting::sanitize(). See
+			 * https://core.trac.wordpress.org/ticket/34893.
+			 */
+			return null;
+		}
+
 		// Return the value after Fieldmanager takes a shot at it.
 		return stripslashes_deep( $this->prepare_data( $setting->value(), $value ) );
 	}
 
+	/**
+	 * Filter the validity of a Customize setting value.
+	 *
+	 * @param WP_Error $validity Object with error messages, if any.
+	 * @param mixed $value Setting value.
+	 * @param WP_Customize_Setting $setting WP_Customize_Setting instance.
+	 * @return WP_Error Object with an added message from Fieldmanager, if any.
+	 */
+	public function validate_callback( $validity, $value, $setting ) {
+		try {
+			$this->prepare_data( $setting->value(), $value );
+		} catch ( FM_Validation_Exception $e ) {
+			if ( ! is_wp_error( $validity ) ) {
+				$validity = new WP_Error();
+			}
+
+			$validity->add( 'fieldmanager', $e->getMessage() );
+		}
+
+		return $validity;
+	}
+
 	/**
 	 * Create a Customizer section, setting, and control for this field.
 	 *
diff --git a/tests/php/test-fieldmanager-context-customizer.php b/tests/php/test-fieldmanager-context-customizer.php
index 0e4275eb85..5ad8ddba11 100644
--- a/tests/php/test-fieldmanager-context-customizer.php
+++ b/tests/php/test-fieldmanager-context-customizer.php
@@ -3,13 +3,24 @@
  * @group customize
  */
 class Test_Fieldmanager_Context_Customizer extends Fieldmanager_Customizer_UnitTestCase {
-	protected $field;
+	protected $field, $old_debug;
 
 	function setUp() {
 		parent::setUp();
+
+		// Since we can't simulate is_customize_preview(), make sure debug mode
+		// is on so FM_Validation_Exceptions are thrown.
+		$this->old_debug = Fieldmanager_Field::$debug;
+		Fieldmanager_Field::$debug = true;
+
 		$this->field = new Fieldmanager_TextField( array( 'name' => 'foo' ) );
 	}
 
+	function tearDown() {
+		parent::tearDown();
+		Fieldmanager_Field::$debug = $this->old_debug;
+	}
+
 	// Test that no section is created if no section args are passed.
 	function test_no_section() {
 		new Fieldmanager_Context_Customizer( array(), $this->field );
@@ -314,6 +325,49 @@ function test_sanitize_stripslashes() {
 		$this->assertSame( 'Foo "bar" baz', $context->sanitize_callback( 'Foo \"bar\" baz', $this->manager->get_setting( $this->field->name ) ) );
 	}
 
+	// Make sure sanitizing returns null when the received value is invalid but
+	// we don't have support for the Customizer's setting validation.
+	function test_sanitize_without_validation() {
+		$this->field->validate = array( 'is_numeric' );
+
+		$context = new Fieldmanager_Context_Customizer( 'Foo', $this->field );
+		$this->register();
+
+		$this->assertNull( $context->sanitize_callback( rand_str(), $this->manager->get_setting( $this->field->name ) ) );
+	}
+
+	// Make sure sanitizing returns a WP_Error when the received value is
+	// invalid and we have support for the Customizer's setting validation.
+	function test_sanitize_with_validation() {
+		$this->field->validate = array( 'is_numeric' );
+
+		$context = new Fieldmanager_Context_Customizer( 'Foo', $this->field );
+		$this->register();
+
+		$context->use_customize_validiation = true;
+		$this->assertWPError( $context->sanitize_callback( rand_str(), $this->manager->get_setting( $this->field->name ) ) );
+	}
+
+	// Make sure validating doesn't fail a valid value.
+	function test_validate_valid_value() {
+		$this->field->validate = array( 'is_numeric' );
+
+		$context = new Fieldmanager_Context_Customizer( 'Foo', $this->field );
+		$this->register();
+
+		$validity = rand_str();
+		$this->assertSame( $validity, $context->validate_callback( $validity, rand( 1, 100 ), $this->manager->get_setting( $this->field->name ) ) );
+	}
+
+	// Make sure validating fails an invalid value.
+	function test_validate_invalid_value() {
+		$this->field->validate = array( 'is_numeric' );
+
+		$context = new Fieldmanager_Context_Customizer( 'Foo', $this->field );
+		$this->register();
+
+		$this->assertWPError( $context->validate_callback( rand_str(), rand_str(), $this->manager->get_setting( $this->field->name ) ) );
+	}
 
 	// Make sure the context's rendering method calls the field rendering method.
 	function test_render_field() {

From c8b87f73253a1363a174f4c4f8c0fabfcc12abf2 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Fri, 3 Jun 2016 00:31:54 -0400
Subject: [PATCH 53/76] Clean up comments

---
 php/class-fieldmanager-customize-setting.php          | 2 +-
 php/context/class-fieldmanager-context-customizer.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/php/class-fieldmanager-customize-setting.php b/php/class-fieldmanager-customize-setting.php
index b8e285f8a9..535137cc2a 100644
--- a/php/class-fieldmanager-customize-setting.php
+++ b/php/class-fieldmanager-customize-setting.php
@@ -26,7 +26,7 @@ public function __construct( $manager, $id, $args = array() ) {
 			if ( isset( $args['context'] ) && ( $args['context'] instanceof Fieldmanager_Context ) ) {
 				$this->context = $args['context'];
 
-				// Set the default without checking isset() to support null values.
+				// Set the default without checking isset() (as in WP_Customize_Setting) to support null values.
 				$this->default = $this->context->fm->default_value;
 
 				// Sanitize and validate with the context.
diff --git a/php/context/class-fieldmanager-context-customizer.php b/php/context/class-fieldmanager-context-customizer.php
index e60f8aa9fa..db9015e354 100644
--- a/php/context/class-fieldmanager-context-customizer.php
+++ b/php/context/class-fieldmanager-context-customizer.php
@@ -166,7 +166,7 @@ protected function register_section( $manager ) {
 	 * Add a Customizer setting for this field.
 	 *
 	 * By default, Fieldmanager registers one setting for a group and sends all
-	 * of the group data from the Customizer, rather than individual settings
+	 * of the group values from the Customizer, rather than individual settings
 	 * for its children, so sanitization and validation routines can access the
 	 * full group data.
 	 *

From e27ddda84dff09e39b3b7b33ef7d65122b562fb4 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Fri, 1 Jul 2016 20:22:03 -0400
Subject: [PATCH 54/76] Revert "Support core's Customizer setting validation"

Because core's Customizer validation infrastructure might change until
the next stable release, hold off on using it. See, e.g.,
https://core.trac.wordpress.org/ticket/37247.

This reverts commit 85f1efb47d7c27f389cb7f08f49193ed0759fd5d.
---
 js/fieldmanager-customize.js                  | 15 +++++
 php/class-fieldmanager-customize-setting.php  | 12 ++--
 php/class-fieldmanager-field.php              |  7 ++-
 .../class-fieldmanager-context-customizer.php | 60 +------------------
 .../test-fieldmanager-context-customizer.php  | 56 +----------------
 5 files changed, 28 insertions(+), 122 deletions(-)

diff --git a/js/fieldmanager-customize.js b/js/fieldmanager-customize.js
index 3d6a5cfe55..d5b4edbaee 100644
--- a/js/fieldmanager-customize.js
+++ b/js/fieldmanager-customize.js
@@ -237,6 +237,20 @@
 		$document.on( 'fm_colorpicker_update', onFmColorpickerUpdate );
 	};
 
+	/**
+	 * Fires when a Customizer request to save values fails.
+	 *
+	 * @return {Mixed} response The response from the server.
+	 */
+	var error = function( response ) {
+		if ( ! response.fieldmanager ) {
+			return;
+		}
+
+		// There isn't yet an official way to signal a save failure, but this mimics the AYS prompt.
+		alert( response.fieldmanager );
+	};
+
 	/**
 	 * Fires when a Customizer Section is added.
 	 *
@@ -251,6 +265,7 @@
 
 	if ( typeof api !== 'undefined' ) {
 		api.bind( 'ready', ready );
+		api.bind( 'error', error );
 		api.section.bind( 'add', addSection );
 	}
 })( jQuery, wp.customize, _, fm );
diff --git a/php/class-fieldmanager-customize-setting.php b/php/class-fieldmanager-customize-setting.php
index 535137cc2a..3fc3246c5f 100644
--- a/php/class-fieldmanager-customize-setting.php
+++ b/php/class-fieldmanager-customize-setting.php
@@ -29,9 +29,8 @@ public function __construct( $manager, $id, $args = array() ) {
 				// Set the default without checking isset() (as in WP_Customize_Setting) to support null values.
 				$this->default = $this->context->fm->default_value;
 
-				// Sanitize and validate with the context.
+				// Sanitize with the context.
 				$this->sanitize_callback = array( $this->context, 'sanitize_callback' );
-				$this->validate_callback = array( $this->context, 'validate_callback' );
 
 				// Use the Fieldmanager submenu default.
 				$this->type = 'option';
@@ -54,13 +53,12 @@ public function __construct( $manager, $id, $args = array() ) {
 		 */
 		public function _preview_filter( $original ) {
 			/*
-			 * Don't continue to the parent _preview_filter() while sanitizing
-			 * or validating. _preview_filter() eventually calls
-			 * sanitize_callback() and validate_callback(), which calls the
-			 * hooks to those methods in Fieldmanager_Context_Customizer, which
+			 * Don't continue to the parent _preview_filter() while sanitizing.
+			 * _preview_filter() eventually calls sanitize_callback(), which
+			 * calls Fieldmanager_Context_Customizer::sanitize_callback(), which
 			 * calls WP_Customize_Setting::value(), which ends up back here.
 			 */
-			if ( doing_filter( "customize_sanitize_{$this->id}" ) || doing_filter( "customize_validate_{$this->id}" ) ) {
+			if ( doing_filter( "customize_sanitize_{$this->id}" ) ) {
 				return $original;
 			}
 
diff --git a/php/class-fieldmanager-field.php b/php/class-fieldmanager-field.php
index 6af81f01d6..bb9a9b9014 100644
--- a/php/class-fieldmanager-field.php
+++ b/php/class-fieldmanager-field.php
@@ -1125,10 +1125,15 @@ public function _unauthorized_access( $debug_message = '' ) {
 	 * @return void
 	 */
 	protected function _failed_validation( $debug_message = '' ) {
-		if ( self::$debug || is_customize_preview() ) {
+		if ( self::$debug ) {
 			throw new FM_Validation_Exception( $debug_message );
 		}
 
+		if ( is_customize_preview() ) {
+			// There isn't yet a way to catch this error during a preview refresh.
+			wp_send_json_error( array( 'fieldmanager' => sprintf( __( 'Error: %s. Please check your settings and save again.', 'fieldmanager' ), $debug_message ) ) );
+		}
+
 		wp_die( esc_html(
 			$debug_message . "\n\n" .
 			__( "You may be able to use your browser's back button to resolve this error.", 'fieldmanager' )
diff --git a/php/context/class-fieldmanager-context-customizer.php b/php/context/class-fieldmanager-context-customizer.php
index db9015e354..63151b7d95 100644
--- a/php/context/class-fieldmanager-context-customizer.php
+++ b/php/context/class-fieldmanager-context-customizer.php
@@ -21,16 +21,6 @@ class Fieldmanager_Context_Customizer extends Fieldmanager_Context {
 	 */
 	protected $args;
 
-	/**
-	 * Whether to support the Customizer's setting validation model.
-	 *
-	 * By default, the context will automatically set this to true when it
-	 * detects that the Customizer's validation model is available.
-	 *
-	 * @var bool
-	 */
-	public $use_customize_validiation = false;
-
 	/**
 	 * Constructor.
 	 *
@@ -47,7 +37,6 @@ public function __construct( $args, $fm ) {
 		$this->fm = $fm;
 
 		add_action( 'customize_register', array( $this, 'customize_register' ), 100 );
-		add_action( 'customize_save_validation_before', array( $this, 'customize_save_validation_before' ) );
 	}
 
 	/**
@@ -59,16 +48,6 @@ public function customize_register( $manager ) {
 		$this->register( $manager );
 	}
 
-	/**
-	 * Fires before save validation happens.
-	 *
-	 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
-	 */
-	public function customize_save_validation_before( $manager ) {
-		// This hook facilitates "just-in-time" support for validation.
-		$this->use_customize_validiation = true;
-	}
-
 	/**
 	 * Exposes Fieldmanager_Context::render_field() for the control to call.
 	 *
@@ -83,7 +62,7 @@ public function render_field( $args = array() ) {
 	 *
 	 * @param mixed $value Setting value.
 	 * @param WP_Customize_Setting $setting WP_Customize_Setting instance.
-	 * @return mixed The sanitized setting value; WP_Error on invalidity.
+	 * @return mixed The sanitized setting value.
 	 */
 	public function sanitize_callback( $value, $setting ) {
 		if ( is_string( $value ) && 0 === strpos( $value, $this->fm->name ) ) {
@@ -96,47 +75,10 @@ public function sanitize_callback( $value, $setting ) {
 			$value = $value[ $this->fm->name ];
 		}
 
-		$validity = $this->validate_callback( new WP_Error(), $value, $setting );
-
-		if ( $validity->get_error_message() ) {
-			if ( $this->use_customize_validiation ) {
-				return $validity;
-			}
-
-			/*
-			 * Returning null is a backwards-compatible way to reject a value
-			 * from WP_Customize_Setting::sanitize(). See
-			 * https://core.trac.wordpress.org/ticket/34893.
-			 */
-			return null;
-		}
-
 		// Return the value after Fieldmanager takes a shot at it.
 		return stripslashes_deep( $this->prepare_data( $setting->value(), $value ) );
 	}
 
-	/**
-	 * Filter the validity of a Customize setting value.
-	 *
-	 * @param WP_Error $validity Object with error messages, if any.
-	 * @param mixed $value Setting value.
-	 * @param WP_Customize_Setting $setting WP_Customize_Setting instance.
-	 * @return WP_Error Object with an added message from Fieldmanager, if any.
-	 */
-	public function validate_callback( $validity, $value, $setting ) {
-		try {
-			$this->prepare_data( $setting->value(), $value );
-		} catch ( FM_Validation_Exception $e ) {
-			if ( ! is_wp_error( $validity ) ) {
-				$validity = new WP_Error();
-			}
-
-			$validity->add( 'fieldmanager', $e->getMessage() );
-		}
-
-		return $validity;
-	}
-
 	/**
 	 * Create a Customizer section, setting, and control for this field.
 	 *
diff --git a/tests/php/test-fieldmanager-context-customizer.php b/tests/php/test-fieldmanager-context-customizer.php
index 5ad8ddba11..0e4275eb85 100644
--- a/tests/php/test-fieldmanager-context-customizer.php
+++ b/tests/php/test-fieldmanager-context-customizer.php
@@ -3,24 +3,13 @@
  * @group customize
  */
 class Test_Fieldmanager_Context_Customizer extends Fieldmanager_Customizer_UnitTestCase {
-	protected $field, $old_debug;
+	protected $field;
 
 	function setUp() {
 		parent::setUp();
-
-		// Since we can't simulate is_customize_preview(), make sure debug mode
-		// is on so FM_Validation_Exceptions are thrown.
-		$this->old_debug = Fieldmanager_Field::$debug;
-		Fieldmanager_Field::$debug = true;
-
 		$this->field = new Fieldmanager_TextField( array( 'name' => 'foo' ) );
 	}
 
-	function tearDown() {
-		parent::tearDown();
-		Fieldmanager_Field::$debug = $this->old_debug;
-	}
-
 	// Test that no section is created if no section args are passed.
 	function test_no_section() {
 		new Fieldmanager_Context_Customizer( array(), $this->field );
@@ -325,49 +314,6 @@ function test_sanitize_stripslashes() {
 		$this->assertSame( 'Foo "bar" baz', $context->sanitize_callback( 'Foo \"bar\" baz', $this->manager->get_setting( $this->field->name ) ) );
 	}
 
-	// Make sure sanitizing returns null when the received value is invalid but
-	// we don't have support for the Customizer's setting validation.
-	function test_sanitize_without_validation() {
-		$this->field->validate = array( 'is_numeric' );
-
-		$context = new Fieldmanager_Context_Customizer( 'Foo', $this->field );
-		$this->register();
-
-		$this->assertNull( $context->sanitize_callback( rand_str(), $this->manager->get_setting( $this->field->name ) ) );
-	}
-
-	// Make sure sanitizing returns a WP_Error when the received value is
-	// invalid and we have support for the Customizer's setting validation.
-	function test_sanitize_with_validation() {
-		$this->field->validate = array( 'is_numeric' );
-
-		$context = new Fieldmanager_Context_Customizer( 'Foo', $this->field );
-		$this->register();
-
-		$context->use_customize_validiation = true;
-		$this->assertWPError( $context->sanitize_callback( rand_str(), $this->manager->get_setting( $this->field->name ) ) );
-	}
-
-	// Make sure validating doesn't fail a valid value.
-	function test_validate_valid_value() {
-		$this->field->validate = array( 'is_numeric' );
-
-		$context = new Fieldmanager_Context_Customizer( 'Foo', $this->field );
-		$this->register();
-
-		$validity = rand_str();
-		$this->assertSame( $validity, $context->validate_callback( $validity, rand( 1, 100 ), $this->manager->get_setting( $this->field->name ) ) );
-	}
-
-	// Make sure validating fails an invalid value.
-	function test_validate_invalid_value() {
-		$this->field->validate = array( 'is_numeric' );
-
-		$context = new Fieldmanager_Context_Customizer( 'Foo', $this->field );
-		$this->register();
-
-		$this->assertWPError( $context->validate_callback( rand_str(), rand_str(), $this->manager->get_setting( $this->field->name ) ) );
-	}
 
 	// Make sure the context's rendering method calls the field rendering method.
 	function test_render_field() {

From c6ec5b3072d752b4891784bf8e8c9236c4943393 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Fri, 19 Aug 2016 11:15:22 -0400
Subject: [PATCH 55/76] Restore Customizer calculated context

---
 fieldmanager.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/fieldmanager.php b/fieldmanager.php
index 115c90d5e0..c659e1271f 100644
--- a/fieldmanager.php
+++ b/fieldmanager.php
@@ -258,8 +258,12 @@ function fm_get_context( $recalculate = false ) {
 function fm_calculate_context() {
 	$calculated_context = array( null, null );
 
+	if ( is_customize_preview() ) {
+		$calculated_context = array( 'customizer', null );
+	}
+
 	// Safe to use at any point in the load process, and better than URL matching.
-	if ( is_admin() ) {
+	if ( empty( $calculated_context[0] ) && is_admin() ) {
 		$script = substr( $_SERVER['PHP_SELF'], strrpos( $_SERVER['PHP_SELF'], '/' ) + 1 );
 
 		/*
@@ -292,7 +296,12 @@ function fm_calculate_context() {
 			}
 		}
 
+		if ( 'customize.php' === $script || is_customize_preview() ) {
+			$calculated_context = array( 'customizer', null );
+		}
+
 		if ( empty( $calculated_context[0] ) ) {
+
 			switch ( $script ) {
 				// Context = "post".
 				case 'post.php':

From 7cacfaa44da36a4b0e05487ff2078d73c98abe95 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Fri, 19 Aug 2016 11:51:19 -0400
Subject: [PATCH 56/76] Restore 'customize_controls_enqueue_scripts' hook

---
 php/util/class-fieldmanager-util-assets.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/php/util/class-fieldmanager-util-assets.php b/php/util/class-fieldmanager-util-assets.php
index 905b144700..772b16772b 100644
--- a/php/util/class-fieldmanager-util-assets.php
+++ b/php/util/class-fieldmanager-util-assets.php
@@ -143,6 +143,12 @@ protected function hook_enqueue() {
 		if ( ! $this->hooked ) {
 			add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_assets' ) );
 			add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_assets' ) );
+			/*
+			 * Use a later priority because 'customize_controls_enqueue_scripts'
+			 * will, by default, be firing at the default priority when
+			 * Fieldmanager_Customize_Control::enqueue() adds scripts.
+			 */
+			add_action( 'customize_controls_enqueue_scripts', array( $this, 'enqueue_assets' ), 20 );
 			$this->hooked = true;
 		}
 	}

From 59ad758da06c71a018ea8c3f87108b9300085fcb Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Fri, 19 Aug 2016 11:51:52 -0400
Subject: [PATCH 57/76] Update `init_display_if()` on control section expansion

---
 js/fieldmanager.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/js/fieldmanager.js b/js/fieldmanager.js
index cbb4186352..11a19b4bab 100644
--- a/js/fieldmanager.js
+++ b/js/fieldmanager.js
@@ -265,11 +265,12 @@ $( document ).ready( function () {
 
 	init_label_macros();
 	init_sortable();
-	fm.init_display_if();
 
 	$( document ).on( 'fm_activate_tab fm_customizer_control_section_expanded', init_sortable );
 	$( document ).on( 'fm_customizer_control_section_expanded', init_label_macros );
-	$( document ).on( 'fm_customizer_control_section_expanded', fm.init_display_if );
+	$( document ).on( 'fm_customizer_control_section_expanded', function () {
+		$( '.display-if' ).each( fm.init_display_if );
+	} );
 } );
 
 } )( jQuery );

From 1ed2d45f8f3544b1fc095ebcff7495b4c18d957d Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Fri, 19 Aug 2016 11:55:05 -0400
Subject: [PATCH 58/76] Test JS against 4.6 and 4.5

---
 Gruntfile.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 366c4bf51c..ac51803fe2 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -24,8 +24,8 @@ module.exports = function( grunt ) {
 				options: {
 					urls: [
 						'http://localhost:8000/tests/js/index.html',
-						'http://localhost:8000/tests/js/index.html?wp=4.4',
-						'http://localhost:8000/tests/js/index.html?wp=4.3'
+						'http://localhost:8000/tests/js/index.html?wp=4.6',
+						'http://localhost:8000/tests/js/index.html?wp=4.5'
 					]
 				}
 			},

From 2637ef23dfb52c2e21be18c9ae24a39b96e89461 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Fri, 19 Aug 2016 12:08:37 -0400
Subject: [PATCH 59/76] Remove outdated script-loading preparation

---
 tests/php/test-fieldmanager-script-loading.php | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/tests/php/test-fieldmanager-script-loading.php b/tests/php/test-fieldmanager-script-loading.php
index 4387a57399..a221fb493c 100644
--- a/tests/php/test-fieldmanager-script-loading.php
+++ b/tests/php/test-fieldmanager-script-loading.php
@@ -12,20 +12,6 @@ public function setUp() {
 		require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
 		$customize_manager = new WP_Customize_Manager();
 
-		// Spoof is_admin() for fm_add_script().
-		$this->screen = get_current_screen();
-		set_current_screen( 'dashboard-user' );
-
-		// Re-init scripts. @see Tests_Dependencies_Scripts.
-		$this->old_wp_scripts = isset( $GLOBALS['wp_scripts'] ) ? $GLOBALS['wp_scripts'] : null;
-		remove_action( 'wp_default_scripts', 'wp_default_scripts' );
-		$GLOBALS['wp_scripts'] = new WP_Scripts();
-		$GLOBALS['wp_scripts']->default_version = get_bloginfo( 'version' );
-
-		// Some fields will only register a script once, so hack around that.
-		Fieldmanager_Media::$has_registered_media = false;
-		Fieldmanager_Colorpicker::$has_registered_statics = false;
-
 		// Instantiate field classes that register scripts.
 		new Fieldmanager_Autocomplete( 'Test', array( 'datasource' => new Fieldmanager_Datasource_Post ) );
 		new Fieldmanager_Datepicker( 'Test' );
@@ -36,7 +22,6 @@ public function setUp() {
 		new Fieldmanager_Select( 'Test' );
 		new Fieldmanager_RichTextArea( 'Test' );
 		new Fieldmanager_Colorpicker( 'Test' );
-
 		$control = new Fieldmanager_Customize_Control(
 			$customize_manager,
 			'test',

From e44f9035fcb9e4ac89f0fa1fd089adc5e5b616a9 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Fri, 19 Aug 2016 15:44:00 -0400
Subject: [PATCH 60/76] Improve 'X' placement after FM 1.0 CSS refresh

---
 css/fieldmanager.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/css/fieldmanager.css b/css/fieldmanager.css
index 9ea8df0e36..b425e97e4d 100644
--- a/css/fieldmanager.css
+++ b/css/fieldmanager.css
@@ -393,5 +393,5 @@ a.fm-delete:hover {
 
 .wp-customizer .fmjs-removable .fmjs-drag-icon + .fmjs-removable-element {
 	/* Nudge for the Customizer. */
-	max-width: 90%;
+	max-width: 80%;
 }

From fb490c00ac0ba3751be3c52b4d64e01c06f3adf8 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sat, 10 Sep 2016 17:47:21 -0400
Subject: [PATCH 61/76] Revert custom `alert()` on validation failure

---
 js/fieldmanager-customize.js     | 15 ---------------
 php/class-fieldmanager-field.php | 15 +++++----------
 2 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/js/fieldmanager-customize.js b/js/fieldmanager-customize.js
index d5b4edbaee..3d6a5cfe55 100644
--- a/js/fieldmanager-customize.js
+++ b/js/fieldmanager-customize.js
@@ -237,20 +237,6 @@
 		$document.on( 'fm_colorpicker_update', onFmColorpickerUpdate );
 	};
 
-	/**
-	 * Fires when a Customizer request to save values fails.
-	 *
-	 * @return {Mixed} response The response from the server.
-	 */
-	var error = function( response ) {
-		if ( ! response.fieldmanager ) {
-			return;
-		}
-
-		// There isn't yet an official way to signal a save failure, but this mimics the AYS prompt.
-		alert( response.fieldmanager );
-	};
-
 	/**
 	 * Fires when a Customizer Section is added.
 	 *
@@ -265,7 +251,6 @@
 
 	if ( typeof api !== 'undefined' ) {
 		api.bind( 'ready', ready );
-		api.bind( 'error', error );
 		api.section.bind( 'add', addSection );
 	}
 })( jQuery, wp.customize, _, fm );
diff --git a/php/class-fieldmanager-field.php b/php/class-fieldmanager-field.php
index c242bfbac2..6a77e6a7de 100644
--- a/php/class-fieldmanager-field.php
+++ b/php/class-fieldmanager-field.php
@@ -1149,17 +1149,12 @@ public function _unauthorized_access( $debug_message = '' ) {
 	protected function _failed_validation( $debug_message = '' ) {
 		if ( self::$debug ) {
 			throw new FM_Validation_Exception( $debug_message );
+		} else {
+			wp_die( esc_html(
+				$debug_message . "\n\n" .
+				__( "You may be able to use your browser's back button to resolve this error.", 'fieldmanager' )
+			) );
 		}
-
-		if ( is_customize_preview() ) {
-			// There isn't yet a way to catch this error during a preview refresh.
-			wp_send_json_error( array( 'fieldmanager' => sprintf( __( 'Error: %s. Please check your settings and save again.', 'fieldmanager' ), $debug_message ) ) );
-		}
-
-		wp_die( esc_html(
-			$debug_message . "\n\n" .
-			__( "You may be able to use your browser's back button to resolve this error.", 'fieldmanager' )
-		) );
 	}
 
 	/**

From a34aee25c818fb57643f2497ac92f16bf1d0c540 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sat, 10 Sep 2016 18:06:01 -0400
Subject: [PATCH 62/76] Add default method for a Setting's $validate_callback

---
 .../class-fieldmanager-context-customizer.php | 26 +++++++++++++++++++
 .../test-fieldmanager-context-customizer.php  | 20 ++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/php/context/class-fieldmanager-context-customizer.php b/php/context/class-fieldmanager-context-customizer.php
index 63151b7d95..e51cb7d14d 100644
--- a/php/context/class-fieldmanager-context-customizer.php
+++ b/php/context/class-fieldmanager-context-customizer.php
@@ -57,6 +57,32 @@ public function render_field( $args = array() ) {
 		return parent::render_field( $args );
 	}
 
+	/**
+	 * Filter the validity of a Customize setting value.
+	 *
+	 * Amend the `$validity` object via its `WP_Error::add()` method.
+	 *
+	 * @see WP_Customize_Setting::validate().
+	 *
+	 * @param WP_Error $validity Filtered from `true` to `WP_Error` when invalid.
+	 * @param mixed $value Value of the setting.
+	 * @param WP_Customize_Setting $this WP_Customize_Setting instance.
+	 */
+	public function validate_callback( $validity, $value, $setting ) {
+		try {
+			$this->prepare_data( $setting->value(), $value );
+		} catch ( FM_Validation_Exception $e ) {
+			if ( ! is_wp_error( $validity ) ) {
+				$validity = new WP_Error();
+			}
+
+			// @see https://core.trac.wordpress.org/ticket/37890 for the use of array( $value ).
+			$validity->add( 'fieldmanager', $e->getMessage(), array( $value ) );
+		}
+
+		return $validity;
+	}
+
 	/**
 	 * Filter a Customize setting value in un-slashed form.
 	 *
diff --git a/tests/php/test-fieldmanager-context-customizer.php b/tests/php/test-fieldmanager-context-customizer.php
index 0e4275eb85..03c52ed0e1 100644
--- a/tests/php/test-fieldmanager-context-customizer.php
+++ b/tests/php/test-fieldmanager-context-customizer.php
@@ -314,6 +314,26 @@ function test_sanitize_stripslashes() {
 		$this->assertSame( 'Foo "bar" baz', $context->sanitize_callback( 'Foo \"bar\" baz', $this->manager->get_setting( $this->field->name ) ) );
 	}
 
+	// Make sure validating passes a valid value.
+	function test_validate_valid_value() {
+		$this->field->validate = array( 'is_numeric' );
+
+		$context = new Fieldmanager_Context_Customizer( 'Foo', $this->field );
+		$this->register();
+
+		$validity = rand_str();
+		$this->assertSame( $validity, $context->validate_callback( $validity, rand( 1, 100 ), $this->manager->get_setting( $this->field->name ) ) );
+	}
+
+	// Make sure validating fails an invalid value.
+	function test_validate_invalid_value() {
+		$this->field->validate = array( 'is_numeric' );
+
+		$context = new Fieldmanager_Context_Customizer( 'Foo', $this->field );
+		$this->register();
+
+		$this->assertWPError( $context->validate_callback( rand_str(), rand_str(), $this->manager->get_setting( $this->field->name ) ) );
+	}
 
 	// Make sure the context's rendering method calls the field rendering method.
 	function test_render_field() {

From 669eec644eb1938fcadc2e3c8c21662c426faffa Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sat, 10 Sep 2016 18:20:47 -0400
Subject: [PATCH 63/76] Rearrange validate_callback() tests to match class

---
 .../test-fieldmanager-context-customizer.php  | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/tests/php/test-fieldmanager-context-customizer.php b/tests/php/test-fieldmanager-context-customizer.php
index 03c52ed0e1..327b43bc25 100644
--- a/tests/php/test-fieldmanager-context-customizer.php
+++ b/tests/php/test-fieldmanager-context-customizer.php
@@ -144,6 +144,27 @@ function test_multiple_args() {
 		$this->assertSame( $input_attrs, $control->input_attrs );
 	}
 
+	// Make sure validating passes a valid value.
+	function test_validate_valid_value() {
+		$this->field->validate = array( 'is_numeric' );
+
+		$context = new Fieldmanager_Context_Customizer( 'Foo', $this->field );
+		$this->register();
+
+		$validity = rand_str();
+		$this->assertSame( $validity, $context->validate_callback( $validity, rand( 1, 100 ), $this->manager->get_setting( $this->field->name ) ) );
+	}
+
+	// Make sure validating fails an invalid value.
+	function test_validate_invalid_value() {
+		$this->field->validate = array( 'is_numeric' );
+
+		$context = new Fieldmanager_Context_Customizer( 'Foo', $this->field );
+		$this->register();
+
+		$this->assertWPError( $context->validate_callback( rand_str(), rand_str(), $this->manager->get_setting( $this->field->name ) ) );
+	}
+
 	/**
 	 * Test that a textfield is sanitized the same way when the value is passed
      * as a bare string and a query string.
@@ -314,27 +335,6 @@ function test_sanitize_stripslashes() {
 		$this->assertSame( 'Foo "bar" baz', $context->sanitize_callback( 'Foo \"bar\" baz', $this->manager->get_setting( $this->field->name ) ) );
 	}
 
-	// Make sure validating passes a valid value.
-	function test_validate_valid_value() {
-		$this->field->validate = array( 'is_numeric' );
-
-		$context = new Fieldmanager_Context_Customizer( 'Foo', $this->field );
-		$this->register();
-
-		$validity = rand_str();
-		$this->assertSame( $validity, $context->validate_callback( $validity, rand( 1, 100 ), $this->manager->get_setting( $this->field->name ) ) );
-	}
-
-	// Make sure validating fails an invalid value.
-	function test_validate_invalid_value() {
-		$this->field->validate = array( 'is_numeric' );
-
-		$context = new Fieldmanager_Context_Customizer( 'Foo', $this->field );
-		$this->register();
-
-		$this->assertWPError( $context->validate_callback( rand_str(), rand_str(), $this->manager->get_setting( $this->field->name ) ) );
-	}
-
 	// Make sure the context's rendering method calls the field rendering method.
 	function test_render_field() {
 		$field = $this->getMockBuilder( 'Fieldmanager_Textfield' )->disableOriginalConstructor()->getMock();

From f0be9ff94c81e8ea1f7be5f8fd150a855e1ed051 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sat, 17 Sep 2016 22:55:12 -0400
Subject: [PATCH 64/76] Use context's validation callback with FM settings

Adds a check for the `'customize_validation_'` filter in
`Fieldmanager_Customize_Setting::_preview_filter()` to avoid an infinite
loop, much like the check for the `'customize_sanitize_'` filter.
---
 php/class-fieldmanager-customize-setting.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/php/class-fieldmanager-customize-setting.php b/php/class-fieldmanager-customize-setting.php
index 3fc3246c5f..896cd7694d 100644
--- a/php/class-fieldmanager-customize-setting.php
+++ b/php/class-fieldmanager-customize-setting.php
@@ -29,7 +29,8 @@ public function __construct( $manager, $id, $args = array() ) {
 				// Set the default without checking isset() (as in WP_Customize_Setting) to support null values.
 				$this->default = $this->context->fm->default_value;
 
-				// Sanitize with the context.
+				// Validate and sanitize with the context.
+				$this->validate_callback = array( $this->context, 'validate_callback' );
 				$this->sanitize_callback = array( $this->context, 'sanitize_callback' );
 
 				// Use the Fieldmanager submenu default.
@@ -53,12 +54,13 @@ public function __construct( $manager, $id, $args = array() ) {
 		 */
 		public function _preview_filter( $original ) {
 			/*
-			 * Don't continue to the parent _preview_filter() while sanitizing.
-			 * _preview_filter() eventually calls sanitize_callback(), which
-			 * calls Fieldmanager_Context_Customizer::sanitize_callback(), which
+			 * Don't continue to the parent _preview_filter() while sanitizing
+			 * or validating. _preview_filter() eventually calls
+			 * sanitize_callback() and validate_callback(), which calls the
+			 * hooks to those methods in Fieldmanager_Context_Customizer, which
 			 * calls WP_Customize_Setting::value(), which ends up back here.
 			 */
-			if ( doing_filter( "customize_sanitize_{$this->id}" ) ) {
+			if ( doing_filter( "customize_sanitize_{$this->id}" ) || doing_filter( "customize_validate_{$this->id}" ) ) {
 				return $original;
 			}
 

From 93b50618c19ec0dc73f4c4a96b347e9ac8eb376e Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sat, 17 Sep 2016 23:00:17 -0400
Subject: [PATCH 65/76] Parse query-string values before validating

Moves the logic for converting the `jQuery.serialize()`'d string of a
field value into the array or string to save.
---
 .../class-fieldmanager-context-customizer.php | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/php/context/class-fieldmanager-context-customizer.php b/php/context/class-fieldmanager-context-customizer.php
index e51cb7d14d..1a1d01ae30 100644
--- a/php/context/class-fieldmanager-context-customizer.php
+++ b/php/context/class-fieldmanager-context-customizer.php
@@ -69,6 +69,8 @@ public function render_field( $args = array() ) {
 	 * @param WP_Customize_Setting $this WP_Customize_Setting instance.
 	 */
 	public function validate_callback( $validity, $value, $setting ) {
+		$value = $this->parse_field_query_string( $value );
+
 		try {
 			$this->prepare_data( $setting->value(), $value );
 		} catch ( FM_Validation_Exception $e ) {
@@ -91,10 +93,7 @@ public function validate_callback( $validity, $value, $setting ) {
 	 * @return mixed The sanitized setting value.
 	 */
 	public function sanitize_callback( $value, $setting ) {
-		if ( is_string( $value ) && 0 === strpos( $value, $this->fm->name ) ) {
-			// Parse the query-string version of our values into an array.
-			parse_str( $value, $value );
-		}
+		$value = $this->parse_field_query_string( $value );
 
 		if ( is_array( $value ) && array_key_exists( $this->fm->name, $value ) ) {
 			// If the option name is the top-level array key, get just the value.
@@ -169,4 +168,24 @@ protected function register_control( $manager ) {
 			) )
 		);
 	}
+
+	/**
+	 * Decode form element values for this field from a URL-encoded string.
+	 *
+	 * @param  mixed $value Value to parse.
+	 * @return mixed
+	 */
+	protected function parse_field_query_string( $value ) {
+		if ( is_string( $value ) && 0 === strpos( $value, $this->fm->name ) ) {
+			// Parse the query-string version of our values into an array.
+			parse_str( $value, $value );
+		}
+
+		if ( is_array( $value ) && array_key_exists( $this->fm->name, $value ) ) {
+			// If the option name is the top-level array key, get just the value.
+			$value = $value[ $this->fm->name ];
+		}
+
+		return $value;
+	}
 }

From de1ab07e301708465e5a7aaf2ecfdd35bd5526ca Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sat, 17 Sep 2016 23:03:45 -0400
Subject: [PATCH 66/76] Reject invalid values from sanitize callback

When the context can use the Customizer's validation framework, and when
the default callbacks are added to FM Customizer settings, any invalid
submissions will have already been rejected before sanitizing occurs.

But, we still need to check for invalid values in the sanitizing
callback just in case, for example, the method is called on its own or
the validation callback is not hooked to the Customizer setting. If a
field value is invalid, we need to reject the update with a
Customizer-approved `WP_Error` or `null` before Fieldmanager's native
validation routines (such as throwing an Exception or calling
`wp_die()`) kick in.
---
 .../class-fieldmanager-context-customizer.php    | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/php/context/class-fieldmanager-context-customizer.php b/php/context/class-fieldmanager-context-customizer.php
index 1a1d01ae30..1e92a122a7 100644
--- a/php/context/class-fieldmanager-context-customizer.php
+++ b/php/context/class-fieldmanager-context-customizer.php
@@ -95,9 +95,19 @@ public function validate_callback( $validity, $value, $setting ) {
 	public function sanitize_callback( $value, $setting ) {
 		$value = $this->parse_field_query_string( $value );
 
-		if ( is_array( $value ) && array_key_exists( $this->fm->name, $value ) ) {
-			// If the option name is the top-level array key, get just the value.
-			$value = $value[ $this->fm->name ];
+		// Run the validation routine in case we need to reject the value.
+		$validity = $this->validate_callback( true, $value, $setting );
+
+		if ( is_wp_error( $validity ) ) {
+			/*
+			 * The 'customize_save_validation_before' action was added with the
+			 * Customizer's validation framework. If it fires, assume it's safe
+			 * to return a WP_Error to indicate invalid values. Returning null
+			 * is a backwards-compatible way to reject a value from
+			 * WP_Customize_Setting::sanitize(). See
+			 * https://core.trac.wordpress.org/ticket/34893.
+			 */
+			return ( did_action( 'customize_save_validation_before' ) ) ? $validity : null;
 		}
 
 		// Return the value after Fieldmanager takes a shot at it.

From 451935b30db950f5bd62e30e5971e5e6941bd6a7 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sat, 17 Sep 2016 23:18:31 -0400
Subject: [PATCH 67/76] Test catching invalid values while sanitizing

Adds a data provider, `data_field_debug()`, for testing the same method
while `Fieldmanager_Field::debug` is `true` or `false`, because the
`$debug` property affects Fieldmanager's response to invalid
values. These tests currently fail when `$debug` is false.
---
 .../test-fieldmanager-context-customizer.php  | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/tests/php/test-fieldmanager-context-customizer.php b/tests/php/test-fieldmanager-context-customizer.php
index 327b43bc25..bbe12227fb 100644
--- a/tests/php/test-fieldmanager-context-customizer.php
+++ b/tests/php/test-fieldmanager-context-customizer.php
@@ -4,10 +4,26 @@
  */
 class Test_Fieldmanager_Context_Customizer extends Fieldmanager_Customizer_UnitTestCase {
 	protected $field;
+	protected $old_debug;
 
 	function setUp() {
 		parent::setUp();
 		$this->field = new Fieldmanager_TextField( array( 'name' => 'foo' ) );
+		$this->old_debug = Fieldmanager_Field::$debug;
+	}
+
+	function tearDown() {
+		Fieldmanager_Field::$debug = $this->old_debug;
+	}
+
+	/**
+	 * Data provider for running a test with field debugging on and off.
+	 */
+	function data_field_debug() {
+		return array(
+			array( true ),
+			array( false ),
+		);
 	}
 
 	// Test that no section is created if no section args are passed.
@@ -335,6 +351,37 @@ function test_sanitize_stripslashes() {
 		$this->assertSame( 'Foo "bar" baz', $context->sanitize_callback( 'Foo \"bar\" baz', $this->manager->get_setting( $this->field->name ) ) );
 	}
 
+	/**
+	 * Make sure sanitizing returns a WP_Error on an invalid value.
+	 *
+	 * @dataProvider data_field_debug
+	 */
+	function test_sanitize_invalid_value( $debug ) {
+		Fieldmanager_Field::$debug = $debug;
+		$this->field->validate = array( 'is_numeric' );
+
+		$context = new Fieldmanager_Context_Customizer( 'Foo', $this->field );
+		$this->register();
+		do_action( 'customize_save_validation_before' );
+
+		$this->assertWPError( $context->sanitize_callback( rand_str(), $this->manager->get_setting( $this->field->name ) ) );
+	}
+
+	/**
+	 * Make sure sanitizing returns null on an invalid value where we don't have Customizer validation.
+	 *
+	 * @dataProvider data_field_debug
+	 */
+	function test_sanitize_invalid_value_backcompat( $debug ) {
+		Fieldmanager_Field::$debug = $debug;
+		$this->field->validate = array( 'is_numeric' );
+
+		$context = new Fieldmanager_Context_Customizer( 'Foo', $this->field );
+		$this->register();
+
+		$this->assertNull( $context->sanitize_callback( rand_str(), $this->manager->get_setting( $this->field->name ) ) );
+	}
+
 	// Make sure the context's rendering method calls the field rendering method.
 	function test_render_field() {
 		$field = $this->getMockBuilder( 'Fieldmanager_Textfield' )->disableOriginalConstructor()->getMock();

From 9a94d30f93f39aefffa707532d90f41785e1f400 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sat, 17 Sep 2016 23:25:41 -0400
Subject: [PATCH 68/76] Test validating value submitted as a query string

---
 .../test-fieldmanager-context-customizer.php  | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/tests/php/test-fieldmanager-context-customizer.php b/tests/php/test-fieldmanager-context-customizer.php
index bbe12227fb..945851025c 100644
--- a/tests/php/test-fieldmanager-context-customizer.php
+++ b/tests/php/test-fieldmanager-context-customizer.php
@@ -160,25 +160,45 @@ function test_multiple_args() {
 		$this->assertSame( $input_attrs, $control->input_attrs );
 	}
 
-	// Make sure validating passes a valid value.
+	// Make sure validating passes a valid value passed as a bare string and as a query string.
 	function test_validate_valid_value() {
 		$this->field->validate = array( 'is_numeric' );
 
 		$context = new Fieldmanager_Context_Customizer( 'Foo', $this->field );
 		$this->register();
+		$setting = $this->manager->get_setting( $this->field->name );
 
 		$validity = rand_str();
-		$this->assertSame( $validity, $context->validate_callback( $validity, rand( 1, 100 ), $this->manager->get_setting( $this->field->name ) ) );
+		$this->assertSame( $validity, $context->validate_callback( $validity, rand( 1, 100 ), $setting ) );
+		$this->assertSame( $validity, $context->validate_callback( $validity, "{$this->field->name}=" . rand( 1, 100 ), $setting ) );
 	}
 
-	// Make sure validating fails an invalid value.
-	function test_validate_invalid_value() {
+	/**
+	 * Make sure validating fails an invalid value (with both FM debug settings)
+	 * passed as a bare string and as a query string.
+	 *
+	 * @dataProvider data_field_debug
+	 */
+	function test_validate_invalid_value( $debug ) {
+		Fieldmanager_Field::$debug = $debug;
+
 		$this->field->validate = array( 'is_numeric' );
 
 		$context = new Fieldmanager_Context_Customizer( 'Foo', $this->field );
 		$this->register();
+		$setting = $this->manager->get_setting( $this->field->name );
+
+		$message = ( $debug ) ? __( 'Failed with $debug = true', 'fieldmanager' ) : __( 'Failed with $debug = false', 'fieldmanager' );
 
-		$this->assertWPError( $context->validate_callback( rand_str(), rand_str(), $this->manager->get_setting( $this->field->name ) ) );
+		$this->assertWPError(
+			$context->validate_callback( rand_str(), rand_str(), $setting ),
+			$message
+		);
+
+		$this->assertWPError(
+			$context->validate_callback( rand_str(), "{$this->field->name}=" . rand_str(), $setting ),
+			$message
+		);
 	}
 
 	/**

From 804f8e190d6550bc53184b8219b98313d76ec98f Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sat, 24 Sep 2016 23:57:53 -0400
Subject: [PATCH 69/76] Handle calls to `wp_die()` on validation error

Adds a handler to the Customizer context that intercepts `wp_die()` and
throws it as an exception which the default validation callback can catch.
---
 .../class-fieldmanager-context-customizer.php | 75 +++++++++++++++++++
 .../test-fieldmanager-context-customizer.php  |  9 ++-
 2 files changed, 81 insertions(+), 3 deletions(-)

diff --git a/php/context/class-fieldmanager-context-customizer.php b/php/context/class-fieldmanager-context-customizer.php
index 1e92a122a7..35fcb4085f 100644
--- a/php/context/class-fieldmanager-context-customizer.php
+++ b/php/context/class-fieldmanager-context-customizer.php
@@ -71,6 +71,9 @@ public function render_field( $args = array() ) {
 	public function validate_callback( $validity, $value, $setting ) {
 		$value = $this->parse_field_query_string( $value );
 
+		// Start assuming calls to wp_die() signal Fieldmanager validation errors.
+		$this->start_handling_wp_die();
+
 		try {
 			$this->prepare_data( $setting->value(), $value );
 		} catch ( FM_Validation_Exception $e ) {
@@ -82,6 +85,9 @@ public function validate_callback( $validity, $value, $setting ) {
 			$validity->add( 'fieldmanager', $e->getMessage(), array( $value ) );
 		}
 
+		// Resume normal wp_die() handling.
+		$this->stop_handling_wp_die();
+
 		return $validity;
 	}
 
@@ -114,6 +120,51 @@ public function sanitize_callback( $value, $setting ) {
 		return stripslashes_deep( $this->prepare_data( $setting->value(), $value ) );
 	}
 
+	/**
+	 * Filter the callback for killing WordPress execution.
+	 *
+	 * Fieldmanager calls wp_die() to signal some errors, but messages passed to
+	 * wp_die() are not automatically displayed in the Customizer. This filter
+	 * should return a callback that throws the message passed to wp_die() as an
+	 * exception, which the default validation callback in this context can
+	 * catch and convert to a WP_Error.
+	 *
+	 * @return callable Callback function name.
+	 */
+	public function on_filter_wp_die_handler() {
+		/*
+		 * Side effect: We don't want execution to stop, so remove all other
+		 * filters because they presumably assume the opposite. See, e.g.,
+		 * WP_Customize_Manager::remove_preview_signature().
+		 */
+		remove_all_filters( current_filter() );
+
+		// Return the new callback.
+		return array( $this, 'wp_die_handler' );
+	}
+
+	/**
+	 * Handle wp_die() by throwing an exception instead of killing execution.
+	 *
+	 * @throws FM_Validation_Exception With the message passed to wp_die().
+	 *
+	 * @param string|WP_Error $message Error message or WP_Error object.
+	 * @param string          $title   Optional. Error title.
+	 * @param string|array    $args    Optional. Arguments to control behavior.
+	 */
+	public function wp_die_handler( $message, $title, $args ) {
+		if ( is_wp_error( $message ) ) {
+			$message = $message->get_error_message();
+		}
+
+		/*
+		 * Modify $message in two ways that follow from our assumption that
+		 * Fieldmanager generated this wp_die(): Remove the blank lines and
+		 * "back button" message, and unescape HTML.
+		 */
+		throw new FM_Validation_Exception( preg_replace( '#\n\n.*?$#', '', htmlspecialchars_decode( $message, ENT_QUOTES ) ) );
+	}
+
 	/**
 	 * Create a Customizer section, setting, and control for this field.
 	 *
@@ -198,4 +249,28 @@ protected function parse_field_query_string( $value ) {
 
 		return $value;
 	}
+
+	/**
+	 * Add filters that convert calls to wp_die() into exceptions.
+	 *
+	 * @return bool Whether the filters were added.
+	 */
+	protected function start_handling_wp_die() {
+		return (
+			add_filter( 'wp_die_ajax_handler', array( $this, 'on_filter_wp_die_handler' ), 0 )
+			&& add_filter( 'wp_die_handler', array( $this, 'on_filter_wp_die_handler' ), 0 )
+		);
+	}
+
+	/**
+	 * Remove filters that convert calls to wp_die() into exceptions.
+	 *
+	 * @return bool Whether the filters were removed.
+	 */
+	protected function stop_handling_wp_die() {
+		return (
+			remove_filter( 'wp_die_ajax_handler', array( $this, 'on_filter_wp_die_handler' ), 0 )
+			&& remove_filter( 'wp_die_handler', array( $this, 'on_filter_wp_die_handler' ), 0 )
+		);
+	}
 }
diff --git a/tests/php/test-fieldmanager-context-customizer.php b/tests/php/test-fieldmanager-context-customizer.php
index 945851025c..4648f9c526 100644
--- a/tests/php/test-fieldmanager-context-customizer.php
+++ b/tests/php/test-fieldmanager-context-customizer.php
@@ -204,8 +204,6 @@ function test_validate_invalid_value( $debug ) {
 	/**
 	 * Test that a textfield is sanitized the same way when the value is passed
      * as a bare string and a query string.
-	 *
-	 * @expectedException FM_Exception
 	 */
 	function test_sanitize_string() {
 		$value = rand_str();
@@ -216,7 +214,7 @@ function test_sanitize_string() {
 
 		$this->assertSame( $value, $context->sanitize_callback( $value, $setting ) );
 		$this->assertSame( $value, $context->sanitize_callback( "{$this->field->name}={$value}", $setting ) );
-		$context->sanitize_callback( array( 'Not', 'a', 'string' ), $setting );
+		$this->assertNull( $context->sanitize_callback( array( 'Not', 'a', 'string' ), $setting ) );
 	}
 
 	/**
@@ -377,6 +375,8 @@ function test_sanitize_stripslashes() {
 	 * @dataProvider data_field_debug
 	 */
 	function test_sanitize_invalid_value( $debug ) {
+		global $wp_actions;
+
 		Fieldmanager_Field::$debug = $debug;
 		$this->field->validate = array( 'is_numeric' );
 
@@ -385,6 +385,9 @@ function test_sanitize_invalid_value( $debug ) {
 		do_action( 'customize_save_validation_before' );
 
 		$this->assertWPError( $context->sanitize_callback( rand_str(), $this->manager->get_setting( $this->field->name ) ) );
+
+		// "Revert" to not affect future did_action() checks.
+		$wp_actions['customize_save_validation_before']--;
 	}
 
 	/**

From 38e68841b28a6162e0ef7becb687b32f872030c3 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sun, 25 Sep 2016 00:00:44 -0400
Subject: [PATCH 70/76] Remove outdated test

---
 .../test-fieldmanager-customize-control.php   | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/tests/php/test-fieldmanager-customize-control.php b/tests/php/test-fieldmanager-customize-control.php
index d72cc014e8..99ef9c7121 100644
--- a/tests/php/test-fieldmanager-customize-control.php
+++ b/tests/php/test-fieldmanager-customize-control.php
@@ -49,27 +49,6 @@ function test_register_scripts() {
 		$this->assertSame( 1, ( count( $after ) - count( $before ) ) );
 	}
 
-	/**
-	 * Tests for closures hooked with fm_add_script().
-	 */
-	function test_fm_add_scripts() {
-		global $wp_filter;
-
-		// Spoof is_admin().
-		$screen = get_current_screen();
-		set_current_screen( 'dashboard-user' );
-
-		$before = $wp_filter['customize_controls_enqueue_scripts'];
-
-		$control = new Fieldmanager_Customize_Control( $this->manager, rand_str(), array( 'context' => $this->mock_context ) );
-		$control->enqueue();
-
-		$after = $wp_filter['customize_controls_enqueue_scripts'];
-		$this->assertSame( 1, ( count( $after ) - count( $before ) ) );
-
-		$GLOBALS['current_screen'] = $screen;
-	}
-
 	function test_render_content() {
 		$name        = rand_str();
 		$value       = rand_str();

From f154b9f7bb6200873825db7c1a7f0905e1623bb3 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sun, 25 Sep 2016 01:21:28 -0400
Subject: [PATCH 71/76] Update
 `Fieldmanager_RichTextArea::customize_controls_print_footer_scripts()`
 priority

This method was previously hooked to an earlier priority than when it
was actually called, which is invalid under `WP_Hook`. See
https://core.trac.wordpress.org/ticket/38011.
---
 php/class-fieldmanager-richtextarea.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/php/class-fieldmanager-richtextarea.php b/php/class-fieldmanager-richtextarea.php
index a8dd2878eb..b04be3ba79 100644
--- a/php/class-fieldmanager-richtextarea.php
+++ b/php/class-fieldmanager-richtextarea.php
@@ -265,7 +265,8 @@ protected function add_editor_filters() {
 		remove_filter( 'the_editor_content', 'wp_richedit_pre' );
 
 		if ( ! self::$has_registered_customize_scripts ) {
-			add_action( 'customize_controls_print_footer_scripts', array( $this, 'customize_controls_print_footer_scripts' ), 50 );
+			// This action must fire after settings are exported in WP_Customize_Manager::customize_pane_settings().
+			add_action( 'customize_controls_print_footer_scripts', array( $this, 'customize_controls_print_footer_scripts' ), 1001 );
 			self::$has_registered_customize_scripts = true;
 		}
 	}

From 1de94b36cfa4f65d48f14135d6ea45388d85c833 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sun, 25 Sep 2016 01:35:31 -0400
Subject: [PATCH 72/76] Fix docs standards violations

---
 php/class-fieldmanager-customize-control.php  | 10 +++++--
 php/class-fieldmanager-customize-setting.php  | 10 +++++--
 .../class-fieldmanager-context-customizer.php | 28 +++++++++----------
 php/util/class-fieldmanager-util-assets.php   |  1 +
 4 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/php/class-fieldmanager-customize-control.php b/php/class-fieldmanager-customize-control.php
index 4f169460a8..6f5b0cb83a 100644
--- a/php/class-fieldmanager-customize-control.php
+++ b/php/class-fieldmanager-customize-control.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * Class file for Fieldmanager_Customize_Control.
+ *
+ * @package Fieldmanager_Customize
  */
 
 if ( class_exists( 'WP_Customize_Control' ) ) :
@@ -25,9 +27,11 @@ class Fieldmanager_Customize_Control extends WP_Customize_Control {
 		/**
 		 * Constructor.
 		 *
-		 * @param WP_Customize_Manager $manager
-		 * @param string $id Control ID.
-		 * @param array $args Control arguments, including $context.
+		 * @throws FM_Developer_Exception When no context is included.
+		 *
+		 * @param WP_Customize_Manager $manager WP_Customize_Manager instance.
+		 * @param string               $id      Control ID.
+		 * @param array                $args    Control arguments, including $context.
 		 */
 		public function __construct( $manager, $id, $args = array() ) {
 			parent::__construct( $manager, $id, $args );
diff --git a/php/class-fieldmanager-customize-setting.php b/php/class-fieldmanager-customize-setting.php
index 896cd7694d..0d33690a66 100644
--- a/php/class-fieldmanager-customize-setting.php
+++ b/php/class-fieldmanager-customize-setting.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * Class file for Fieldmanager_Customize_Setting.
+ *
+ * @package Fieldmanager_Customize
  */
 
 if ( class_exists( 'WP_Customize_Setting' ) ) :
@@ -18,9 +20,11 @@ class Fieldmanager_Customize_Setting extends WP_Customize_Setting {
 		/**
 		 * Constructor.
 		 *
-		 * @param WP_Customize_Manager $manager
-		 * @param string $id Setting ID.
-		 * @param array $args Setting arguments, including $context.
+		 * @throws FM_Developer_Exception When no context is included.
+		 *
+		 * @param WP_Customize_Manager $manager WP_Customize_Manager instance.
+		 * @param string               $id      Setting ID.
+		 * @param array                $args    Setting arguments, including $context.
 		 */
 		public function __construct( $manager, $id, $args = array() ) {
 			if ( isset( $args['context'] ) && ( $args['context'] instanceof Fieldmanager_Context ) ) {
diff --git a/php/context/class-fieldmanager-context-customizer.php b/php/context/class-fieldmanager-context-customizer.php
index 35fcb4085f..2f3f8fbe10 100644
--- a/php/context/class-fieldmanager-context-customizer.php
+++ b/php/context/class-fieldmanager-context-customizer.php
@@ -10,9 +10,9 @@
  */
 class Fieldmanager_Context_Customizer extends Fieldmanager_Context {
 	/**
-	 * @var array $args {
-	 *     Arguments to construct Customizer objects.
+	 * Arguments to construct Customizer objects.
 	 *
+	 * @var array $args {
 	 *     @type array|bool $section_args Arguments for constructing a {@see WP_Customize_Section},
 	 *           or false to not create one for this context.
 	 *     @type array $setting_args Arguments for constructing a {@see Fieldmanager_Customize_Setting}.
@@ -24,8 +24,8 @@ class Fieldmanager_Context_Customizer extends Fieldmanager_Context {
 	/**
 	 * Constructor.
 	 *
-	 * @param array $args Customizer object arguments. @see Fieldmanager_Context_Customizer::args.
-	 * @param Fieldmanager_Field $fm Field object to add to the Customizer.
+	 * @param array              $args Customizer object arguments. @see Fieldmanager_Context_Customizer::args.
+	 * @param Fieldmanager_Field $fm   Field object to add to the Customizer.
 	 */
 	public function __construct( $args, $fm ) {
 		$this->args = wp_parse_args( $args, array(
@@ -64,9 +64,9 @@ public function render_field( $args = array() ) {
 	 *
 	 * @see WP_Customize_Setting::validate().
 	 *
-	 * @param WP_Error $validity Filtered from `true` to `WP_Error` when invalid.
-	 * @param mixed $value Value of the setting.
-	 * @param WP_Customize_Setting $this WP_Customize_Setting instance.
+	 * @param WP_Error             $validity Filtered from `true` to `WP_Error` when invalid.
+	 * @param mixed                $value    Value of the setting.
+	 * @param WP_Customize_Setting $setting  WP_Customize_Setting instance.
 	 */
 	public function validate_callback( $validity, $value, $setting ) {
 		$value = $this->parse_field_query_string( $value );
@@ -94,9 +94,9 @@ public function validate_callback( $validity, $value, $setting ) {
 	/**
 	 * Filter a Customize setting value in un-slashed form.
 	 *
-	 * @param mixed $value Setting value.
-	 * @param WP_Customize_Setting $setting WP_Customize_Setting instance.
-	 * @return mixed The sanitized setting value.
+	 * @param  mixed                $value   Setting value.
+	 * @param  WP_Customize_Setting $setting WP_Customize_Setting instance.
+	 * @return mixed                         The sanitized setting value.
 	 */
 	public function sanitize_callback( $value, $setting ) {
 		$value = $this->parse_field_query_string( $value );
@@ -179,8 +179,8 @@ protected function register( $manager ) {
 	/**
 	 * Add a Customizer section for this field.
 	 *
-	 * @param WP_Customize_Manager $manager
-	 * @return WP_Customize_Section|void Section object, where supported, if created.
+	 * @param  WP_Customize_Manager $manager WP_Customize_Manager instance.
+	 * @return WP_Customize_Section|void     Section object, where supported, if created.
 	 */
 	protected function register_section( $manager ) {
 		if ( false === $this->args['section_args'] ) {
@@ -198,7 +198,7 @@ protected function register_section( $manager ) {
 	 * for its children, so sanitization and validation routines can access the
 	 * full group data.
 	 *
-	 * @param WP_Customize_Manager $manager
+	 * @param  WP_Customize_Manager $manager WP_Customize_Manager instance.
 	 * @return Fieldmanager_Customize_Setting Setting object, where supported.
 	 */
 	protected function register_setting( $manager ) {
@@ -215,7 +215,7 @@ protected function register_setting( $manager ) {
 	/**
 	 * Add a Customizer control for this field.
 	 *
-	 * @param WP_Customize_Manager $manager
+	 * @param  WP_Customize_Manager $manager WP_Customize_Manager instance.
 	 * @return Fieldmanager_Customize_Control Control object, where supported.
 	 */
 	protected function register_control( $manager ) {
diff --git a/php/util/class-fieldmanager-util-assets.php b/php/util/class-fieldmanager-util-assets.php
index e910c735c1..071fb24718 100644
--- a/php/util/class-fieldmanager-util-assets.php
+++ b/php/util/class-fieldmanager-util-assets.php
@@ -148,6 +148,7 @@ protected function hook_enqueue() {
 		if ( ! $this->hooked ) {
 			add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_assets' ) );
 			add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_assets' ) );
+
 			/*
 			 * Use a later priority because 'customize_controls_enqueue_scripts'
 			 * will, by default, be firing at the default priority when

From afca52338c23f507bf7b6805ea1f6975898248eb Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Sun, 25 Sep 2016 01:57:54 -0400
Subject: [PATCH 73/76] Handle all exceptions in `validate_callback()`

---
 .../class-fieldmanager-context-customizer.php        | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/php/context/class-fieldmanager-context-customizer.php b/php/context/class-fieldmanager-context-customizer.php
index 2f3f8fbe10..2860cc684c 100644
--- a/php/context/class-fieldmanager-context-customizer.php
+++ b/php/context/class-fieldmanager-context-customizer.php
@@ -76,13 +76,21 @@ public function validate_callback( $validity, $value, $setting ) {
 
 		try {
 			$this->prepare_data( $setting->value(), $value );
-		} catch ( FM_Validation_Exception $e ) {
+		} catch ( Exception $e ) {
 			if ( ! is_wp_error( $validity ) ) {
 				$validity = new WP_Error();
 			}
 
+			/*
+			 * Handle all exceptions Fieldmanager might generate, but use the
+			 * message from only validation exceptions, which are more
+			 * user-friendly. For others, use the generic message from
+			 * WP_Customize_Setting::validate().
+			 */
+			$message = ( $e instanceof FM_Validation_Exception ) ? $e->getMessage() : __( 'Invalid value.', 'fieldmanager' );
+
 			// @see https://core.trac.wordpress.org/ticket/37890 for the use of array( $value ).
-			$validity->add( 'fieldmanager', $e->getMessage(), array( $value ) );
+			$validity->add( 'fieldmanager', $message, array( $value ) );
 		}
 
 		// Resume normal wp_die() handling.

From 32c61b6679869350bad7a670517d03d5d38d9d5d Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Mon, 10 Oct 2016 15:19:45 -0400
Subject: [PATCH 74/76] Standardize on 'Customize' for objects

'Customizer' for the thing itself.
---
 fieldmanager.php                              |  4 +--
 js/fieldmanager-customize.js                  |  2 +-
 js/fieldmanager-datepicker.js                 |  4 +--
 js/fieldmanager.js                            |  6 ++--
 php/class-fieldmanager-customize-control.php  |  4 +--
 php/class-fieldmanager-customize-setting.php  |  6 ++--
 php/class-fieldmanager-field.php              |  4 +--
 ... class-fieldmanager-context-customize.php} |  6 ++--
 tests/php/bootstrap.php                       |  2 +-
 ...> test-fieldmanager-context-customize.php} | 36 +++++++++----------
 .../test-fieldmanager-customize-control.php   |  6 ++--
 .../test-fieldmanager-customize-setting.php   |  4 +--
 .../php/test-fieldmanager-script-loading.php  |  2 +-
 ...s-fieldmanager-customize-unittestcase.php} |  2 +-
 14 files changed, 44 insertions(+), 44 deletions(-)
 rename php/context/{class-fieldmanager-context-customizer.php => class-fieldmanager-context-customize.php} (98%)
 rename tests/php/{test-fieldmanager-context-customizer.php => test-fieldmanager-context-customize.php} (92%)
 rename tests/php/testcase/{class-fieldmanager-customizer-unittestcase.php => class-fieldmanager-customize-unittestcase.php} (79%)

diff --git a/fieldmanager.php b/fieldmanager.php
index c659e1271f..8bfb028267 100644
--- a/fieldmanager.php
+++ b/fieldmanager.php
@@ -259,7 +259,7 @@ function fm_calculate_context() {
 	$calculated_context = array( null, null );
 
 	if ( is_customize_preview() ) {
-		$calculated_context = array( 'customizer', null );
+		$calculated_context = array( 'customize', null );
 	}
 
 	// Safe to use at any point in the load process, and better than URL matching.
@@ -297,7 +297,7 @@ function fm_calculate_context() {
 		}
 
 		if ( 'customize.php' === $script || is_customize_preview() ) {
-			$calculated_context = array( 'customizer', null );
+			$calculated_context = array( 'customize', null );
 		}
 
 		if ( empty( $calculated_context[0] ) ) {
diff --git a/js/fieldmanager-customize.js b/js/fieldmanager-customize.js
index 3d6a5cfe55..4624a7b454 100644
--- a/js/fieldmanager-customize.js
+++ b/js/fieldmanager-customize.js
@@ -195,7 +195,7 @@
 		 * We bind to sections whether or not they have FM controls in case a
 		 * control is added dynamically.
 		 */
-		$( document ).trigger( 'fm_customizer_control_section_expanded' );
+		$( document ).trigger( 'fm_customize_control_section_expanded' );
 
 		if ( fm.richtextarea ) {
 			fm.richtextarea.add_rte_to_visible_textareas();
diff --git a/js/fieldmanager-datepicker.js b/js/fieldmanager-datepicker.js
index 21fc482d1f..24cacd2666 100644
--- a/js/fieldmanager-datepicker.js
+++ b/js/fieldmanager-datepicker.js
@@ -12,7 +12,7 @@
 
 	$( document ).ready( fm.datepicker.add_datepicker );
 	$( document ).on(
-		'fm_collapsible_toggle fm_added_element fm_displayif_toggle fm_activate_tab fm_customizer_control_section_expanded',
+		'fm_collapsible_toggle fm_added_element fm_displayif_toggle fm_activate_tab fm_customize_control_section_expanded',
 		fm.datepicker.add_datepicker
 	);
-} ) ( jQuery );
\ No newline at end of file
+} ) ( jQuery );
diff --git a/js/fieldmanager.js b/js/fieldmanager.js
index 762de95b45..ade2dafdde 100644
--- a/js/fieldmanager.js
+++ b/js/fieldmanager.js
@@ -272,9 +272,9 @@ $( document ).ready( function () {
 	init_label_macros();
 	init_sortable();
 
-	$( document ).on( 'fm_activate_tab fm_customizer_control_section_expanded', init_sortable );
-	$( document ).on( 'fm_customizer_control_section_expanded', init_label_macros );
-	$( document ).on( 'fm_customizer_control_section_expanded', function () {
+	$( document ).on( 'fm_activate_tab fm_customize_control_section_expanded', init_sortable );
+	$( document ).on( 'fm_customize_control_section_expanded', init_label_macros );
+	$( document ).on( 'fm_customize_control_section_expanded', function () {
 		$( '.display-if' ).each( fm.init_display_if );
 	} );
 } );
diff --git a/php/class-fieldmanager-customize-control.php b/php/class-fieldmanager-customize-control.php
index 6f5b0cb83a..d3d66a4f93 100644
--- a/php/class-fieldmanager-customize-control.php
+++ b/php/class-fieldmanager-customize-control.php
@@ -36,9 +36,9 @@ class Fieldmanager_Customize_Control extends WP_Customize_Control {
 		public function __construct( $manager, $id, $args = array() ) {
 			parent::__construct( $manager, $id, $args );
 
-			if ( ! ( $this->context instanceof Fieldmanager_Context_Customizer ) && FM_DEBUG ) {
+			if ( ! ( $this->context instanceof Fieldmanager_Context_Customize ) && FM_DEBUG ) {
 				throw new FM_Developer_Exception(
-					__( 'Fieldmanager_Customize_Control requires a Fieldmanager_Context_Customizer', 'fieldmanager' )
+					__( 'Fieldmanager_Customize_Control requires a Fieldmanager_Context_Customize', 'fieldmanager' )
 				);
 			}
 		}
diff --git a/php/class-fieldmanager-customize-setting.php b/php/class-fieldmanager-customize-setting.php
index 0d33690a66..cc9772a81d 100644
--- a/php/class-fieldmanager-customize-setting.php
+++ b/php/class-fieldmanager-customize-setting.php
@@ -13,7 +13,7 @@ class Fieldmanager_Customize_Setting extends WP_Customize_Setting {
 		/**
 		 * The Fieldmanager context controlling this setting.
 		 *
-		 * @var Fieldmanager_Context_Customizer
+		 * @var Fieldmanager_Context_Customize
 		 */
 		protected $context;
 
@@ -40,7 +40,7 @@ public function __construct( $manager, $id, $args = array() ) {
 				// Use the Fieldmanager submenu default.
 				$this->type = 'option';
 			} elseif ( FM_DEBUG ) {
-				throw new FM_Developer_Exception( __( 'Fieldmanager_Customize_Setting requires a Fieldmanager_Context_Customizer', 'fieldmanager' ) );
+				throw new FM_Developer_Exception( __( 'Fieldmanager_Customize_Setting requires a Fieldmanager_Context_Customize', 'fieldmanager' ) );
 			}
 
 			parent::__construct( $manager, $id, $args );
@@ -61,7 +61,7 @@ public function _preview_filter( $original ) {
 			 * Don't continue to the parent _preview_filter() while sanitizing
 			 * or validating. _preview_filter() eventually calls
 			 * sanitize_callback() and validate_callback(), which calls the
-			 * hooks to those methods in Fieldmanager_Context_Customizer, which
+			 * hooks to those methods in Fieldmanager_Context_Customize, which
 			 * calls WP_Customize_Setting::value(), which ends up back here.
 			 */
 			if ( doing_filter( "customize_sanitize_{$this->id}" ) || doing_filter( "customize_validate_{$this->id}" ) ) {
diff --git a/php/class-fieldmanager-field.php b/php/class-fieldmanager-field.php
index 6a77e6a7de..0abad30a98 100644
--- a/php/class-fieldmanager-field.php
+++ b/php/class-fieldmanager-field.php
@@ -1106,7 +1106,7 @@ public function activate_submenu_page() {
 	/**
 	 * Add this field to the Customizer.
 	 *
-	 * @param string|array $args @see Fieldmanager_Context_Customizer. Pass a
+	 * @param string|array $args @see Fieldmanager_Context_Customize. Pass a
 	 *     string to add a Customizer section for this field that uses the
 	 *     string for its title and context defaults for the remaining
 	 *     arguments. Or, pass a full array of arguments for the context.
@@ -1118,7 +1118,7 @@ public function add_to_customizer( $args = array() ) {
 			$args = array( 'section_args' => array( 'title' => $args ) );
 		}
 
-		return new Fieldmanager_Context_Customizer( $args, $this );
+		return new Fieldmanager_Context_Customize( $args, $this );
 	}
 
 	private function require_base() {
diff --git a/php/context/class-fieldmanager-context-customizer.php b/php/context/class-fieldmanager-context-customize.php
similarity index 98%
rename from php/context/class-fieldmanager-context-customizer.php
rename to php/context/class-fieldmanager-context-customize.php
index 2860cc684c..ab77bf5a78 100644
--- a/php/context/class-fieldmanager-context-customizer.php
+++ b/php/context/class-fieldmanager-context-customize.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Class file for Fieldmanager_Context_Customizer.
+ * Class file for Fieldmanager_Context_Customize.
  *
  * @package Fieldmanager_Context
  */
@@ -8,7 +8,7 @@
 /**
  * Add Fieldmanager fields to the Customizer.
  */
-class Fieldmanager_Context_Customizer extends Fieldmanager_Context {
+class Fieldmanager_Context_Customize extends Fieldmanager_Context {
 	/**
 	 * Arguments to construct Customizer objects.
 	 *
@@ -24,7 +24,7 @@ class Fieldmanager_Context_Customizer extends Fieldmanager_Context {
 	/**
 	 * Constructor.
 	 *
-	 * @param array              $args Customizer object arguments. @see Fieldmanager_Context_Customizer::args.
+	 * @param array              $args Customizer object arguments. @see Fieldmanager_Context_Customize::args.
 	 * @param Fieldmanager_Field $fm   Field object to add to the Customizer.
 	 */
 	public function __construct( $args, $fm ) {
diff --git a/tests/php/bootstrap.php b/tests/php/bootstrap.php
index 041e2408c8..851ec4c507 100644
--- a/tests/php/bootstrap.php
+++ b/tests/php/bootstrap.php
@@ -25,7 +25,7 @@ function _manually_load_plugin() {
 
 require $_tests_dir . '/includes/bootstrap.php';
 
-require dirname( __FILE__ ) . '/testcase/class-fieldmanager-customizer-unittestcase.php';
+require dirname( __FILE__ ) . '/testcase/class-fieldmanager-customize-unittestcase.php';
 
 /**
  * Is the current version of WordPress at least ... ?
diff --git a/tests/php/test-fieldmanager-context-customizer.php b/tests/php/test-fieldmanager-context-customize.php
similarity index 92%
rename from tests/php/test-fieldmanager-context-customizer.php
rename to tests/php/test-fieldmanager-context-customize.php
index 4648f9c526..9322be6393 100644
--- a/tests/php/test-fieldmanager-context-customizer.php
+++ b/tests/php/test-fieldmanager-context-customize.php
@@ -2,7 +2,7 @@
 /**
  * @group customize
  */
-class Test_Fieldmanager_Context_Customizer extends Fieldmanager_Customizer_UnitTestCase {
+class Test_Fieldmanager_Context_Customize extends Fieldmanager_Customize_UnitTestCase {
 	protected $field;
 	protected $old_debug;
 
@@ -28,13 +28,13 @@ function data_field_debug() {
 
 	// Test that no section is created if no section args are passed.
 	function test_no_section() {
-		new Fieldmanager_Context_Customizer( array(), $this->field );
+		new Fieldmanager_Context_Customize( array(), $this->field );
 		$this->assertEmpty( $this->manager->get_section( $this->field->name ) );
 	}
 
 	// Test that a section is created even with empty constructor args.
 	function test_bare_section() {
-		new Fieldmanager_Context_Customizer( array( 'section_args' => array() ), $this->field );
+		new Fieldmanager_Context_Customize( array( 'section_args' => array() ), $this->field );
 		$this->register();
 		$this->assertInstanceOf( 'WP_Customize_Section', $this->manager->get_section( $this->field->name ) );
 	}
@@ -43,7 +43,7 @@ function test_bare_section() {
 	function test_section_title() {
 		$title = rand_str();
 
-		new Fieldmanager_Context_Customizer( array( 'section_args' => array( 'title' => $title ) ), $this->field );
+		new Fieldmanager_Context_Customize( array( 'section_args' => array( 'title' => $title ) ), $this->field );
 		$this->register();
 		$this->assertSame( $title, $this->manager->get_section( $this->field->name )->title );
 	}
@@ -53,7 +53,7 @@ function test_section_args() {
 		$title = rand_str();
 		$priority = rand( 0, 100 );
 
-		new Fieldmanager_Context_Customizer( array(
+		new Fieldmanager_Context_Customize( array(
 			'section_args' => array(
 				'title' => $title,
 				'priority' => $priority,
@@ -69,7 +69,7 @@ function test_section_args() {
 
 	// Test that a setting is created even without constructor args.
 	function test_bare_setting() {
-		new Fieldmanager_Context_Customizer( 'Foo', $this->field );
+		new Fieldmanager_Context_Customize( 'Foo', $this->field );
 		$this->register();
 		$this->assertInstanceOf( 'Fieldmanager_Customize_Setting', $this->manager->get_setting( $this->field->name ) );
 	}
@@ -79,7 +79,7 @@ function test_setting_args() {
 		$capability = 'edit_thing';
 		$default = rand_str();
 
-		new Fieldmanager_Context_Customizer( array(
+		new Fieldmanager_Context_Customize( array(
 			'setting_args' => array(
 				'capability' => $capability,
 				'default' => $default
@@ -95,7 +95,7 @@ function test_setting_args() {
 
 	// Test that a control is created even without constructor args.
 	function test_bare_control() {
-		new Fieldmanager_Context_Customizer( 'Foo', $this->field );
+		new Fieldmanager_Context_Customize( 'Foo', $this->field );
 
 		$this->register();
 
@@ -110,7 +110,7 @@ function test_control_args() {
 		$label = rand_str();
 		$section = rand_str();
 
-		new Fieldmanager_Context_Customizer( array(
+		new Fieldmanager_Context_Customize( array(
 			'control_args' => array(
 				'label' => $label,
 				'section' => $section,
@@ -132,7 +132,7 @@ function test_multiple_args() {
 		$type = 'theme_mod';
 		$input_attrs = array( rand_str(), rand_str() );
 
-		new Fieldmanager_Context_Customizer( array(
+		new Fieldmanager_Context_Customize( array(
 			'section_args' => array(
 				'title' => $title,
 				'theme_supports' => $theme_supports,
@@ -164,7 +164,7 @@ function test_multiple_args() {
 	function test_validate_valid_value() {
 		$this->field->validate = array( 'is_numeric' );
 
-		$context = new Fieldmanager_Context_Customizer( 'Foo', $this->field );
+		$context = new Fieldmanager_Context_Customize( 'Foo', $this->field );
 		$this->register();
 		$setting = $this->manager->get_setting( $this->field->name );
 
@@ -184,7 +184,7 @@ function test_validate_invalid_value( $debug ) {
 
 		$this->field->validate = array( 'is_numeric' );
 
-		$context = new Fieldmanager_Context_Customizer( 'Foo', $this->field );
+		$context = new Fieldmanager_Context_Customize( 'Foo', $this->field );
 		$this->register();
 		$setting = $this->manager->get_setting( $this->field->name );
 
@@ -208,7 +208,7 @@ function test_validate_invalid_value( $debug ) {
 	function test_sanitize_string() {
 		$value = rand_str();
 
-		$context = new Fieldmanager_Context_Customizer( 'Foo', $this->field );
+		$context = new Fieldmanager_Context_Customize( 'Foo', $this->field );
 		$this->register();
 		$setting = $this->manager->get_setting( $this->field->name );
 
@@ -354,7 +354,7 @@ function test_sanitize_group() {
 			),
 		);
 
-		$context = new Fieldmanager_Context_Customizer( 'Foo', $fm );
+		$context = new Fieldmanager_Context_Customize( 'Foo', $fm );
 		$this->register();
 		$setting = $this->manager->get_setting( $fm->name );
 
@@ -364,7 +364,7 @@ function test_sanitize_group() {
 
 	// Make sure sanitizing strips slashes.
 	function test_sanitize_stripslashes() {
-		$context = new Fieldmanager_Context_Customizer( 'Foo', $this->field );
+		$context = new Fieldmanager_Context_Customize( 'Foo', $this->field );
 		$this->register();
 		$this->assertSame( 'Foo "bar" baz', $context->sanitize_callback( 'Foo \"bar\" baz', $this->manager->get_setting( $this->field->name ) ) );
 	}
@@ -380,7 +380,7 @@ function test_sanitize_invalid_value( $debug ) {
 		Fieldmanager_Field::$debug = $debug;
 		$this->field->validate = array( 'is_numeric' );
 
-		$context = new Fieldmanager_Context_Customizer( 'Foo', $this->field );
+		$context = new Fieldmanager_Context_Customize( 'Foo', $this->field );
 		$this->register();
 		do_action( 'customize_save_validation_before' );
 
@@ -399,7 +399,7 @@ function test_sanitize_invalid_value_backcompat( $debug ) {
 		Fieldmanager_Field::$debug = $debug;
 		$this->field->validate = array( 'is_numeric' );
 
-		$context = new Fieldmanager_Context_Customizer( 'Foo', $this->field );
+		$context = new Fieldmanager_Context_Customize( 'Foo', $this->field );
 		$this->register();
 
 		$this->assertNull( $context->sanitize_callback( rand_str(), $this->manager->get_setting( $this->field->name ) ) );
@@ -408,7 +408,7 @@ function test_sanitize_invalid_value_backcompat( $debug ) {
 	// Make sure the context's rendering method calls the field rendering method.
 	function test_render_field() {
 		$field = $this->getMockBuilder( 'Fieldmanager_Textfield' )->disableOriginalConstructor()->getMock();
-		$context = new Fieldmanager_Context_Customizer( 'Foo', $field );
+		$context = new Fieldmanager_Context_Customize( 'Foo', $field );
 
 		$field->expects( $this->once() )->method( 'element_markup' );
 		$context->render_field( array( 'echo' => false ) );
diff --git a/tests/php/test-fieldmanager-customize-control.php b/tests/php/test-fieldmanager-customize-control.php
index 99ef9c7121..56e02acf1c 100644
--- a/tests/php/test-fieldmanager-customize-control.php
+++ b/tests/php/test-fieldmanager-customize-control.php
@@ -2,13 +2,13 @@
 /**
  * @group customize
  */
-class Test_Fieldmanager_Customize_Control extends Fieldmanager_Customizer_UnitTestCase {
+class Test_Fieldmanager_Customize_Control extends Fieldmanager_Customize_UnitTestCase {
 	protected $mock_context;
 
 	function setUp() {
 		parent::setUp();
 
-		$this->mock_context = $this->getMockBuilder( 'Fieldmanager_Context_Customizer' )
+		$this->mock_context = $this->getMockBuilder( 'Fieldmanager_Context_Customize' )
 			->disableOriginalConstructor()
 			->getMock();
 	}
@@ -55,7 +55,7 @@ function test_render_content() {
 		$label       = rand_str();
 		$description = rand_str();
 
-		$context = new Fieldmanager_Context_Customizer( array(
+		$context = new Fieldmanager_Context_Customize( array(
 			// Bypass capability checks.
 			'section_args' => array( 'capability' => 'exist' ),
 			'setting_args' => array( 'capability' => 'exist' ),
diff --git a/tests/php/test-fieldmanager-customize-setting.php b/tests/php/test-fieldmanager-customize-setting.php
index 70152109c9..10c4ab476e 100644
--- a/tests/php/test-fieldmanager-customize-setting.php
+++ b/tests/php/test-fieldmanager-customize-setting.php
@@ -2,13 +2,13 @@
 /**
  * @group customize
  */
-class Test_Fieldmanager_Customize_Setting extends Fieldmanager_Customizer_UnitTestCase {
+class Test_Fieldmanager_Customize_Setting extends Fieldmanager_Customize_UnitTestCase {
 	protected $field, $context;
 
 	function setUp() {
 		parent::setUp();
 		$this->field   = new Fieldmanager_TextField( array( 'name' => 'foo' ) );
-		$this->context = new Fieldmanager_Context_Customizer( array(), $this->field );
+		$this->context = new Fieldmanager_Context_Customize( array(), $this->field );
 	}
 
 	function test_construction() {
diff --git a/tests/php/test-fieldmanager-script-loading.php b/tests/php/test-fieldmanager-script-loading.php
index a221fb493c..fba97b0d0d 100644
--- a/tests/php/test-fieldmanager-script-loading.php
+++ b/tests/php/test-fieldmanager-script-loading.php
@@ -26,7 +26,7 @@ public function setUp() {
 			$customize_manager,
 			'test',
 			array(
-				'context' => $this->getMockBuilder( 'Fieldmanager_Context_Customizer' )
+				'context' => $this->getMockBuilder( 'Fieldmanager_Context_Customize' )
 					->disableOriginalConstructor()
 					->getMock()
 			)
diff --git a/tests/php/testcase/class-fieldmanager-customizer-unittestcase.php b/tests/php/testcase/class-fieldmanager-customize-unittestcase.php
similarity index 79%
rename from tests/php/testcase/class-fieldmanager-customizer-unittestcase.php
rename to tests/php/testcase/class-fieldmanager-customize-unittestcase.php
index b08baecc7c..cc5b55d21b 100644
--- a/tests/php/testcase/class-fieldmanager-customizer-unittestcase.php
+++ b/tests/php/testcase/class-fieldmanager-customize-unittestcase.php
@@ -1,5 +1,5 @@
 <?php
-class Fieldmanager_Customizer_UnitTestCase extends WP_UnitTestCase {
+class Fieldmanager_Customize_UnitTestCase extends WP_UnitTestCase {
 	protected $manager;
 
 	function setUp() {

From 11037a43c7c841764a347e4c3a4d23f2094f2f59 Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Tue, 11 Oct 2016 23:15:48 -0400
Subject: [PATCH 75/76] Fix `Fieldmanager_Datepicker` styles

---
 css/fieldmanager.css | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/css/fieldmanager.css b/css/fieldmanager.css
index b425e97e4d..98c57c4b4c 100644
--- a/css/fieldmanager.css
+++ b/css/fieldmanager.css
@@ -386,6 +386,21 @@ a.fm-delete:hover {
 	z-index: 500000 !important;
 }
 
+.customize-control input.fm-datepicker-popup {
+	/* Override Customizer defaults; datepickers have multiple inputs on one line. */
+	width: 100px;
+}
+
+.customize-control input.fm-datepicker-time {
+	/* Override Customizer defaults; datepickers have multiple inputs on one line. */
+	width: 30px;
+}
+
+.fm-datepicker-time-wrapper select {
+	/* Override Customizer defaults; datepickers have multiple inputs on one line. */
+	min-width: 0;
+}
+
 .wp-customizer .fmjs-removable .fmjs-drag-icon {
 	/* Nudge for the Customizer. */
 	margin-top: 7px;

From 0053c3edeba278a9fb4191ad64b2cdbdbc5a1bee Mon Sep 17 00:00:00 2001
From: David Herrera <david@alleyinteractive.com>
Date: Fri, 14 Oct 2016 01:32:43 -0400
Subject: [PATCH 76/76] Fix inconsistent check for Customize context

---
 php/class-fieldmanager-customize-setting.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/class-fieldmanager-customize-setting.php b/php/class-fieldmanager-customize-setting.php
index cc9772a81d..aa3ae5e211 100644
--- a/php/class-fieldmanager-customize-setting.php
+++ b/php/class-fieldmanager-customize-setting.php
@@ -27,7 +27,7 @@ class Fieldmanager_Customize_Setting extends WP_Customize_Setting {
 		 * @param array                $args    Setting arguments, including $context.
 		 */
 		public function __construct( $manager, $id, $args = array() ) {
-			if ( isset( $args['context'] ) && ( $args['context'] instanceof Fieldmanager_Context ) ) {
+			if ( isset( $args['context'] ) && ( $args['context'] instanceof Fieldmanager_Context_Customize ) ) {
 				$this->context = $args['context'];
 
 				// Set the default without checking isset() (as in WP_Customize_Setting) to support null values.