Merge pull request #1332 from gravityview/develop

Version 2.4

.travis.yml

@@ -2,7 +2,7 @@ language: php
 
 sudo: false
 
-dist: precise
+dist: trusty
 
 notifications:
   email:
@@ -15,21 +15,29 @@ branches:
     - develop
 
 php:
+  - 7.3
   - 7.2
   - 7.1
   - 7.0
   - 5.6
   - 5.4
   - 5.3
+  - nightly
 
 env:
   - WP_VERSION=latest WP_MULTISITE=0
   - WP_VERSION=nightly WP_MULTISITE=0
 
 matrix:
   include:
+    - php: 7.3
     - php: 5.3
       env: WP_VERSION=latest WP_MULTISITE=1
+  allow_failures:
+      - php: nightly
+
+before_install:
+  - composer config github-oauth.github.com "$GITHUB_ACCESS_TOKEN"
 
 install:
   - curl -s https://getcomposer.org/installer | php

Gruntfile.js

@@ -280,7 +280,7 @@ module.exports = function(grunt) {
 	grunt.loadNpmTasks('grunt-wp-i18n');
 
 	// Regular CSS/JS/Image Compression stuff
-	grunt.registerTask( 'default', [ 'exec:bower', 'sass', 'postcss', 'uglify', 'imagemin', 'translate', 'watch' ] );
+	grunt.registerTask( 'default', [ 'exec:bower', 'sass', 'postcss', 'uglify', 'imagemin', 'translate' ] );
 
 	// Translation stuff
 	grunt.registerTask( 'translate', [ 'exec:transifex', 'potomo', 'addtextdomain', 'makepot' ] );

assets/css/scss/admin-global.scss

@@ -47,6 +47,10 @@
 			text-overflow: ellipsis;
 		}
 	}
+	.feature-section.three-col .col {
+		flex-basis: 30%;
+		max-width: 250px;
+	}
 	.feature-section img {
 		border: 1px solid #ccc;
 		max-width: 99%; // Allow for border on the right

assets/js/field-approval.js

@@ -98,7 +98,7 @@
 					var new_status = parseInt( $( linkClickEvent.target ).attr( 'data-approved' ), 10 );
 
 					$entry_element._newStatus = new_status;
-					self.toggle_approval( $entry_element );
+					self.toggle_approval( linkClickEvent, $entry_element );
 
 					gv_select_status( showEvent.popper, new_status );
 				};
@@ -139,9 +139,9 @@
 		} );
 
 		$( self.selector ).on( 'click', function( e ) {
+			e.preventDefault();
 
 			if ( $( e.target ).hasClass( self.css_classes.loading ) ) {
-				e.preventDefault();
 				if ( self.debug ) {
 					console.log( 'add_toggle_approval_trigger', 'Cannot toggle approval while approval is pending.' );
 				}
@@ -155,12 +155,15 @@
 	 * Toggle a specific entry
 	 *
 	 * @param e The clicked entry event object
+	 * @param {jQuery} $target If passed, the clicked element passed from tippy.js
 	 * @returns {boolean}
 	 */
-	self.toggle_approval = function( e ) {
-		if ( e._newStatus ) {
-			var $link = $( e );
-			var new_status = e._newStatus;
+	self.toggle_approval = function( e, $target ) {
+		e.preventDefault();
+
+		if ( $target && $target._newStatus ) {
+			var $link = $target;
+			var new_status = $target._newStatus;
 		} else {
 			var $link = $( e.target ).is( 'span' ) ? $( e.target ).parent() : $( e.target );
 			var new_status = self.get_new_status( e, $link.attr( 'data-current-status' ) );

composer.json

@@ -1,5 +1,5 @@
 {
-  "name": "gravityview/GravityView",
+  "name": "gravityview/gravityview",
   "type": "wordpress-plugin",
   "description": "The best way to display Gravity Forms entries on your website.",
   "keywords": ["gravityview", "gravity view", "gravity forms directory", "gravity forms"],
@@ -12,7 +12,7 @@
     }
   ],
   "require": {
-    "php": ">=5.2.4",
+    "php": ">=5.3",
     "katzwebservices/standalone-phpenkoder": "dev-master"
   }
 }

future/_mocks.php

@@ -443,6 +443,7 @@ public static function freeze() {
 			'\GravityView_frontend::entry' => \GravityView_frontend::getInstance()->getEntry(),
 			'\GravityView_View::_current_entry' => \GravityView_View::getInstance()->getCurrentEntry(),
 			'\GravityView_View::fields' => \GravityView_View::getInstance()->getFields(),
+			'\GravityView_View::_current_field' => \GravityView_View::getInstance()->getCurrentField(),
 			'wp_actions[loop_start]' => empty( $wp_actions['loop_start'] ) ? 0 : $wp_actions['loop_start'],
 			'wp_query::in_the_loop' => $wp_query->in_the_loop,
 		);
@@ -616,6 +617,7 @@ public static function load( $configuration ) {
 							'form' => \GravityView_View::getInstance()->getForm(),
 							'field_type' => $value->type, /** {@since 1.6} */
 							'entry' => \GravityView_View::getInstance()->getCurrentEntry(),
+							'UID' => $value->UID,
 
 							// 'field_path' => $field_path, /** {@since 1.16} */
 							// 'value' => $value,