Completed
Push — develop ( 9d72f1...846913 )
by Zack
25s queued 11s
created
includes/admin/class-gravityview-admin-view-item.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -196,7 +196,7 @@
 block discarded – undo
196 196
 
197 197
 		$parent_label = '';
198 198
 
199
-        if ( ! empty( $this->item['parent'] ) ) {
199
+		if ( ! empty( $this->item['parent'] ) ) {
200 200
 			$parent_label = ' <small>(' . esc_attr( $this->item['parent']['label'] ) . ')</small>';
201 201
 		}
202 202
 
Please login to merge, or discard this patch.
includes/class-gravityview-compatibility.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -240,7 +240,7 @@
 block discarded – undo
240 240
 			self::$notices['wp_version'] = array(
241 241
 				'class' => 'error',
242 242
 				'message' => sprintf( __( "%sGravityView requires WordPress %s or newer.%s \n\nYou're using Version %s. Please upgrade your WordPress installation.", 'gravityview' ), '<h3>', GV_MIN_WP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">' . $wp_version . '</span>' ),
243
-			    'cap' => 'update_core',
243
+				'cap' => 'update_core',
244 244
 				'dismiss' => 'wp_version',
245 245
 			);
246 246
 
Please login to merge, or discard this patch.
includes/class-admin-views.php 1 patch
Indentation   +79 added lines, -79 removed lines patch added patch discarded remove patch
@@ -62,28 +62,28 @@  discard block
 block discarded – undo
62 62
 	}
63 63
 
64 64
 	/**
65
-     * When on the Add/Edit View screen, suggest most popular articles related to that
66
-     *
65
+	 * When on the Add/Edit View screen, suggest most popular articles related to that
66
+	 *
67 67
 	 * @param array $localization_data Data to be passed to the Support Port JS
68 68
 	 *
69 69
 	 * @return array
70 70
 	 */
71 71
 	function suggest_support_articles( $localization_data = array() ) {
72 72
 
73
-	    if( ! gravityview()->request->is_view() ) {
74
-	        return $localization_data;
75
-        }
73
+		if( ! gravityview()->request->is_view() ) {
74
+			return $localization_data;
75
+		}
76 76
 
77 77
 		$localization_data['suggest'] = array(
78
-            '57ef23539033602e61d4a560',
79
-            '54c67bb9e4b0512429885513',
80
-            '54c67bb9e4b0512429885512',
81
-            '54c67bbbe4b07997ea3f3f6b',
82
-            '54d1a33ae4b086c0c0964ce9',
83
-            '57ef253c9033602e61d4a563',
84
-            '552355bfe4b0221aadf2572b',
85
-            '54c67bcde4b051242988553e',
86
-        );
78
+			'57ef23539033602e61d4a560',
79
+			'54c67bb9e4b0512429885513',
80
+			'54c67bb9e4b0512429885512',
81
+			'54c67bbbe4b07997ea3f3f6b',
82
+			'54d1a33ae4b086c0c0964ce9',
83
+			'57ef253c9033602e61d4a563',
84
+			'552355bfe4b0221aadf2572b',
85
+			'54c67bcde4b051242988553e',
86
+		);
87 87
 
88 88
 		return $localization_data;
89 89
 	}
@@ -229,11 +229,11 @@  discard block
 block discarded – undo
229 229
 
230 230
 		if( 'form_list' === GFForms::get_page() ) {
231 231
 			$priority = 790;
232
-        }
232
+		}
233 233
 
