insideout10 / wordlift-plugin

src/wordlift/faq/class-faq-content-filter.php

Indentation +28 added lines, -28 removed lines

@@ -10,34 +10,34 @@
 namespace Wordlift\Faq;
 
 class Faq_Content_Filter {
-	/**
-	 * Constants used for replacing the tags in the html string.
-	 */
-	const FAQ_QUESTION_TAG_NAME = 'wl-faq-question';
-	const FAQ_ANSWER_TAG_NAME = 'wl-faq-answer';
-	/**
-	 * Replaces all the html tags inserted by Faq highlighting code in the front end
-	 * @param $content string Post content
-	 * @return string String after replacing all the opening and closing tags.
-	 */
-	public function remove_all_faq_question_and_answer_tags( $content ) {
-		/**
-		 * Replace all the question tags.
-		 */
-		$faq_question_opening_tag = '<' . self::FAQ_QUESTION_TAG_NAME . '>';
-		$faq_question_closing_tag = '</' . self::FAQ_QUESTION_TAG_NAME . '>';
-		$content = preg_replace('/<wl-faq-question class=".+?">/m', '', $content );
-		$content = str_replace($faq_question_closing_tag, "", $content);
-		/**
-		 * Replace all the answer tags.
-		 */
-		$faq_answer_opening_tag = '<' . self::FAQ_ANSWER_TAG_NAME . '>';
-		$faq_answer_closing_tag = '</' . self::FAQ_ANSWER_TAG_NAME . '>';
-		$content = preg_replace('/<wl-faq-answer class=".+?">/m', '', $content );
-		$content = str_replace($faq_answer_closing_tag, "", $content);
+    /**
+     * Constants used for replacing the tags in the html string.
+     */
+    const FAQ_QUESTION_TAG_NAME = 'wl-faq-question';
+    const FAQ_ANSWER_TAG_NAME = 'wl-faq-answer';
+    /**
+     * Replaces all the html tags inserted by Faq highlighting code in the front end
+     * @param $content string Post content
+     * @return string String after replacing all the opening and closing tags.
+     */
+    public function remove_all_faq_question_and_answer_tags( $content ) {
+        /**
+         * Replace all the question tags.
+         */
+        $faq_question_opening_tag = '<' . self::FAQ_QUESTION_TAG_NAME . '>';
+        $faq_question_closing_tag = '</' . self::FAQ_QUESTION_TAG_NAME . '>';
+        $content = preg_replace('/<wl-faq-question class=".+?">/m', '', $content );
+        $content = str_replace($faq_question_closing_tag, "", $content);
+        /**
+         * Replace all the answer tags.
+         */
+        $faq_answer_opening_tag = '<' . self::FAQ_ANSWER_TAG_NAME . '>';
+        $faq_answer_closing_tag = '</' . self::FAQ_ANSWER_TAG_NAME . '>';
+        $content = preg_replace('/<wl-faq-answer class=".+?">/m', '', $content );
+        $content = str_replace($faq_answer_closing_tag, "", $content);
 
-		/** Return all the replaced content */
-		return $content;
-	}
+        /** Return all the replaced content */
+        return $content;
+    }
 
 }
\ No newline at end of file

Spacing +7 added lines, -7 removed lines

@@ -20,20 +20,20 @@
 	 * @param $content string Post content
 	 * @return string String after replacing all the opening and closing tags.
 	 */
