Merge branch 'master' into 51_repeatable_grid

Author: mboynes

.travis.yml

@@ -16,8 +16,6 @@ matrix:
       env: WP_VERSION=nightly
     - php: 5.6
       env: WP_TRAVISCI=phpcs
-  allow_failures:
-    - php: 7.0
   fast_finish: true
 
 branches:
@@ -37,6 +35,7 @@ before_script:
     fi
 
 script:
+  - find . -path ./vendor -prune -o -type "f" -iname "*.php" | xargs -L "1" php -l
   - |
     if [[ ! -z "$WP_VERSION" ]] ; then
       phpunit

js/fieldmanager-group-tabs.js

@@ -19,13 +19,33 @@ var FieldmanagerGroupTabs;
 		 */
 		bindEvents: function() {
 
-			$( '.fm-tab-bar a' ).on( 'click', $.proxy( function( e ) {
-				e.preventDefault();
-				this.selectTab( $( e.currentTarget ) );
+			$('.fm-tab-bar').each( $.proxy( function( k, el ) {
+				this.bindClickEvents( $( el ) );
 			}, this ) );
-			$( '.fm-tab-bar li' ).on( 'click', $.proxy( function( e ) {
-				e.preventDefault();
-				this.selectTab( $( e.currentTarget ).children('a') );
+			$( document ).on( 'fm_added_element', $.proxy( function( e ) {
+				var el = $( e.target );
+				if ( ! $( '.fm-tab-bar a', el ).length ) {
+					return;
+				}
+				counter = el.parent().data( 'fm-group-counter' );
+				if ( ! counter ) {
+					counter = el.siblings( '.fm-item' ).length - 1;
+				} else {
+					counter++;
+				}
+				el.parent().data( 'fm-group-counter', counter );
+				var replaceProto = function( el, attr ) {
+					el.attr( attr, el.attr( attr ).replace( '-proto-', '-' + counter + '-' ) );
+				};
+
+				// We also need to set these unique IDs, because FM doesn't do it for us.
+				$( '.fm-tab-bar a', el ).each( function() {
+					replaceProto( $( this ), 'href' );
+				});
+				$( '.wp-tabs-panel', el ).each( function() {
+					replaceProto( $( this ), 'id' );
+				});
+				this.bindClickEvents( el );
 			}, this ) );
 
 			if ( this.supportsLocalStorage() ) {
@@ -83,6 +103,20 @@ var FieldmanagerGroupTabs;
 
 		},
 
+		/**
+		 * Bind tab item click events
+		 */
+		bindClickEvents: function( el ) {
+			$( 'a', el ).on( 'click.fm-select-tab', $.proxy( function( e ) {
+				e.preventDefault();
+				this.selectTab( $( e.currentTarget ) );
+			}, this ) );
+			$( 'li', el ).on( 'click.fm-select-tab', $.proxy( function( e ) {
+				e.preventDefault();
+				this.selectTab( $( e.currentTarget ).children('a') );
+			}, this ) );
+		},
+
 		/**
 		 * Select a given tab
 		 */

js/richtext.js

@@ -48,6 +48,11 @@
 						try {
 							if ( typeof tinyMCEPreInit.qtInit[ ed_id ] !== 'undefined' ) {
 								quicktags( tinyMCEPreInit.qtInit[ ed_id ] );
+								// _buttonsInit() only needs to be called on dynamic editors
+								// quicktags() handles it for us on the first initialization
+								if ( typeof QTags !== 'undefined' && -1 !== ed_id.indexOf( '-dynamic-' ) ) {
+									QTags._buttonsInit();
+								}
 							}
 						} catch(e){};
 					}

php/class-fieldmanager-options.php

@@ -184,6 +184,21 @@ public function option_selected( $current_option, $options, $attribute ) {
 		else return '';
 	}
 
+	/**
+	 * Override presave_all to handle special cases associated with multiple options fields.
+	 * @input mixed[] $values
+	 * @return mixed[] sanitized values
+	 */
+	public function presave_all( $values, $current_values ) {
+		// Multiple select and radio fields with no values chosen are left out of
+		// the post request altogether, requiring special case handling.
+		if ( 1 !== $this->limit && '' === $values ) {
+			$values = null;
+		}
+
+		return parent::presave_all( $values, $current_values );
+	}
+
 	/**
 	 * Presave function, which handles sanitization and validation
 	 * @param mixed $value If a single field expects to manage an array, it must override presave()

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 = [];

tests/js/vendor/qunit-1.19.0.css 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;