234 234
 		if( empty( $connected_views ) ) {
235 235
 
236
-		    $menu_items['gravityview'] = array(
236
+			$menu_items['gravityview'] = array(
237 237
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
238 238
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
239 239
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -264,14 +264,14 @@  discard block
 block discarded – undo
264 264
 		// If there were no items added, then let's create the parent menu
265 265
 		if( $sub_menu_items ) {
266 266
 
267
-		    $sub_menu_items[] = array(
268
-			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
269
-                'link_class' => 'gv-create-view',
270
-			    'icon' => '<i>&nbsp;+&nbsp;</i>',
271
-			    'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
272
-			    'url'   => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
273
-			    'capabilities'   => array( 'edit_gravityviews' ),
274
-            );
267
+			$sub_menu_items[] = array(
268
+				'label' => esc_attr__( 'Create a View', 'gravityview' ),
269
+				'link_class' => 'gv-create-view',
270
+				'icon' => '<i>&nbsp;+&nbsp;</i>',
271
+				'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
272
+				'url'   => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
273
+				'capabilities'   => array( 'edit_gravityviews' ),
274
+			);
275 275
 
276 276
 
277 277
 			/**
@@ -681,16 +681,16 @@  discard block
 block discarded – undo
681 681
 	/**
682 682
 	 * Render html for displaying available fields based on a Form ID
683 683
 	 *
684
-     * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
684
+	 * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
685 685
 	 *
686 686
 	 * @param int $form Gravity Forms Form ID (default: '')
687 687
 	 * @param string $context (default: 'single')
688
-     *
688
+	 *
689 689
 	 * @return void
690 690
 	 */
691 691
 	function render_available_fields( $form = 0, $context = 'single' ) {
692 692
 
693
-	    // Determine if form is a preset and convert it to an array with fields
693
+		// Determine if form is a preset and convert it to an array with fields
694 694
 		$form = ( is_string( $form ) && preg_match( '/^preset_/', $form ) ) ? GravityView_Ajax::pre_get_form_fields( $form ) : $form;
695 695
 
696 696
 		/**
@@ -702,7 +702,7 @@  discard block
 block discarded – undo
702 702
 
703 703
 		if ( ! is_array( $blacklist_field_types ) ) {
704 704
 
705
-		    gravityview()->log->error( '$blacklist_field_types is not an array', array( 'data' => print_r( $blacklist_field_types, true ) ) );
705
+			gravityview()->log->error( '$blacklist_field_types is not an array', array( 'data' => print_r( $blacklist_field_types, true ) ) );
706 706
 
707 707
 			$blacklist_field_types = array();
708 708
 		}
@@ -840,12 +840,12 @@  discard block
 block discarded – undo
840 840
 				/**
841 841
 				 * @since 1.7.2
842 842
 				 */
843
-			    'other_entries' => array(
844
-				    'label'	=> __('Other Entries', 'gravityview'),
845
-				    'type'	=> 'other_entries',
846
-				    'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
847
-			    ),
848
-	        );
843
+				'other_entries' => array(
844
+					'label'	=> __('Other Entries', 'gravityview'),
845
+					'type'	=> 'other_entries',
846
+					'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
847
+				),
848
+			);
849 849
 
850 850
 			if( 'single' !== $zone) {
851 851
 
@@ -1017,9 +1017,9 @@  discard block
 block discarded – undo
1017 1017
 
1018 1018
 				$joined_forms = gravityview_get_joined_forms( $post->ID );
1019 1019
 
1020
-                foreach ( $joined_forms as $form ) {
1021
-                    $available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone );
1022
-                }
1020
+				foreach ( $joined_forms as $form ) {
1021
+					$available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone );
1022
+				}
1023 1023
 			} else {
1024 1024
 				$available_items[ $form ] = \GV\Widget::registered();
1025 1025
 			}
@@ -1047,9 +1047,9 @@  discard block
 block discarded – undo
1047 1047
 
1048 1048
 										if ( $form_id ) {
1049 1049
 											$original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ;
1050
-                                        } else {
1050
+										} else {
1051 1051
 											$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
1052
-                                        }
1052
+										}
1053 1053
 