-	public function remove_all_faq_question_and_answer_tags( $content ) {
+	public function remove_all_faq_question_and_answer_tags($content) {
 		/**
 		 * Replace all the question tags.
 		 */
-		$faq_question_opening_tag = '<' . self::FAQ_QUESTION_TAG_NAME . '>';
-		$faq_question_closing_tag = '</' . self::FAQ_QUESTION_TAG_NAME . '>';
-		$content = preg_replace('/<wl-faq-question class=".+?">/m', '', $content );
+		$faq_question_opening_tag = '<'.self::FAQ_QUESTION_TAG_NAME.'>';
+		$faq_question_closing_tag = '</'.self::FAQ_QUESTION_TAG_NAME.'>';
+		$content = preg_replace('/<wl-faq-question class=".+?">/m', '', $content);
 		$content = str_replace($faq_question_closing_tag, "", $content);
 		/**
 		 * Replace all the answer tags.
 		 */
-		$faq_answer_opening_tag = '<' . self::FAQ_ANSWER_TAG_NAME . '>';
-		$faq_answer_closing_tag = '</' . self::FAQ_ANSWER_TAG_NAME . '>';
-		$content = preg_replace('/<wl-faq-answer class=".+?">/m', '', $content );
+		$faq_answer_opening_tag = '<'.self::FAQ_ANSWER_TAG_NAME.'>';
+		$faq_answer_closing_tag = '</'.self::FAQ_ANSWER_TAG_NAME.'>';
+		$content = preg_replace('/<wl-faq-answer class=".+?">/m', '', $content);
 		$content = str_replace($faq_answer_closing_tag, "", $content);
 
 		/** Return all the replaced content */

src/wordlift/faq/class-faq-tinymce-adapter.php

Indentation +33 added lines, -33 removed lines

@@ -13,38 +13,38 @@
 
 class Faq_Tinymce_Adapter {
 
-	const FAQ_TINYMCE_PLUGIN_NAME = "wl_faq_tinymce";
-
-	const FAQ_TINYMCE_ADD_BUTTON_ID = "wl-faq-toolbar-button";
-
-	/**
-	 * Add a list of custom tags which is to be used by our highlighting program.
-	 *
-	 * @param $init_array
-	 *
-	 * @return array
-	 */
-	public function register_custom_tags($init_array) {
-		$opts = '~wl-faq-question,~wl-faq-answer';
-		$init_array['custom_elements'] = $opts;
-		$init_array['extended_valid_elements'] = $opts;
-		return $init_array;
-	}
-	public function register_faq_tinymce_plugin( $plugins ) {
-		/**
-		 * Registering the tinymce plugin for FAQ here.
-		 * @since 3.26.0
-		 */
-		$version                                  = Wordlift::get_instance()->get_version();
-		$plugins[ self::FAQ_TINYMCE_PLUGIN_NAME ] = plugin_dir_url( dirname( __DIR__ ) ) . 'js/dist/tinymce-faq-plugin.full.js?ver=' . $version;
-
-		return $plugins;
-	}
-
-	public function register_faq_toolbar_button( $buttons ) {
-		array_push( $buttons, self::FAQ_TINYMCE_ADD_BUTTON_ID );
-
-		return $buttons;
-	}
+    const FAQ_TINYMCE_PLUGIN_NAME = "wl_faq_tinymce";
+
+    const FAQ_TINYMCE_ADD_BUTTON_ID = "wl-faq-toolbar-button";
+
+    /**
+     * Add a list of custom tags which is to be used by our highlighting program.
+     *
+     * @param $init_array
+     *
+     * @return array
+     */
+    public function register_custom_tags($init_array) {
+        $opts = '~wl-faq-question,~wl-faq-answer';
+        $init_array['custom_elements'] = $opts;
+        $init_array['extended_valid_elements'] = $opts;
+        return $init_array;
+    }
+    public function register_faq_tinymce_plugin( $plugins ) {
+        /**
+         * Registering the tinymce plugin for FAQ here.
+         * @since 3.26.0
+         */
+        $version                                  = Wordlift::get_instance()->get_version();
+        $plugins[ self::FAQ_TINYMCE_PLUGIN_NAME ] = plugin_dir_url( dirname( __DIR__ ) ) . 'js/dist/tinymce-faq-plugin.full.js?ver=' . $version;
+
+        return $plugins;
+    }
+
+    public function register_faq_toolbar_button( $buttons ) {
+        array_push( $buttons, self::FAQ_TINYMCE_ADD_BUTTON_ID );
+
+        return $buttons;
+    }
 
 }

Spacing +4 added lines, -4 removed lines

@@ -30,19 +30,19 @@
 		$init_array['extended_valid_elements'] = $opts;
 		return $init_array;
 	}
-	public function register_faq_tinymce_plugin( $plugins ) {
+	public function register_faq_tinymce_plugin($plugins) {
 		/**
 		 * Registering the tinymce plugin for FAQ here.
 		 * @since 3.26.0
 		 */
 		$version                                  = Wordlift::get_instance()->get_version();
-		$plugins[ self::FAQ_TINYMCE_PLUGIN_NAME ] = plugin_dir_url( dirname( __DIR__ ) ) . 'js/dist/tinymce-faq-plugin.full.js?ver=' . $version;
+		$plugins[self::FAQ_TINYMCE_PLUGIN_NAME] = plugin_dir_url(dirname(__DIR__)).'js/dist/tinymce-faq-plugin.full.js?ver='.$version;
 
 		return $plugins;
 	}
 
-	public function register_faq_toolbar_button( $buttons ) {
-		array_push( $buttons, self::FAQ_TINYMCE_ADD_BUTTON_ID );
+	public function register_faq_toolbar_button($buttons) {
+		array_push($buttons, self::FAQ_TINYMCE_ADD_BUTTON_ID);
 
 		return $buttons;
 	}

src/wordlift/faq/class-faq-rest-controller.php

Indentation +228 added lines, -228 removed lines

@@ -17,232 +17,232 @@
  *
  */
 class Faq_Rest_Controller {
-	const FAQ_META_KEY = '_wl_faq';
-	/**
-	 * Enumerations to determine the field to be deleted on
-	 * the DELETE request in API.
-	 */
-	const QUESTION = 'question';
-	const ANSWER = 'answer';
-
-	public static function register_routes() {
-		add_action( 'rest_api_init', 'Wordlift\FAQ\FAQ_Rest_Controller::register_route_callback' );
-	}
-
-	public static function register_route_callback() {
-		/**
-		 * Specifies the list of arguments to be present for update request.
-		 */
-		$post_id_validation_settings     = array(
-			'required'          => TRUE,
-			'validate_callback' => function ( $param, $request, $key ) {
-				return is_numeric( $param );
-			}
-		);
-		$faq_items_validation_settings   = array(
-			'required'          => TRUE,
-			'validate_callback' => function ( $param, $request, $key ) {
-				return is_array( $param ) && count( $param ) > 0;
-			}
-		);
-		/**
-		 * Array of args to be present in order to
-		 * make create, update or delete request.
-		 */
-		$create_or_update_or_delete_args = array(
-			'post_id'   => $post_id_validation_settings,
-			'faq_items' => $faq_items_validation_settings
-		);
-
-		/**
-		 * Rest route for creating new faq item.
-		 */
-		register_rest_route(
-			WL_REST_ROUTE_DEFAULT_NAMESPACE,
-			'/faq',
-			array(
-				'methods'             => \WP_REST_Server::CREATABLE,
-				'callback'            => 'Wordlift\Faq\Faq_Rest_Controller::add_faq_items',
-				'permission_callback' => function () {
-					return current_user_can( 'publish_posts' );
-				},
-				'args'                => $create_or_update_or_delete_args
-			) );
-		/**
-		 * Rest route for updating faq items.
-		 */
-		register_rest_route(
-			WL_REST_ROUTE_DEFAULT_NAMESPACE,
-			'/faq',
-			array(
-				'methods'             => \WP_REST_Server::EDITABLE,
-				'callback'            => 'Wordlift\Faq\Faq_Rest_Controller::update_faq_items',
-				'permission_callback' => function () {
-					return current_user_can( 'publish_posts' );
-				},
-				'args'                => $create_or_update_or_delete_args
-			)
-		);
-		/**
-		 * Rest route for getting the faq items.
-		 */
-		register_rest_route(
-			WL_REST_ROUTE_DEFAULT_NAMESPACE,
-			'/faq/(?P<post_id>\d+)',
-			array(
-				'methods'             => \WP_REST_Server::READABLE,
-				'callback'            => 'Wordlift\Faq\Faq_Rest_Controller::get_faq_items',
-				'permission_callback' => function () {
-					return current_user_can( 'publish_posts' );
-				},
-				'args'                => array( 'post_id' => $post_id_validation_settings )
-			)
-		);
-		/**
-		 * Rest route for deleting faq item.
-		 */
-		register_rest_route(
-			WL_REST_ROUTE_DEFAULT_NAMESPACE,
-			'/faq',
-			array(
-				'methods'             => \WP_REST_Server::DELETABLE,
-				'callback'            => 'Wordlift\Faq\Faq_Rest_Controller::delete_faq_items',
-				'permission_callback' => function () {
-					return current_user_can( 'publish_posts' );
-				},
-				'args'                => $create_or_update_or_delete_args
-			)
-		);
-	}
-
-	/**
-	 * Get all FAQ items for a post id.
-	 *
-	 * @param $request $request WP_REST_Request $request {@link WP_REST_Request instance}.
-	 *
-	 * @return array Result array, if post id is not given then error array is returned.
-	 */
-	public static function get_faq_items( $request ) {
-		$data    = $request->get_params();
-		$post_id = (int) $data['post_id'];
-
-		return get_post_meta( $post_id, self::FAQ_META_KEY );
-	}
-
-	/**
-	 * Update all FAQ items for a post id.
-	 *
-	 * @param $request $request WP_REST_Request $request {@link WP_REST_Request instance}.
-	 *
-	 * @return array Result array, if post id is not given then error array is returned.
-	 */
-	public static function update_faq_items( $request ) {
-		$data      = $request->get_params();
-		$post_id   = (int) $data['post_id'];
-		$faq_items = (array) $data['faq_items'];
-		foreach ( $faq_items as $faq_item ) {
-			$previous_value = array(
-				'question' => (string) $faq_item['previous_question_value'],
-				'answer'   => (string) $faq_item['previous_answer_value'],
-				'id'       => (int) $faq_item['id']
-			);
-			$new_value      = array(
-				'question' => (string) $faq_item['question'],
-				'answer'   => (string) $faq_item['answer'],
-				'id'       => (int) $faq_item['id']
-			);
-			update_post_meta( $post_id, self::FAQ_META_KEY, $new_value, $previous_value );
-		}
-
-		return array(
-			'status'  => 'success',
-			'message' => __( 'Faq Items updated successfully' )
-		);
-
-	}
-
-	/**
-	 * Delete Faq items.
-	 *
-	 * @param $request WP_REST_Request $request {@link WP_REST_Request instance}.
-	 *
-	 * @return array Associative array whether the faq item is deleted or not.
-	 */
-	public static function delete_faq_items( $request ) {
-		$post_data = $request->get_params();
-		$post_id   = $post_data['post_id'];
-		$faq_items = $post_data['faq_items'];
-		foreach ( $faq_items as $faq_item ) {
-			/**
-			 * Note: the order of keys is important in order to delete it properly
-			 * If the order change, delete operation will fail since it is converted
-			 * in to a string when it was stored.
-			 * we cant rely on client to post it in correct order, so we create an array
-			 * in correct order.
-			 **/
-			$deleted_faq_item = array(
-				'question' => $faq_item['question'],
-				'answer'   => $faq_item['answer'],
-				'id'       => (int) $faq_item['id']
-			);
-			/**
-			 * If the field to be deleted is answer, then dont delete the faq item,
-			 * if it is question then delete the faq item.
-			 */
-			if ( $faq_item['field_to_be_deleted'] === self::ANSWER) {
-				$previous_value = $deleted_faq_item;
-				// then dont delete the faq item, set the answer as empty.
-				$deleted_faq_item['answer'] = '';
-				$new_value = $deleted_faq_item;
-				update_post_meta($post_id, self::FAQ_META_KEY, $new_value, $previous_value);
-			}
-			else if ( $faq_item['field_to_be_deleted'] === self::QUESTION) {
-				/**
-				 * If the question is deleted, then delete the faq item.
-				 */
-				delete_post_meta( $post_id, self::FAQ_META_KEY, $deleted_faq_item );
-			}
-
-		}
-
-		/**
-		 * We are returning only the first item id, since the user can select only one text at a time.
-		 */
-		return array(
-			'status'  => 'success',
-			'message' => __( 'Faq item successfully deleted.' ),
-		);
-	}
-
-	/**
-	 * Insert or update FAQ items.
-	 *
-	 * @param $request WP_REST_Request $request {@link WP_REST_Request instance}.
-	 *
-	 * @return array Associative array whether the faq item is inserted or not
-	 */
-	public static function add_faq_items( $request ) {
-		$post_data = $request->get_params();
-		$post_id   = $post_data['post_id'];
-		$faq_items = $post_data['faq_items'];
-		foreach ( $faq_items as &$faq_item ) {
-			// Add an identifier id to the faq item, it helps to prevent duplication problem.
-			/**
-			 * We are using time() and a random integer to prevent
-			 * duplication problem.
-			 */
-			$faq_item['id'] = time() + rand( 1, 100 ) + rand( 1, 100 );
-			add_post_meta( (int) $post_id, self::FAQ_META_KEY, $faq_item );
-		}
-
-		/**
-		 * We are returning only the first item id, since the user can select only one text at a time.
-		 */
-		return array(
-			'status'  => 'success',
-			'message' => __( 'Question successfully added.' ),
-			'id'      => (int) $faq_items[0]['id'],
-		);
-
-	}
+    const FAQ_META_KEY = '_wl_faq';
+    /**
+     * Enumerations to determine the field to be deleted on
+     * the DELETE request in API.
+     */
+    const QUESTION = 'question';
+    const ANSWER = 'answer';
+
+    public static function register_routes() {
+        add_action( 'rest_api_init', 'Wordlift\FAQ\FAQ_Rest_Controller::register_route_callback' );
+    }
+
+    public static function register_route_callback() {
+        /**
+         * Specifies the list of arguments to be present for update request.
+         */
+        $post_id_validation_settings     = array(
+            'required'          => TRUE,
+            'validate_callback' => function ( $param, $request, $key ) {
+                return is_numeric( $param );
+            }
+        );
+        $faq_items_validation_settings   = array(
+            'required'          => TRUE,
+            'validate_callback' => function ( $param, $request, $key ) {
+                return is_array( $param ) && count( $param ) > 0;
+            }
+        );
+        /**
+         * Array of args to be present in order to
+         * make create, update or delete request.
+         */
+        $create_or_update_or_delete_args = array(
+            'post_id'   => $post_id_validation_settings,
+            'faq_items' => $faq_items_validation_settings
+        );
+
+        /**
+         * Rest route for creating new faq item.
+         */
+        register_rest_route(
+            WL_REST_ROUTE_DEFAULT_NAMESPACE,
+            '/faq',
+            array(
+                'methods'             => \WP_REST_Server::CREATABLE,
+                'callback'            => 'Wordlift\Faq\Faq_Rest_Controller::add_faq_items',
+                'permission_callback' => function () {
+                    return current_user_can( 'publish_posts' );
+                },
+                'args'                => $create_or_update_or_delete_args
+            ) );
+        /**
+         * Rest route for updating faq items.
+         */
+        register_rest_route(
+            WL_REST_ROUTE_DEFAULT_NAMESPACE,
+            '/faq',
+            array(
+                'methods'             => \WP_REST_Server::EDITABLE,
+                'callback'            => 'Wordlift\Faq\Faq_Rest_Controller::update_faq_items',
+                'permission_callback' => function () {
+                    return current_user_can( 'publish_posts' );
+                },
+                'args'                => $create_or_update_or_delete_args
+            )
+        );
+        /**
+         * Rest route for getting the faq items.
+         */
+        register_rest_route(
+            WL_REST_ROUTE_DEFAULT_NAMESPACE,
+            '/faq/(?P<post_id>\d+)',
+            array(
+                'methods'             => \WP_REST_Server::READABLE,
+                'callback'            => 'Wordlift\Faq\Faq_Rest_Controller::get_faq_items',
+                'permission_callback' => function () {
+                    return current_user_can( 'publish_posts' );
+                },
+                'args'                => array( 'post_id' => $post_id_validation_settings )
+            )
+        );
+        /**
+         * Rest route for deleting faq item.
+         */
+        register_rest_route(
+            WL_REST_ROUTE_DEFAULT_NAMESPACE,
+            '/faq',
+            array(
+                'methods'             => \WP_REST_Server::DELETABLE,
+                'callback'            => 'Wordlift\Faq\Faq_Rest_Controller::delete_faq_items',
+                'permission_callback' => function () {
+                    return current_user_can( 'publish_posts' );
+                },
+                'args'                => $create_or_update_or_delete_args
+            )
+        );
+    }
+
+    /**
+     * Get all FAQ items for a post id.
+     *
+     * @param $request $request WP_REST_Request $request {@link WP_REST_Request instance}.
+     *
+     * @return array Result array, if post id is not given then error array is returned.
+     */
+    public static function get_faq_items( $request ) {
+        $data    = $request->get_params();
+        $post_id = (int) $data['post_id'];
+
+        return get_post_meta( $post_id, self::FAQ_META_KEY );
+    }
+
+    /**
+     * Update all FAQ items for a post id.
+     *
+     * @param $request $request WP_REST_Request $request {@link WP_REST_Request instance}.
+     *
+     * @return array Result array, if post id is not given then error array is returned.
+     */
+    public static function update_faq_items( $request ) {
+        $data      = $request->get_params();
+        $post_id   = (int) $data['post_id'];
+        $faq_items = (array) $data['faq_items'];
+        foreach ( $faq_items as $faq_item ) {
+            $previous_value = array(
+                'question' => (string) $faq_item['previous_question_value'],
+                'answer'   => (string) $faq_item['previous_answer_value'],
+                'id'       => (int) $faq_item['id']
+            );
+            $new_value      = array(
+                'question' => (string) $faq_item['question'],
+                'answer'   => (string) $faq_item['answer'],
+                'id'       => (int) $faq_item['id']
+            );
+            update_post_meta( $post_id, self::FAQ_META_KEY, $new_value, $previous_value );
+        }
+
+        return array(
+            'status'  => 'success',
+            'message' => __( 'Faq Items updated successfully' )
+        );
+
+    }
+
+    /**
+     * Delete Faq items.
+     *
+     * @param $request WP_REST_Request $request {@link WP_REST_Request instance}.
+     *
+     * @return array Associative array whether the faq item is deleted or not.
+     */
+    public static function delete_faq_items( $request ) {
+        $post_data = $request->get_params();
+        $post_id   = $post_data['post_id'];
+        $faq_items = $post_data['faq_items'];
+        foreach ( $faq_items as $faq_item ) {
+            /**
+             * Note: the order of keys is important in order to delete it properly
+             * If the order change, delete operation will fail since it is converted
+             * in to a string when it was stored.
+             * we cant rely on client to post it in correct order, so we create an array
+             * in correct order.
+             **/
+            $deleted_faq_item = array(
+                'question' => $faq_item['question'],
+                'answer'   => $faq_item['answer'],
+                'id'       => (int) $faq_item['id']
+            );
+            /**
+             * If the field to be deleted is answer, then dont delete the faq item,
+             * if it is question then delete the faq item.
+             */
+            if ( $faq_item['field_to_be_deleted'] === self::ANSWER) {
+                $previous_value = $deleted_faq_item;
+                // then dont delete the faq item, set the answer as empty.
+                $deleted_faq_item['answer'] = '';
+                $new_value = $deleted_faq_item;
+                update_post_meta($post_id, self::FAQ_META_KEY, $new_value, $previous_value);
+            }
+            else if ( $faq_item['field_to_be_deleted'] === self::QUESTION) {
+                /**
+                 * If the question is deleted, then delete the faq item.
+                 */
+                delete_post_meta( $post_id, self::FAQ_META_KEY, $deleted_faq_item );
+            }
+
+        }
+
+        /**
+         * We are returning only the first item id, since the user can select only one text at a time.
+         */
+        return array(
+            'status'  => 'success',
+            'message' => __( 'Faq item successfully deleted.' ),
+        );
+    }
+
+    /**
+     * Insert or update FAQ items.
+     *
+     * @param $request WP_REST_Request $request {@link WP_REST_Request instance}.
+     *
+     * @return array Associative array whether the faq item is inserted or not
+     */
+    public static function add_faq_items( $request ) {
+        $post_data = $request->get_params();
+        $post_id   = $post_data['post_id'];
+        $faq_items = $post_data['faq_items'];
+        foreach ( $faq_items as &$faq_item ) {
+            // Add an identifier id to the faq item, it helps to prevent duplication problem.
+            /**
+             * We are using time() and a random integer to prevent
+             * duplication problem.
+             */
+            $faq_item['id'] = time() + rand( 1, 100 ) + rand( 1, 100 );
+            add_post_meta( (int) $post_id, self::FAQ_META_KEY, $faq_item );
+        }
+
+        /**
+         * We are returning only the first item id, since the user can select only one text at a time.
+         */
+        return array(
+            'status'  => 'success',
+            'message' => __( 'Question successfully added.' ),
+            'id'      => (int) $faq_items[0]['id'],
+        );
+
+    }
 }

Spacing +34 added lines, -34 removed lines

@@ -26,23 +26,23 @@ 
 	const ANSWER = 'answer';
 
 	public static function register_routes() {
-		add_action( 'rest_api_init', 'Wordlift\FAQ\FAQ_Rest_Controller::register_route_callback' );
+		add_action('rest_api_init', 'Wordlift\FAQ\FAQ_Rest_Controller::register_route_callback');
 	}
 
 	public static function register_route_callback() {
 		/**
 		 * Specifies the list of arguments to be present for update request.
 		 */
-		$post_id_validation_settings     = array(
+		$post_id_validation_settings = array(
 			'required'          => TRUE,
-			'validate_callback' => function ( $param, $request, $key ) {
-				return is_numeric( $param );
+			'validate_callback' => function($param, $request, $key) {
+				return is_numeric($param);
 			}
 		);
-		$faq_items_validation_settings   = array(
+		$faq_items_validation_settings = array(
 			'required'          => TRUE,
-			'validate_callback' => function ( $param, $request, $key ) {
-				return is_array( $param ) && count( $param ) > 0;
+			'validate_callback' => function($param, $request, $key) {
+				return is_array($param) && count($param) > 0;
 			}
 		);
 		/**
@@ -63,8 +63,8 @@ 
 			array(
 				'methods'             => \WP_REST_Server::CREATABLE,
 				'callback'            => 'Wordlift\Faq\Faq_Rest_Controller::add_faq_items',
-				'permission_callback' => function () {
-					return current_user_can( 'publish_posts' );
+				'permission_callback' => function() {
+					return current_user_can('publish_posts');
 				},
 				'args'                => $create_or_update_or_delete_args
 			) );
@@ -77,8 +77,8 @@ 
 			array(
 				'methods'             => \WP_REST_Server::EDITABLE,
 				'callback'            => 'Wordlift\Faq\Faq_Rest_Controller::update_faq_items',
-				'permission_callback' => function () {
-					return current_user_can( 'publish_posts' );
+				'permission_callback' => function() {
+					return current_user_can('publish_posts');
 				},
 				'args'                => $create_or_update_or_delete_args
 			)
@@ -92,10 +92,10 @@ 
 			array(
 				'methods'             => \WP_REST_Server::READABLE,
 				'callback'            => 'Wordlift\Faq\Faq_Rest_Controller::get_faq_items',
-				'permission_callback' => function () {
-					return current_user_can( 'publish_posts' );
+				'permission_callback' => function() {
+					return current_user_can('publish_posts');
 				},
-				'args'                => array( 'post_id' => $post_id_validation_settings )
+				'args'                => array('post_id' => $post_id_validation_settings)
 			)
 		);
 		/**
@@ -107,8 +107,8 @@ 
 			array(
 				'methods'             => \WP_REST_Server::DELETABLE,
 				'callback'            => 'Wordlift\Faq\Faq_Rest_Controller::delete_faq_items',
-				'permission_callback' => function () {
-					return current_user_can( 'publish_posts' );
+				'permission_callback' => function() {
+					return current_user_can('publish_posts');
 				},
 				'args'                => $create_or_update_or_delete_args
 			)
@@ -122,11 +122,11 @@ 
 	 *
 	 * @return array Result array, if post id is not given then error array is returned.
 	 */
-	public static function get_faq_items( $request ) {
+	public static function get_faq_items($request) {
 		$data    = $request->get_params();
 		$post_id = (int) $data['post_id'];
 
-		return get_post_meta( $post_id, self::FAQ_META_KEY );
+		return get_post_meta($post_id, self::FAQ_META_KEY);
 	}
 
 	/**
@@ -136,27 +136,27 @@ 
 	 *
 	 * @return array Result array, if post id is not given then error array is returned.
 	 */
-	public static function update_faq_items( $request ) {
+	public static function update_faq_items($request) {
 		$data      = $request->get_params();
 		$post_id   = (int) $data['post_id'];
 		$faq_items = (array) $data['faq_items'];
-		foreach ( $faq_items as $faq_item ) {
+		foreach ($faq_items as $faq_item) {
 			$previous_value = array(
 				'question' => (string) $faq_item['previous_question_value'],
 				'answer'   => (string) $faq_item['previous_answer_value'],
 				'id'       => (int) $faq_item['id']
 			);
-			$new_value      = array(
+			$new_value = array(
 				'question' => (string) $faq_item['question'],
 				'answer'   => (string) $faq_item['answer'],
 				'id'       => (int) $faq_item['id']
 			);
-			update_post_meta( $post_id, self::FAQ_META_KEY, $new_value, $previous_value );
+			update_post_meta($post_id, self::FAQ_META_KEY, $new_value, $previous_value);
 		}
 
 		return array(
 			'status'  => 'success',
-			'message' => __( 'Faq Items updated successfully' )
+			'message' => __('Faq Items updated successfully')
 		);
 
 	}
@@ -168,11 +168,11 @@ 
 	 *
 	 * @return array Associative array whether the faq item is deleted or not.
 	 */
-	public static function delete_faq_items( $request ) {
+	public static function delete_faq_items($request) {
 		$post_data = $request->get_params();
 		$post_id   = $post_data['post_id'];
 		$faq_items = $post_data['faq_items'];
-		foreach ( $faq_items as $faq_item ) {
+		foreach ($faq_items as $faq_item) {
 			/**
 			 * Note: the order of keys is important in order to delete it properly
 			 * If the order change, delete operation will fail since it is converted
@@ -189,18 +189,18 @@ 
 			 * If the field to be deleted is answer, then dont delete the faq item,
 			 * if it is question then delete the faq item.
 			 */
-			if ( $faq_item['field_to_be_deleted'] === self::ANSWER) {
+			if ($faq_item['field_to_be_deleted'] === self::ANSWER) {
 				$previous_value = $deleted_faq_item;
 				// then dont delete the faq item, set the answer as empty.
 				$deleted_faq_item['answer'] = '';
 				$new_value = $deleted_faq_item;
 				update_post_meta($post_id, self::FAQ_META_KEY, $new_value, $previous_value);
 			}
-			else if ( $faq_item['field_to_be_deleted'] === self::QUESTION) {
+			else if ($faq_item['field_to_be_deleted'] === self::QUESTION) {
 				/**
 				 * If the question is deleted, then delete the faq item.
 				 */
-				delete_post_meta( $post_id, self::FAQ_META_KEY, $deleted_faq_item );
+				delete_post_meta($post_id, self::FAQ_META_KEY, $deleted_faq_item);
 			}
 
 		}
@@ -210,7 +210,7 @@ 
 		 */
 		return array(
 			'status'  => 'success',
-			'message' => __( 'Faq item successfully deleted.' ),
+			'message' => __('Faq item successfully deleted.'),
 		);
 	}
 
@@ -221,18 +221,18 @@ 
 	 *
 	 * @return array Associative array whether the faq item is inserted or not
 	 */
-	public static function add_faq_items( $request ) {
+	public static function add_faq_items($request) {
 		$post_data = $request->get_params();
 		$post_id   = $post_data['post_id'];
 		$faq_items = $post_data['faq_items'];
-		foreach ( $faq_items as &$faq_item ) {
+		foreach ($faq_items as &$faq_item) {
 			// Add an identifier id to the faq item, it helps to prevent duplication problem.
 			/**
 			 * We are using time() and a random integer to prevent
 			 * duplication problem.
 			 */
-			$faq_item['id'] = time() + rand( 1, 100 ) + rand( 1, 100 );
-			add_post_meta( (int) $post_id, self::FAQ_META_KEY, $faq_item );
+			$faq_item['id'] = time() + rand(1, 100) + rand(1, 100);
+			add_post_meta((int) $post_id, self::FAQ_META_KEY, $faq_item);
 		}
 
 		/**
@@ -240,7 +240,7 @@ 
 		 */
 		return array(
 			'status'  => 'success',
-			'message' => __( 'Question successfully added.' ),
+			'message' => __('Question successfully added.'),
 			'id'      => (int) $faq_items[0]['id'],
 		);
 

Braces +1 added lines, -2 removed lines

@@ -195,8 +195,7 @@
 				$deleted_faq_item['answer'] = '';
 				$new_value = $deleted_faq_item;
 				update_post_meta($post_id, self::FAQ_META_KEY, $new_value, $previous_value);
-			}
-			else if ( $faq_item['field_to_be_deleted'] === self::QUESTION) {
+			} else if ( $faq_item['field_to_be_deleted'] === self::QUESTION) {
 				/**
 				 * If the question is deleted, then delete the faq item.
 				 */

src/admin/class-wordlift-admin-post-edit-page.php

Indentation +278 added lines, -278 removed lines

@@ -20,128 +20,128 @@ 
  */
 class Wordlift_Admin_Post_Edit_Page {
 
-	/**
-	 * Constants to be used instead of text inside FAQ
-	 * helper methods.
-	 */
-	const GUTENBERG = 'gutenberg';
-	const TINY_MCE = 'tiny_mce';
-	const FAQ_LIST_BOX_ID = 'wl-faq-meta-list-box';
-
-	/** Constant to be used for translation domain */
-	const WORDLIFT_TEXT_DOMAIN = 'wordlift';
-
-	/**
-	 * The {@link Wordlift} plugin instance.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @var \Wordlift $plugin The {@link Wordlift} plugin instance.
-	 */
-	private $plugin;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since 3.15.4
-	 *
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * Create the {@link Wordlift_Admin_Post_Edit_Page} instance.
-	 *
-	 * @param \Wordlift $plugin The {@link Wordlift} plugin instance.
-	 *
-	 * @since 3.11.0
-	 *
-	 */
-	function __construct( $plugin ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-
-		add_action( 'enqueue_block_editor_assets', array( $this, 'enqueue_scripts_gutenberg', ) );
-
-		// Bail out if we're in the UX Builder editor.
-		if ( $this->is_ux_builder_editor() ) {
-			$this->log->info( 'WordLift will not show, since we are in UX Builder editor.' );
-
-			return;
-		}
-
-		// Define the callbacks.
-		$callback = array( $this, 'enqueue_scripts', );
-
-		// Set a hook to enqueue scripts only when the edit page is displayed.
-		add_action( 'admin_print_scripts-post.php', $callback );
-		add_action( 'admin_print_scripts-post-new.php', $callback );
-
-		$this->plugin = $plugin;
-	}
-
-	/**
-	 * Check whether the current post opens with G'berg or not.
-	 *
-	 * @return bool True if G'berg is used otherwise false.
-	 * @since 3.22.3
-	 */
-	function is_gutenberg_page() {
-		if ( function_exists( 'is_gutenberg_page' ) && is_gutenberg_page() ) {
-			// The Gutenberg plugin is on.
-			return TRUE;
-		}
-
-		$current_screen = get_current_screen();
-		if ( method_exists( $current_screen, 'is_block_editor' ) && $current_screen->is_block_editor() ) {
-			// Gutenberg page on 5+.
-			return TRUE;
-		}
-
-		return FALSE;
-	}
-
-	/**
-	 * Check if we're in UX builder.
-	 *
-	 * @see   https://github.com/insideout10/wordlift-plugin/issues/691
-	 *
-	 * @since 3.15.4
-	 *
-	 * @return bool True if we're in UX builder, otherwise false.
-	 */
-	private function is_ux_builder_editor() {
-
-		return function_exists( 'ux_builder_is_editor' )
-		       && ux_builder_is_editor();
-	}
-
-	/**
-	 * Enqueue scripts and styles for the edit page.
-	 *
-	 * @since 3.11.0
-	 */
-	public function enqueue_scripts() {
-
-		// Bail out if this is G'berg.
-		if ( $this->is_gutenberg_page() ) {
-			return;
-		}
-
-		// Dequeue potentially conflicting ontrapages angular scripts which any *are not* used on the edit screen.
-		//
-		// @see https://github.com/insideout10/wordlift-plugin/issues/832
-		wp_dequeue_script( 'ontrapagesAngular' );
-		wp_dequeue_script( 'ontrapagesApp' );
-		wp_dequeue_script( 'ontrapagesController' );
-
-		// If Gutenberg is enabled for the post, do not load the legacy edit.js.
-		if ( function_exists( 'use_block_editor_for_post' ) && use_block_editor_for_post( get_post() ) ) {
-			return;
-		}
-
-
-		/*
+    /**
+     * Constants to be used instead of text inside FAQ
+     * helper methods.
+     */
+    const GUTENBERG = 'gutenberg';
+    const TINY_MCE = 'tiny_mce';
+    const FAQ_LIST_BOX_ID = 'wl-faq-meta-list-box';
+
+    /** Constant to be used for translation domain */
+    const WORDLIFT_TEXT_DOMAIN = 'wordlift';
+
+    /**
+     * The {@link Wordlift} plugin instance.
+     *
+     * @since 3.11.0
+     *
+     * @var \Wordlift $plugin The {@link Wordlift} plugin instance.
+     */
+    private $plugin;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since 3.15.4
+     *
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * Create the {@link Wordlift_Admin_Post_Edit_Page} instance.
+     *
+     * @param \Wordlift $plugin The {@link Wordlift} plugin instance.
+     *
+     * @since 3.11.0
+     *
+     */
+    function __construct( $plugin ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
+
+        add_action( 'enqueue_block_editor_assets', array( $this, 'enqueue_scripts_gutenberg', ) );
+
+        // Bail out if we're in the UX Builder editor.
+        if ( $this->is_ux_builder_editor() ) {
+            $this->log->info( 'WordLift will not show, since we are in UX Builder editor.' );
+
+            return;
+        }
+
+        // Define the callbacks.
+        $callback = array( $this, 'enqueue_scripts', );
+
+        // Set a hook to enqueue scripts only when the edit page is displayed.
+        add_action( 'admin_print_scripts-post.php', $callback );
+        add_action( 'admin_print_scripts-post-new.php', $callback );
+
+        $this->plugin = $plugin;
+    }
+
+    /**
+     * Check whether the current post opens with G'berg or not.
+     *
+     * @return bool True if G'berg is used otherwise false.
+     * @since 3.22.3
+     */
+    function is_gutenberg_page() {
+        if ( function_exists( 'is_gutenberg_page' ) && is_gutenberg_page() ) {
+            // The Gutenberg plugin is on.
+            return TRUE;
+        }
+
+        $current_screen = get_current_screen();
+        if ( method_exists( $current_screen, 'is_block_editor' ) && $current_screen->is_block_editor() ) {
+            // Gutenberg page on 5+.
+            return TRUE;
+        }
+
+        return FALSE;
+    }
+
+    /**
+     * Check if we're in UX builder.
+     *
+     * @see   https://github.com/insideout10/wordlift-plugin/issues/691
+     *
+     * @since 3.15.4
+     *
+     * @return bool True if we're in UX builder, otherwise false.
+     */
+    private function is_ux_builder_editor() {
+
+        return function_exists( 'ux_builder_is_editor' )
+               && ux_builder_is_editor();
+    }
+
+    /**
+     * Enqueue scripts and styles for the edit page.
+     *
+     * @since 3.11.0
+     */
+    public function enqueue_scripts() {
+
+        // Bail out if this is G'berg.
+        if ( $this->is_gutenberg_page() ) {
+            return;
+        }
+
+        // Dequeue potentially conflicting ontrapages angular scripts which any *are not* used on the edit screen.
+        //
+        // @see https://github.com/insideout10/wordlift-plugin/issues/832
+        wp_dequeue_script( 'ontrapagesAngular' );
+        wp_dequeue_script( 'ontrapagesApp' );
+        wp_dequeue_script( 'ontrapagesController' );
+
+        // If Gutenberg is enabled for the post, do not load the legacy edit.js.
+        if ( function_exists( 'use_block_editor_for_post' ) && use_block_editor_for_post( get_post() ) ) {
+            return;
+        }
+
+
+        /*
 		 * Enqueue the edit screen JavaScript. The `wordlift-admin.bundle.js` file
 		 * is scheduled to replace the older `wordlift-admin.min.js` once client-side
 		 * code is properly refactored.
@@ -150,169 +150,169 @@ 
 		 *
 		 * @since 3.20.0 edit.js has been migrated to the new webpack configuration.
 		 */
-		$script_name = plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/edit';
-
-		/**
-		 * Scripts_Helper introduced.
-		 *
-		 * @since 3.25.0 Scripts are loaded using script helper to ensure WP 4.4 compatibiility.
-		 * @since 3.25.1 The handle is used to hook the wp_localize_script for the _wlEntityTypes global object.
-		 */
-		Scripts_Helper::enqueue_based_on_wordpress_version(
-			'wl-classic-editor',
-			$script_name,
-			array(
-				$this->plugin->get_plugin_name(),
-				'jquery',
-				// Require wp.ajax.
-				'wp-util',
-				// @@todo: provide the following dependencies when we're in WP < 5.0 (i.e. when these dependencies aren't already defined).
-				'react',
-				'react-dom',
-				'wp-element',
-				'wp-polyfill',
-				/*
+        $script_name = plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/edit';
+
+        /**
+         * Scripts_Helper introduced.
+         *
+         * @since 3.25.0 Scripts are loaded using script helper to ensure WP 4.4 compatibiility.
+         * @since 3.25.1 The handle is used to hook the wp_localize_script for the _wlEntityTypes global object.
+         */
+        Scripts_Helper::enqueue_based_on_wordpress_version(
+            'wl-classic-editor',
+            $script_name,
+            array(
+                $this->plugin->get_plugin_name(),
+                'jquery',
+                // Require wp.ajax.
+                'wp-util',
+                // @@todo: provide the following dependencies when we're in WP < 5.0 (i.e. when these dependencies aren't already defined).
+                'react',
+                'react-dom',
+                'wp-element',
+                'wp-polyfill',
+                /*
 				* Angular isn't loaded anymore remotely, but it is loaded within wordlift-reloaded.js.
 				*
 				* See https://github.com/insideout10/wordlift-plugin/issues/865.
 				*
 				* @since 3.19.6
 				*/
-				//				// Require Angular.
-				//				'wl-angular',
-				//				'wl-angular-geolocation',
-				//				'wl-angular-touch',
-				//				'wl-angular-animate',
-				/**
-				 * We need the `wp.hooks` global to allow the edit.js script to send actions.
-				 *
-				 * @since 3.23.0
-				 */
-				'wp-hooks',
-			)
-		);
-
-		wp_enqueue_style( 'wl-classic-editor', "$script_name.css", array(), $this->plugin->get_version() );
-		$this->load_faq_scripts_and_styles();
-		$this->load_faq_settings( self::TINY_MCE );
-	}
-
-	/**
-	 * Enqueue the scripts and styles needed for FAQ
-	 */
-	private function load_faq_scripts_and_styles() {
-		wp_enqueue_style(
-			'wl-faq-metabox-style',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/faq.css',
-			array()
-		);
-		Scripts_Helper::enqueue_based_on_wordpress_version(
-			'wl-faq-metabox-script',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/faq',
-			array( 'wp-polyfill' ),
-			true
-		);
-	}
-
-	/**
-	 * Get FAQ settings array
-	 *
-	 * @return array
-	 */
-	public function get_faq_settings() {
-		return array(
-			'restUrl'                 => get_rest_url( NULL, WL_REST_ROUTE_DEFAULT_NAMESPACE . '/faq' ),
-			'listBoxId'               => self::FAQ_LIST_BOX_ID,
-			'nonce'                   => wp_create_nonce( 'wp_rest' ),
-			'postId'                  => get_the_ID(),
-			// Translation for warning, error message.
-			'invalidTagMessage'       => sprintf( __( 'Invalid tags %s is present in answer', self::WORDLIFT_TEXT_DOMAIN ), "{INVALID_TAGS}" ),
-			'invalidWordCountMessage' => sprintf( __( 'Answer word count must not exceed %s words', self::WORDLIFT_TEXT_DOMAIN ), "{ANSWER_WORD_COUNT_WARNING_LIMIT}" ),
-			'questionText'            => __( 'Question', self::WORDLIFT_TEXT_DOMAIN ),
-			'answerText'              => __( 'Answer', self::WORDLIFT_TEXT_DOMAIN ),
-			'addQuestionOrAnswerText' => __( 'Add Question / Answer', self::WORDLIFT_TEXT_DOMAIN ),
-			'addQuestionText'         => __( 'Add Question', self::WORDLIFT_TEXT_DOMAIN ),
-			'addAnswerText'           => __( 'Add Answer', self::WORDLIFT_TEXT_DOMAIN ),
-			'noFaqItemsText'          => __( 'No Questions or answers present', self::WORDLIFT_TEXT_DOMAIN ),
-			'updatingText'          => __( 'Updating...', self::WORDLIFT_TEXT_DOMAIN )
-		);
-	}
-
-	/**
-	 * Load FAQ settings to the add/edit post page
-	 *
-	 * @param $editor string specifying which text editor needed to be used.
-	 */
-	private function load_faq_settings( $editor ) {
-		// This script also provides translations to gutenberg.
-		wp_localize_script( 'wl-faq-metabox-script', '_wlFaqSettings', $this->get_faq_settings() );
-
-		// Enqueue the FAQ style
-		if ( $editor === self::GUTENBERG ) {
-			Scripts_Helper::enqueue_based_on_wordpress_version(
-				'wl-faq-gutenberg-plugin',
-				plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/block-editor-faq-plugin',
-				array( 'wp-polyfill' ),
-				TRUE
-			);
-		}
-	}
-
-	/**
-	 * Enqueue scripts and styles for the gutenberg edit page.
-	 *
-	 * @since 3.21.0
-	 */
-	public function enqueue_scripts_gutenberg() {
-		// Load FAQ settings.
-		$this->load_faq_scripts_and_styles();
-		$this->load_faq_settings( self::GUTENBERG );
-
-		wp_register_script(
-			'wl-block-editor',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/block-editor.js',
-			array(
-				'react',
-				'wordlift',
-				'wp-hooks',
-				'wp-data',
-				'wp-rich-text',
-				'wp-blocks',
-				'wp-plugins',
-				'wp-edit-post',
-			),
-			$this->plugin->get_version()
-		);
-		wp_localize_script( 'wl-block-editor', '_wlBlockEditorSettings', array(
-			'root'  => esc_url_raw( rest_url() ),
-			'nonce' => wp_create_nonce( 'wp_rest' )
-		) );
-
-		/*
+                //				// Require Angular.
+                //				'wl-angular',
+                //				'wl-angular-geolocation',
+                //				'wl-angular-touch',
+                //				'wl-angular-animate',
+                /**
+                 * We need the `wp.hooks` global to allow the edit.js script to send actions.
+                 *
+                 * @since 3.23.0
+                 */
+                'wp-hooks',
+            )
+        );
+
+        wp_enqueue_style( 'wl-classic-editor', "$script_name.css", array(), $this->plugin->get_version() );
+        $this->load_faq_scripts_and_styles();
+        $this->load_faq_settings( self::TINY_MCE );
+    }
+
+    /**
+     * Enqueue the scripts and styles needed for FAQ
+     */
+    private function load_faq_scripts_and_styles() {
+        wp_enqueue_style(
+            'wl-faq-metabox-style',
+            plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/faq.css',
+            array()
+        );
+        Scripts_Helper::enqueue_based_on_wordpress_version(
+            'wl-faq-metabox-script',
+            plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/faq',
+            array( 'wp-polyfill' ),
+            true
+        );
+    }
+
+    /**
+     * Get FAQ settings array
+     *
+     * @return array
+     */
+    public function get_faq_settings() {
+        return array(
+            'restUrl'                 => get_rest_url( NULL, WL_REST_ROUTE_DEFAULT_NAMESPACE . '/faq' ),
+            'listBoxId'               => self::FAQ_LIST_BOX_ID,
+            'nonce'                   => wp_create_nonce( 'wp_rest' ),
+            'postId'                  => get_the_ID(),
+            // Translation for warning, error message.
+            'invalidTagMessage'       => sprintf( __( 'Invalid tags %s is present in answer', self::WORDLIFT_TEXT_DOMAIN ), "{INVALID_TAGS}" ),
+            'invalidWordCountMessage' => sprintf( __( 'Answer word count must not exceed %s words', self::WORDLIFT_TEXT_DOMAIN ), "{ANSWER_WORD_COUNT_WARNING_LIMIT}" ),
+            'questionText'            => __( 'Question', self::WORDLIFT_TEXT_DOMAIN ),
+            'answerText'              => __( 'Answer', self::WORDLIFT_TEXT_DOMAIN ),
+            'addQuestionOrAnswerText' => __( 'Add Question / Answer', self::WORDLIFT_TEXT_DOMAIN ),
+            'addQuestionText'         => __( 'Add Question', self::WORDLIFT_TEXT_DOMAIN ),
+            'addAnswerText'           => __( 'Add Answer', self::WORDLIFT_TEXT_DOMAIN ),
+            'noFaqItemsText'          => __( 'No Questions or answers present', self::WORDLIFT_TEXT_DOMAIN ),
+            'updatingText'          => __( 'Updating...', self::WORDLIFT_TEXT_DOMAIN )
+        );
+    }
+
+    /**
+     * Load FAQ settings to the add/edit post page
+     *
+     * @param $editor string specifying which text editor needed to be used.
+     */
+    private function load_faq_settings( $editor ) {
+        // This script also provides translations to gutenberg.
+        wp_localize_script( 'wl-faq-metabox-script', '_wlFaqSettings', $this->get_faq_settings() );
+
+        // Enqueue the FAQ style
+        if ( $editor === self::GUTENBERG ) {
+            Scripts_Helper::enqueue_based_on_wordpress_version(
+                'wl-faq-gutenberg-plugin',
+                plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/block-editor-faq-plugin',
+                array( 'wp-polyfill' ),
+                TRUE
+            );
+        }
+    }
+
+    /**
+     * Enqueue scripts and styles for the gutenberg edit page.
+     *
+     * @since 3.21.0
+     */
+    public function enqueue_scripts_gutenberg() {
+        // Load FAQ settings.
+        $this->load_faq_scripts_and_styles();
+        $this->load_faq_settings( self::GUTENBERG );
+
+        wp_register_script(
+            'wl-block-editor',
+            plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/block-editor.js',
+            array(
+                'react',
+                'wordlift',
+                'wp-hooks',
+                'wp-data',
+                'wp-rich-text',
+                'wp-blocks',
+                'wp-plugins',
+                'wp-edit-post',
+            ),
+            $this->plugin->get_version()
+        );
+        wp_localize_script( 'wl-block-editor', '_wlBlockEditorSettings', array(
+            'root'  => esc_url_raw( rest_url() ),
+            'nonce' => wp_create_nonce( 'wp_rest' )
+        ) );
+
+        /*
 		 * @since 3.25.1 The hook is used by the wp_localize_script to register the _wlEntityTypes global object.
 		 */
-		wp_enqueue_style(
-			'wl-block-editor',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/block-editor.css',
-			array(),
-			$this->plugin->get_version()
-		);
-
-		wp_enqueue_script(
-			'wl-autocomplete-select',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/autocomplete-select.js',
-			array(),
-			$this->plugin->get_version(),
-			TRUE
-		);
-
-		wp_enqueue_style(
-			'wl-autocomplete-select',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/autocomplete-select.css',
-			array(),
-			$this->plugin->get_version()
-		);
-
-	}
+        wp_enqueue_style(
+            'wl-block-editor',
+            plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/block-editor.css',
+            array(),
+            $this->plugin->get_version()
+        );
+
+        wp_enqueue_script(
+            'wl-autocomplete-select',
+            plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/autocomplete-select.js',
+            array(),
+            $this->plugin->get_version(),
+            TRUE
+        );
+
+        wp_enqueue_style(
+            'wl-autocomplete-select',
+            plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/autocomplete-select.css',
+            array(),
+            $this->plugin->get_version()
+        );
+
+    }
 
 }

Spacing +47 added lines, -47 removed lines

@@ -57,25 +57,25 @@ 
 	 * @since 3.11.0
 	 *
 	 */
-	function __construct( $plugin ) {
+	function __construct($plugin) {
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
-		add_action( 'enqueue_block_editor_assets', array( $this, 'enqueue_scripts_gutenberg', ) );
+		add_action('enqueue_block_editor_assets', array($this, 'enqueue_scripts_gutenberg',));
 
 		// Bail out if we're in the UX Builder editor.
-		if ( $this->is_ux_builder_editor() ) {
-			$this->log->info( 'WordLift will not show, since we are in UX Builder editor.' );
+		if ($this->is_ux_builder_editor()) {
+			$this->log->info('WordLift will not show, since we are in UX Builder editor.');
 
 			return;
 		}
 
 		// Define the callbacks.
-		$callback = array( $this, 'enqueue_scripts', );
+		$callback = array($this, 'enqueue_scripts',);
 
 		// Set a hook to enqueue scripts only when the edit page is displayed.
-		add_action( 'admin_print_scripts-post.php', $callback );
-		add_action( 'admin_print_scripts-post-new.php', $callback );
+		add_action('admin_print_scripts-post.php', $callback);
+		add_action('admin_print_scripts-post-new.php', $callback);
 
 		$this->plugin = $plugin;
 	}
@@ -87,13 +87,13 @@ 
 	 * @since 3.22.3
 	 */
 	function is_gutenberg_page() {
-		if ( function_exists( 'is_gutenberg_page' ) && is_gutenberg_page() ) {
+		if (function_exists('is_gutenberg_page') && is_gutenberg_page()) {
 			// The Gutenberg plugin is on.
 			return TRUE;
 		}
 
 		$current_screen = get_current_screen();
-		if ( method_exists( $current_screen, 'is_block_editor' ) && $current_screen->is_block_editor() ) {
+		if (method_exists($current_screen, 'is_block_editor') && $current_screen->is_block_editor()) {
 			// Gutenberg page on 5+.
 			return TRUE;
 		}
@@ -112,7 +112,7 @@ 
 	 */
 	private function is_ux_builder_editor() {
 
-		return function_exists( 'ux_builder_is_editor' )
+		return function_exists('ux_builder_is_editor')
 		       && ux_builder_is_editor();
 	}
 
@@ -124,19 +124,19 @@ 
 	public function enqueue_scripts() {
 
 		// Bail out if this is G'berg.
-		if ( $this->is_gutenberg_page() ) {
+		if ($this->is_gutenberg_page()) {
 			return;
 		}
 
 		// Dequeue potentially conflicting ontrapages angular scripts which any *are not* used on the edit screen.
 		//
 		// @see https://github.com/insideout10/wordlift-plugin/issues/832
-		wp_dequeue_script( 'ontrapagesAngular' );
-		wp_dequeue_script( 'ontrapagesApp' );
-		wp_dequeue_script( 'ontrapagesController' );
+		wp_dequeue_script('ontrapagesAngular');
+		wp_dequeue_script('ontrapagesApp');
+		wp_dequeue_script('ontrapagesController');
 
 		// If Gutenberg is enabled for the post, do not load the legacy edit.js.
-		if ( function_exists( 'use_block_editor_for_post' ) && use_block_editor_for_post( get_post() ) ) {
+		if (function_exists('use_block_editor_for_post') && use_block_editor_for_post(get_post())) {
 			return;
 		}
 
@@ -150,7 +150,7 @@ 
 		 *
 		 * @since 3.20.0 edit.js has been migrated to the new webpack configuration.
 		 */
-		$script_name = plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/edit';
+		$script_name = plugin_dir_url(dirname(__FILE__)).'js/dist/edit';
 
 		/**
 		 * Scripts_Helper introduced.
@@ -192,9 +192,9 @@ 
 			)
 		);
 
-		wp_enqueue_style( 'wl-classic-editor', "$script_name.css", array(), $this->plugin->get_version() );
+		wp_enqueue_style('wl-classic-editor', "$script_name.css", array(), $this->plugin->get_version());
 		$this->load_faq_scripts_and_styles();
-		$this->load_faq_settings( self::TINY_MCE );
+		$this->load_faq_settings(self::TINY_MCE);
 	}
 
 	/**
@@ -203,13 +203,13 @@ 
 	private function load_faq_scripts_and_styles() {
 		wp_enqueue_style(
 			'wl-faq-metabox-style',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/faq.css',
+			plugin_dir_url(dirname(__FILE__)).'js/dist/faq.css',
 			array()
 		);
 		Scripts_Helper::enqueue_based_on_wordpress_version(
 			'wl-faq-metabox-script',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/faq',
-			array( 'wp-polyfill' ),
+			plugin_dir_url(dirname(__FILE__)).'js/dist/faq',
+			array('wp-polyfill'),
 			true
 		);
 	}
@@ -221,20 +221,20 @@ 
 	 */
 	public function get_faq_settings() {
 		return array(
-			'restUrl'                 => get_rest_url( NULL, WL_REST_ROUTE_DEFAULT_NAMESPACE . '/faq' ),
+			'restUrl'                 => get_rest_url(NULL, WL_REST_ROUTE_DEFAULT_NAMESPACE.'/faq'),
 			'listBoxId'               => self::FAQ_LIST_BOX_ID,
-			'nonce'                   => wp_create_nonce( 'wp_rest' ),
+			'nonce'                   => wp_create_nonce('wp_rest'),
 			'postId'                  => get_the_ID(),
 			// Translation for warning, error message.
-			'invalidTagMessage'       => sprintf( __( 'Invalid tags %s is present in answer', self::WORDLIFT_TEXT_DOMAIN ), "{INVALID_TAGS}" ),
-			'invalidWordCountMessage' => sprintf( __( 'Answer word count must not exceed %s words', self::WORDLIFT_TEXT_DOMAIN ), "{ANSWER_WORD_COUNT_WARNING_LIMIT}" ),
-			'questionText'            => __( 'Question', self::WORDLIFT_TEXT_DOMAIN ),
-			'answerText'              => __( 'Answer', self::WORDLIFT_TEXT_DOMAIN ),
-			'addQuestionOrAnswerText' => __( 'Add Question / Answer', self::WORDLIFT_TEXT_DOMAIN ),
-			'addQuestionText'         => __( 'Add Question', self::WORDLIFT_TEXT_DOMAIN ),
-			'addAnswerText'           => __( 'Add Answer', self::WORDLIFT_TEXT_DOMAIN ),
-			'noFaqItemsText'          => __( 'No Questions or answers present', self::WORDLIFT_TEXT_DOMAIN ),
-			'updatingText'          => __( 'Updating...', self::WORDLIFT_TEXT_DOMAIN )
+			'invalidTagMessage'       => sprintf(__('Invalid tags %s is present in answer', self::WORDLIFT_TEXT_DOMAIN), "{INVALID_TAGS}"),
+			'invalidWordCountMessage' => sprintf(__('Answer word count must not exceed %s words', self::WORDLIFT_TEXT_DOMAIN), "{ANSWER_WORD_COUNT_WARNING_LIMIT}"),
+			'questionText'            => __('Question', self::WORDLIFT_TEXT_DOMAIN),
+			'answerText'              => __('Answer', self::WORDLIFT_TEXT_DOMAIN),
+			'addQuestionOrAnswerText' => __('Add Question / Answer', self::WORDLIFT_TEXT_DOMAIN),
+			'addQuestionText'         => __('Add Question', self::WORDLIFT_TEXT_DOMAIN),
+			'addAnswerText'           => __('Add Answer', self::WORDLIFT_TEXT_DOMAIN),
+			'noFaqItemsText'          => __('No Questions or answers present', self::WORDLIFT_TEXT_DOMAIN),
+			'updatingText'          => __('Updating...', self::WORDLIFT_TEXT_DOMAIN)
 		);
 	}
 
@@ -243,16 +243,16 @@ 
 	 *
 	 * @param $editor string specifying which text editor needed to be used.
 	 */
-	private function load_faq_settings( $editor ) {
+	private function load_faq_settings($editor) {
 		// This script also provides translations to gutenberg.
-		wp_localize_script( 'wl-faq-metabox-script', '_wlFaqSettings', $this->get_faq_settings() );
+		wp_localize_script('wl-faq-metabox-script', '_wlFaqSettings', $this->get_faq_settings());
 
 		// Enqueue the FAQ style
-		if ( $editor === self::GUTENBERG ) {
+		if ($editor === self::GUTENBERG) {
 			Scripts_Helper::enqueue_based_on_wordpress_version(
 				'wl-faq-gutenberg-plugin',
-				plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/block-editor-faq-plugin',
-				array( 'wp-polyfill' ),
+				plugin_dir_url(dirname(__FILE__)).'js/dist/block-editor-faq-plugin',
+				array('wp-polyfill'),
 				TRUE
 			);
 		}
@@ -266,11 +266,11 @@ 
 	public function enqueue_scripts_gutenberg() {
 		// Load FAQ settings.
 		$this->load_faq_scripts_and_styles();
-		$this->load_faq_settings( self::GUTENBERG );
+		$this->load_faq_settings(self::GUTENBERG);
 
 		wp_register_script(
 			'wl-block-editor',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/block-editor.js',
+			plugin_dir_url(dirname(__FILE__)).'js/dist/block-editor.js',
 			array(
 				'react',
 				'wordlift',
@@ -283,24 +283,24 @@ 
 			),
 			$this->plugin->get_version()
 		);
-		wp_localize_script( 'wl-block-editor', '_wlBlockEditorSettings', array(
-			'root'  => esc_url_raw( rest_url() ),
-			'nonce' => wp_create_nonce( 'wp_rest' )
-		) );
+		wp_localize_script('wl-block-editor', '_wlBlockEditorSettings', array(
+			'root'  => esc_url_raw(rest_url()),
+			'nonce' => wp_create_nonce('wp_rest')
+		));
 
 		/*
 		 * @since 3.25.1 The hook is used by the wp_localize_script to register the _wlEntityTypes global object.
 		 */
 		wp_enqueue_style(
 			'wl-block-editor',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/block-editor.css',
+			plugin_dir_url(dirname(__FILE__)).'js/dist/block-editor.css',
 			array(),
 			$this->plugin->get_version()
 		);
 
 		wp_enqueue_script(
 			'wl-autocomplete-select',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/autocomplete-select.js',
+			plugin_dir_url(dirname(__FILE__)).'js/dist/autocomplete-select.js',
 			array(),
 			$this->plugin->get_version(),
 			TRUE
@@ -308,7 +308,7 @@ 
 
 		wp_enqueue_style(
 			'wl-autocomplete-select',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/autocomplete-select.css',
+			plugin_dir_url(dirname(__FILE__)).'js/dist/autocomplete-select.css',
 			array(),
 			$this->plugin->get_version()
 		);