Merge branch 'master' into release-0-7-3

wp-shortcake · Sep 12, 2017 · 3dd8cf1 · 3dd8cf1
2 parents 9829427 + cf2782b
commit 3dd8cf1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,15 +4,13 @@ language: php
 
 matrix:
   include:
-    - php: 5.2
-      env: WP_VERSION=latest WP_MULTISITE=0 WP_TRAVISCI=travis:phpunit
     - php: 5.6
       env: WP_VERSION=latest WP_MULTISITE=0 WP_TRAVISCI=travis:phpunit
-    - php: 5.6
+    - php: 7.1
       env: WP_VERSION=latest WP_MULTISITE=1 WP_TRAVISCI=travis:phpunit
     - php: 5.6
       env: WP_TRAVISCI=travis:js-tests
-    - php: 5.6
+    - php: 7.1
       env: WP_TRAVISCI=travis:php-lint
 
 cache:

diff --git a/bin/install-wp-tests.sh b/bin/install-wp-tests.sh
@@ -69,7 +69,7 @@ install_test_suite() {
 	# set up testing suite if it doesn't yet exist
 	if [ ! -d $WP_TESTS_DIR ]; then
 		# set up testing suite
-		mkdir -p $WP_TESTS_DIR
+		mkdir -p $WP_TESTS_DIR/data/themedir1
 		svn co --quiet https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/includes/ $WP_TESTS_DIR/includes
 	fi
 

diff --git a/dev.php b/dev.php
@@ -199,7 +199,7 @@ function shortcode_ui_dev_advanced_example() {
 		array(
 			'label'    => __( 'Select Tag', 'shortcode-ui-example', 'shortcode-ui' ),
 			'attr'     => 'tag',
-			'type'     => 'tag_select',
+			'type'     => 'term_select',
 			'taxonomy' => 'post_tag',
 			'multiple' => true,
 		),

diff --git a/inc/class-shortcode-ui.php b/inc/class-shortcode-ui.php
@@ -261,8 +261,8 @@ public function action_admin_enqueue_scripts( $editor_supports ) {
 		);
 
 		if ( 'select2' !== self::$select2_handle ) {
-			 wp_add_inline_script( self::$select2_handle, 'var existingSelect2 = jQuery.fn.select2 || null; if (existingSelect2) { delete jQuery.fn.select2; }', 'before' );
-			 wp_add_inline_script( self::$select2_handle, 'jQuery.fn[ shortcodeUIData.select2_handle ] = jQuery.fn.select2; if (existingSelect2) { delete jQuery.fn.select2; jQuery.fn.select2 = existingSelect2; }', 'after' );
+			wp_add_inline_script( self::$select2_handle, 'var existingSelect2 = jQuery.fn.select2 || null; if (existingSelect2) { delete jQuery.fn.select2; }', 'before' );
+			wp_add_inline_script( self::$select2_handle, 'jQuery.fn[ shortcodeUIData.select2_handle ] = jQuery.fn.select2; if (existingSelect2) { delete jQuery.fn.select2; jQuery.fn.select2 = existingSelect2; }', 'after' );
 		}
 
 		wp_register_style( self::$select2_handle,