1054 1054
 										if ( !$original_item ) {
1055 1055
 											gravityview()->log->error( 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array(' data' => array('available_items' => $available_items, 'field' => $field ) ) );
@@ -1101,7 +1101,7 @@  discard block
 block discarded – undo
1101 1101
 
1102 1102
 	/**
1103 1103
 	 * Render the widget active areas
1104
-     * @param  string $template_id The current slug of the selected View template
1104
+	 * @param  string $template_id The current slug of the selected View template
1105 1105
 	 * @param  string $zone    Either 'header' or 'footer'
1106 1106
 	 * @param  string $post_id Current Post ID (view)
1107 1107
 	 * @return string          html
@@ -1292,7 +1292,7 @@  discard block
 block discarded – undo
1292 1292
 		}
1293 1293
 
1294 1294
 		// Add the GV font (with the Astronaut)
1295
-        wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
1295
+		wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
1296 1296
 		wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version );
1297 1297
 
1298 1298
 		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true );
@@ -1300,42 +1300,42 @@  discard block
 block discarded – undo
1300 1300
 		if( GFForms::get_page() === 'form_list' ) {
1301 1301
 			wp_enqueue_style( 'gravityview_views_styles' );
1302 1302
 			return;
1303
-        }
1303
+		}
1304 1304
 
1305 1305
 		// Don't process any scripts below here if it's not a GravityView page.
1306 1306
 		if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
1307
-		    return;
1307
+			return;
1308 1308
 		}
1309 1309
 
1310
-        wp_enqueue_script( 'jquery-ui-datepicker' );
1311
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
1312
-
1313
-        // Enqueue scripts
1314
-        wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), \GV\Plugin::$version );
1315
-
1316
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1317
-            'cookiepath' => COOKIEPATH,
1318
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1319
-            'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1320
-            'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1321
-            'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ),
1322
-            'label_add_search_field' => __( 'Add Search Field', 'gravityview' ),
1323
-            'label_remove_search_field' => __( 'Remove Search Field', 'gravityview' ),
1324
-            'label_close' => __( 'Close', 'gravityview' ),
1325
-            'label_cancel' => __( 'Cancel', 'gravityview' ),
1326
-            'label_continue' => __( 'Continue', 'gravityview' ),
1327
-            'label_ok' => __( 'Ok', 'gravityview' ),
1328
-            'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
1329
-            'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
1330
-            'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1331
-            'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1332
-            'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ),
1333
-        ));
1310
+		wp_enqueue_script( 'jquery-ui-datepicker' );
1311
+		wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
1312
+
1313
+		// Enqueue scripts
1314
+		wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), \GV\Plugin::$version );
1315
+
1316
+		wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1317
+			'cookiepath' => COOKIEPATH,
1318
+			'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1319
+			'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1320
+			'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1321
+			'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ),
1322
+			'label_add_search_field' => __( 'Add Search Field', 'gravityview' ),
1323
+			'label_remove_search_field' => __( 'Remove Search Field', 'gravityview' ),
1324
+			'label_close' => __( 'Close', 'gravityview' ),
1325
+			'label_cancel' => __( 'Cancel', 'gravityview' ),
1326
+			'label_continue' => __( 'Continue', 'gravityview' ),
1327
+			'label_ok' => __( 'Ok', 'gravityview' ),
1328
+			'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
1329
+			'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
1330
+			'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1331
+			'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1332
+			'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ),
1333
+		));
1334 1334
 
1335 1335
 		wp_enqueue_style( 'gravityview_views_styles' );
1336 1336
 
1337
-        // Enqueue scripts needed for merge tags
1338
-        self::enqueue_gravity_forms_scripts();
1337
+		// Enqueue scripts needed for merge tags
1338
+		self::enqueue_gravity_forms_scripts();
1339 1339
 
1340 1340
 		// 2.5 changed how Merge Tags are enqueued
1341 1341
 		if ( is_callable( array( 'GFCommon', 'output_hooks_javascript') ) ) {
@@ -1345,24 +1345,24 @@  discard block
 block discarded – undo
1345 1345
 
1346 1346
 	/**
1347 1347
 	 * Enqueue Gravity Forms scripts, needed for Merge Tags
1348
-     *
1349
-     * @since 1.0.5-beta
1350
-     *
1351
-     * @return void
1348
+	 *
1349
+	 * @since 1.0.5-beta
1350
+	 *
1351
+	 * @return void
1352 1352
 	 */
1353 1353
 	static function enqueue_gravity_forms_scripts() {
1354 1354
 		GFForms::register_scripts();
1355 1355
 
1356 1356
 		$scripts = array(
1357
-		    'sack',
1358
-		    'gform_gravityforms',
1359
-		    'gform_forms',
1360
-		    'gform_form_admin',
1361
-		    'jquery-ui-autocomplete'
1357
+			'sack',
1358
+			'gform_gravityforms',
1359
+			'gform_forms',
1360
+			'gform_form_admin',
1361
+			'jquery-ui-autocomplete'
1362 1362
 		);
1363 1363
 
1364 1364
 		if ( wp_is_mobile() ) {
1365
-		    $scripts[] = 'jquery-touch-punch';
1365
+			$scripts[] = 'jquery-touch-punch';
1366 1366
 		}
1367 1367
 
1368 1368
 		wp_enqueue_script( $scripts );
Please login to merge, or discard this patch.