Inspection of "* Dev - Moved the platform.js to the footer." - lightspeeddevelopment/lsx - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 3471a7...c447e1 )

by Warwick

created 2018-10-10 12:37 UTC

Status

Spacing +84 added lines, -84 removed lines patch added patch discarded remove patch

@@ -6,11 +6,11 @@  discard block
 block discarded – undo
  * @subpackage scripts
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! function_exists( 'lsx_scripts' ) ) :
+if ( ! function_exists('lsx_scripts')) :
 
 	/**
 	 * Enqueue scripts, fonts and styles.
@@ -26,9 +26,9 @@  discard block
 block discarded – undo
 
 endif;
 
-add_action( 'wp_enqueue_scripts', 'lsx_scripts' );
+add_action('wp_enqueue_scripts', 'lsx_scripts');
 
-if ( ! function_exists( 'lsx_admin_scripts' ) ) :
+if ( ! function_exists('lsx_admin_scripts')) :
 
 	/**
 	 * Enqueue scripts (admin).
@@ -37,14 +37,14 @@  discard block
 block discarded – undo
 	 * @subpackage scripts
 	 */
 	function lsx_admin_scripts() {
-		wp_enqueue_script( 'lsx-admin', get_template_directory_uri() . '/assets/js/admin/lsx-admin.js', array( 'jquery' ), LSX_VERSION, true );
+		wp_enqueue_script('lsx-admin', get_template_directory_uri() . '/assets/js/admin/lsx-admin.js', array('jquery'), LSX_VERSION, true);
 	}
 
 endif;
 
-add_action( 'admin_enqueue_scripts', 'lsx_admin_scripts' );
+add_action('admin_enqueue_scripts', 'lsx_admin_scripts');
 
-if ( ! function_exists( 'lsx_scripts_add_styles' ) ) :
+if ( ! function_exists('lsx_scripts_add_styles')) :
 
 	/**
 	 * Enqueue styles.
@@ -53,23 +53,23 @@  discard block
 block discarded – undo
 	 * @subpackage scripts
 	 */
 	function lsx_scripts_add_styles() {
-		wp_register_style( 'fontawesome', get_template_directory_uri() . '/assets/css/vendor/font-awesome.css', array(), LSX_VERSION );
-		wp_style_add_data( 'fontawesome', 'rtl', 'replace' );
+		wp_register_style('fontawesome', get_template_directory_uri() . '/assets/css/vendor/font-awesome.css', array(), LSX_VERSION);
+		wp_style_add_data('fontawesome', 'rtl', 'replace');
 
-		wp_register_style( 'bootstrap', get_template_directory_uri() . '/assets/css/vendor/bootstrap.css', array(), LSX_VERSION );
-		wp_style_add_data( 'bootstrap', 'rtl', 'replace' );
+		wp_register_style('bootstrap', get_template_directory_uri() . '/assets/css/vendor/bootstrap.css', array(), LSX_VERSION);
+		wp_style_add_data('bootstrap', 'rtl', 'replace');
 
-		wp_enqueue_style( 'slick', get_template_directory_uri() . '/assets/css/vendor/slick.css', array(), LSX_VERSION, null );
-		wp_enqueue_style( 'slick-lightbox', get_template_directory_uri() . '/assets/css/vendor/slick-lightbox.css', array( 'slick' ), LSX_VERSION, null );
+		wp_enqueue_style('slick', get_template_directory_uri() . '/assets/css/vendor/slick.css', array(), LSX_VERSION, null);
+		wp_enqueue_style('slick-lightbox', get_template_directory_uri() . '/assets/css/vendor/slick-lightbox.css', array('slick'), LSX_VERSION, null);
 
-		wp_enqueue_style( 'lsx_main_style', get_template_directory_uri() . '/style.css', array(), LSX_VERSION );
-		wp_enqueue_style( 'lsx_main', get_template_directory_uri() . '/assets/css/lsx.css', array( 'lsx_main_style', 'fontawesome', 'bootstrap', 'slick', 'slick-lightbox' ), LSX_VERSION );
-		wp_style_add_data( 'lsx_main', 'rtl', 'replace' );
+		wp_enqueue_style('lsx_main_style', get_template_directory_uri() . '/style.css', array(), LSX_VERSION);
+		wp_enqueue_style('lsx_main', get_template_directory_uri() . '/assets/css/lsx.css', array('lsx_main_style', 'fontawesome', 'bootstrap', 'slick', 'slick-lightbox'), LSX_VERSION);
+		wp_style_add_data('lsx_main', 'rtl', 'replace');
 	}
 
 endif;
 
-if ( ! function_exists( 'lsx_scripts_add_fonts' ) ) :
+if ( ! function_exists('lsx_scripts_add_fonts')) :
 
 	/**
 	 * Enqueue fonts.
@@ -80,36 +80,36 @@  discard block
 block discarded – undo
 	function lsx_scripts_add_fonts() {
 		// Font data (full JSON)
 
-		$data_fonts = get_transient( 'lsx_font_data' );
+		$data_fonts = get_transient('lsx_font_data');
 
-		if ( is_customize_preview() || false === $data_fonts ) {
+		if (is_customize_preview() || false === $data_fonts) {
 			$data_fonts_file = get_template_directory() . '/assets/jsons/lsx-fonts.json';
-			$data_fonts = lsx_file_get_contents( $data_fonts_file );
-			$data_fonts = apply_filters( 'lsx_fonts_json', $data_fonts );
+			$data_fonts = lsx_file_get_contents($data_fonts_file);
+			$data_fonts = apply_filters('lsx_fonts_json', $data_fonts);
 		}
 
-		if ( ! empty( $data_fonts ) ) {
-			set_transient( 'lsx_font_data', $data_fonts, ( 5 * 60 ) );
+		if ( ! empty($data_fonts)) {
+			set_transient('lsx_font_data', $data_fonts, (5 * 60));
 		}
 
 		$data_fonts = '{' . $data_fonts . '}';
-		$data_fonts = json_decode( $data_fonts, true );
+		$data_fonts = json_decode($data_fonts, true);
 
 		// Font data (saved)
 
-		$font_saved = get_theme_mod( 'lsx_font', 'lora_noto_sans' );
+		$font_saved = get_theme_mod('lsx_font', 'lora_noto_sans');
 
-		if ( isset( $data_fonts[ $font_saved ] ) ) {
-			$font = $data_fonts[ $font_saved ];
+		if (isset($data_fonts[$font_saved])) {
+			$font = $data_fonts[$font_saved];
 		} else {
 			$font = $data_fonts['lora_noto_sans'];
 		}
 
 		// Font declarations
 
-		$font_declarations = get_transient( 'lsx_font_declarations' );
+		$font_declarations = get_transient('lsx_font_declarations');
 
-		if ( is_customize_preview() || false === $font_declarations ) {
+		if (is_customize_preview() || false === $font_declarations) {
 			$font_declarations = array(
 				'header' => '',
 				'body' => '',
@@ -121,93 +121,93 @@  discard block
 block discarded – undo
 			);
 
 			$font_declaration_placeholder_file = get_template_directory() . '/assets/css/lsx-fonts-placeholder.css';
-			$font_declaration_placeholder = lsx_file_get_contents( $font_declaration_placeholder_file );
+			$font_declaration_placeholder = lsx_file_get_contents($font_declaration_placeholder_file);
 
-			foreach ( $fonts_to_load as $font_to_load_key => $font_to_load ) {
+			foreach ($fonts_to_load as $font_to_load_key => $font_to_load) {
 				$font_title = $font_to_load['title'];
-				$font_title_sanitize = sanitize_title( $font_title );
+				$font_title_sanitize = sanitize_title($font_title);
 
-				$font_data = explode( ':', $font_to_load['location'] );
-				$font_weights = explode( ',', $font_data[1] );
+				$font_data = explode(':', $font_to_load['location']);
+				$font_weights = explode(',', $font_data[1]);
 
-				foreach ( $font_weights as $font_weight_key => $font_weight ) {
+				foreach ($font_weights as $font_weight_key => $font_weight) {
 					$font_style = 'normal';
 
-					if ( preg_match( '/^[0-9]+i$/', $font_weight ) ) {
+					if (preg_match('/^[0-9]+i$/', $font_weight)) {
 						$font_style = 'italic';
-						$font_weight = preg_replace( '/^([0-9]+)(i)$/', '$1', $font_weight );
+						$font_weight = preg_replace('/^([0-9]+)(i)$/', '$1', $font_weight);
 					}
 
 					$font_src = get_template_directory() . '/assets/fonts/' . $font_title_sanitize . '-' . $font_weight . '-' . $font_style;
-					$font_src = apply_filters( 'lsx_fonts_src', $font_src, $font_title_sanitize, $font_weight, $font_style );
+					$font_src = apply_filters('lsx_fonts_src', $font_src, $font_title_sanitize, $font_weight, $font_style);
 
 					$font_src_uri = get_template_directory_uri() . '/assets/fonts/' . $font_title_sanitize . '-' . $font_weight . '-' . $font_style;
-					$font_src_uri = apply_filters( 'lsx_fonts_src_uri', $font_src_uri, $font_title_sanitize, $font_weight, $font_style );
+					$font_src_uri = apply_filters('lsx_fonts_src_uri', $font_src_uri, $font_title_sanitize, $font_weight, $font_style);
 
-					if ( file_exists( $font_src . '.ttf' ) && file_exists( $font_src . '.woff' ) ) {
+					if (file_exists($font_src . '.ttf') && file_exists($font_src . '.woff')) {
 						$font_declaration = $font_declaration_placeholder;
-						$font_declaration = str_replace( '[font-family]', '\'' . $font_title . '\'', $font_declaration );
-						$font_declaration = str_replace( '[font-style]', $font_style, $font_declaration );
-						$font_declaration = str_replace( '[font-weight]', $font_weight, $font_declaration );
-						$font_declaration = str_replace( '[font-src]', $font_src_uri, $font_declaration );
-						$font_declaration = preg_replace( '/(\/\*# ).+( \*\/)/', '', $font_declaration );
+						$font_declaration = str_replace('[font-family]', '\'' . $font_title . '\'', $font_declaration);
+						$font_declaration = str_replace('[font-style]', $font_style, $font_declaration);
+						$font_declaration = str_replace('[font-weight]', $font_weight, $font_declaration);
+						$font_declaration = str_replace('[font-src]', $font_src_uri, $font_declaration);
+						$font_declaration = preg_replace('/(\/\*# ).+( \*\/)/', '', $font_declaration);
 
-						$font_declarations[ $font_to_load_key ] .= $font_declaration;
+						$font_declarations[$font_to_load_key] .= $font_declaration;
 					}
 				}
 			}
 
-			set_transient( 'lsx_font_declarations', $font_declarations, ( 24 * 60 * 60 ) );
+			set_transient('lsx_font_declarations', $font_declarations, (24 * 60 * 60));
 		}
 
 		$http_var = 'http';
 
-		if ( is_ssl() ) {
+		if (is_ssl()) {
 			$http_var .= 's';
 		}
 
-		if ( ! empty( $font_declarations ) && is_array( $font_declarations ) ) {
-			foreach ( $font_declarations as $font_declaration_key => $font_declaration ) {
-				if ( ! empty( $font_declaration ) ) {
-					wp_add_inline_style( 'lsx_main', $font_declaration );
+		if ( ! empty($font_declarations) && is_array($font_declarations)) {
+			foreach ($font_declarations as $font_declaration_key => $font_declaration) {
+				if ( ! empty($font_declaration)) {
+					wp_add_inline_style('lsx_main', $font_declaration);
 				} else {
-					wp_enqueue_style( 'lsx-' . $font_declaration_key . '-font', esc_url( $http_var . '://fonts.googleapis.com/css?family=' . $font[ $font_declaration_key ]['location'] ) );
+					wp_enqueue_style('lsx-' . $font_declaration_key . '-font', esc_url($http_var . '://fonts.googleapis.com/css?family=' . $font[$font_declaration_key]['location']));
 				}
 			}
 		} else {
-			wp_enqueue_style( 'lsx-header-font', esc_url( $http_var . '://fonts.googleapis.com/css?family=' . $font['header']['location'] ) );
-			wp_enqueue_style( 'lsx-body-font', esc_url( $http_var . '://fonts.googleapis.com/css?family=' . $font['body']['location'] ) );
+			wp_enqueue_style('lsx-header-font', esc_url($http_var . '://fonts.googleapis.com/css?family=' . $font['header']['location']));
+			wp_enqueue_style('lsx-body-font', esc_url($http_var . '://fonts.googleapis.com/css?family=' . $font['body']['location']));
 		}
 
 		// Font styles
 
-		$font_styles = get_transient( 'lsx_font_styles' );
+		$font_styles = get_transient('lsx_font_styles');
 
-		if ( is_customize_preview() || false === $font_styles ) {
+		if (is_customize_preview() || false === $font_styles) {
 			$font_styles = '';
 
 			$css_fonts_file = get_template_directory() . '/assets/css/lsx-fonts.css';
-			$css_fonts = lsx_file_get_contents( $css_fonts_file );
-			$css_fonts = apply_filters( 'lsx_fonts_css', $css_fonts );
+			$css_fonts = lsx_file_get_contents($css_fonts_file);
+			$css_fonts = apply_filters('lsx_fonts_css', $css_fonts);
 
-			if ( ! empty( $css_fonts ) ) {
+			if ( ! empty($css_fonts)) {
 				$font_styles = $css_fonts;
-				$font_styles = str_replace( '[font-family-headings]', $font['header']['cssDeclaration'], $font_styles );
-				$font_styles = str_replace( '[font-family-body]', $font['body']['cssDeclaration'], $font_styles );
-				$font_styles = preg_replace( '/(\/\*# ).+( \*\/)/', '', $font_styles );
+				$font_styles = str_replace('[font-family-headings]', $font['header']['cssDeclaration'], $font_styles);
+				$font_styles = str_replace('[font-family-body]', $font['body']['cssDeclaration'], $font_styles);
+				$font_styles = preg_replace('/(\/\*# ).+( \*\/)/', '', $font_styles);
 			}
 
-			set_transient( 'lsx_font_styles', $font_styles, ( 24 * 60 * 60 ) );
+			set_transient('lsx_font_styles', $font_styles, (24 * 60 * 60));
 		}
 
-		if ( ! empty( $font_styles ) ) {
-			wp_add_inline_style( 'lsx_main', $font_styles );
+		if ( ! empty($font_styles)) {
+			wp_add_inline_style('lsx_main', $font_styles);
 		}
 	}
 
 endif;
 
-if ( ! function_exists( 'lsx_scripts_add_scripts' ) ) :
+if ( ! function_exists('lsx_scripts_add_scripts')) :
 
 	/**
 	 * Enqueue scripts.
@@ -216,31 +216,31 @@  discard block
 block discarded – undo
 	 * @subpackage scripts
 	 */
 	function lsx_scripts_add_scripts() {
-		if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
-			wp_enqueue_script( 'comment-reply' );
+		if (is_singular() && comments_open() && get_option('thread_comments')) {
+			wp_enqueue_script('comment-reply');
 		}
 
-		wp_enqueue_script( 'platform', get_template_directory_uri() . '/assets/js/vendor/platform.min.js', array(), LSX_VERSION, true );
-		wp_enqueue_script( 'bootstrap', get_template_directory_uri() . '/assets/js/vendor/bootstrap.min.js', array( 'jquery' ), LSX_VERSION, true );
+		wp_enqueue_script('platform', get_template_directory_uri() . '/assets/js/vendor/platform.min.js', array(), LSX_VERSION, true);
+		wp_enqueue_script('bootstrap', get_template_directory_uri() . '/assets/js/vendor/bootstrap.min.js', array('jquery'), LSX_VERSION, true);
 
-		wp_enqueue_script( 'imagesLoaded', get_template_directory_uri() . '/assets/js/vendor/imagesloaded.pkgd.min.js', array( 'masonry' ), LSX_VERSION, true );
-		wp_enqueue_script( 'scrolltofixed', get_template_directory_uri() . '/assets/js/vendor/jquery-scrolltofixed-min.js', array( 'jquery' ), LSX_VERSION, true );
-		wp_enqueue_script( 'slick', get_template_directory_uri() . '/assets/js/vendor/slick.min.js', array( 'jquery' ), LSX_VERSION, true );
-		wp_enqueue_script( 'slick-lightbox', get_template_directory_uri() . '/assets/js/vendor/slick-lightbox.min.js', array( 'jquery', 'slick' ), LSX_VERSION, true );
-		wp_enqueue_script( 'picturefill', get_template_directory_uri() . '/assets/js/vendor/picturefill.min.js', array(), LSX_VERSION, true );
+		wp_enqueue_script('imagesLoaded', get_template_directory_uri() . '/assets/js/vendor/imagesloaded.pkgd.min.js', array('masonry'), LSX_VERSION, true);
+		wp_enqueue_script('scrolltofixed', get_template_directory_uri() . '/assets/js/vendor/jquery-scrolltofixed-min.js', array('jquery'), LSX_VERSION, true);
+		wp_enqueue_script('slick', get_template_directory_uri() . '/assets/js/vendor/slick.min.js', array('jquery'), LSX_VERSION, true);
+		wp_enqueue_script('slick-lightbox', get_template_directory_uri() . '/assets/js/vendor/slick-lightbox.min.js', array('jquery', 'slick'), LSX_VERSION, true);
+		wp_enqueue_script('picturefill', get_template_directory_uri() . '/assets/js/vendor/picturefill.min.js', array(), LSX_VERSION, true);
 
-		wp_enqueue_script( 'lsx_script', get_template_directory_uri() . '/assets/js/lsx.min.js', array( 'jquery', 'platform', 'bootstrap', 'masonry', 'imagesLoaded', 'scrolltofixed', 'slick', 'slick-lightbox', 'picturefill' ), LSX_VERSION, true );
+		wp_enqueue_script('lsx_script', get_template_directory_uri() . '/assets/js/lsx.min.js', array('jquery', 'platform', 'bootstrap', 'masonry', 'imagesLoaded', 'scrolltofixed', 'slick', 'slick-lightbox', 'picturefill'), LSX_VERSION, true);
 
 		$param_array = array(
-			'columns' => apply_filters( 'lsx_archive_column_number', 3 ),
+			'columns' => apply_filters('lsx_archive_column_number', 3),
 		);
 
-		wp_localize_script( 'lsx_script', 'lsx_params', $param_array );
+		wp_localize_script('lsx_script', 'lsx_params', $param_array);
 	}
 
 endif;
 
-if ( ! function_exists( 'lsx_scripts_child_theme' ) ) :
+if ( ! function_exists('lsx_scripts_child_theme')) :
 
 	/**
 	 * Enqueue scripts and styles (for child theme).
@@ -249,12 +249,12 @@  discard block
 block discarded – undo
 	 * @subpackage scripts
 	 */
 	function lsx_scripts_child_theme() {
-		if ( is_child_theme() && file_exists( get_stylesheet_directory() . '/assets/css/custom.css' ) ) {
-			wp_enqueue_style( 'child-css', get_stylesheet_directory_uri() . '/assets/css/custom.css', array( 'lsx_main' ), LSX_VERSION );
-			wp_style_add_data( 'child-css', 'rtl', 'replace' );
+		if (is_child_theme() && file_exists(get_stylesheet_directory() . '/assets/css/custom.css')) {
+			wp_enqueue_style('child-css', get_stylesheet_directory_uri() . '/assets/css/custom.css', array('lsx_main'), LSX_VERSION);
+			wp_style_add_data('child-css', 'rtl', 'replace');
 		}
 	}
 
 endif;
 
-add_action( 'wp_enqueue_scripts', 'lsx_scripts_child_theme', 1999 );
+add_action('wp_enqueue_scripts', 'lsx_scripts_child_theme', 1999);

Please login to merge, or discard this patch.

		@@ -6,11 +6,11 @@ discard block
		block discarded – undo
6	6	* @subpackage scripts
7	7	*/
8	8
9		-if ( ! defined( 'ABSPATH' ) ) {
	9	+if ( ! defined('ABSPATH')) {
10	10	exit;
11	11	}
12	12
13		-if ( ! function_exists( 'lsx_scripts' ) ) :
	13	+if ( ! function_exists('lsx_scripts')) :
14	14
15	15	/**
16	16	* Enqueue scripts, fonts and styles.
		@@ -26,9 +26,9 @@ discard block
		block discarded – undo
26	26
27	27	endif;
28	28
29		-add_action( 'wp_enqueue_scripts', 'lsx_scripts' );
	29	+add_action('wp_enqueue_scripts', 'lsx_scripts');
30	30
31		-if ( ! function_exists( 'lsx_admin_scripts' ) ) :
	31	+if ( ! function_exists('lsx_admin_scripts')) :
32	32
33	33	/**
34	34	* Enqueue scripts (admin).
		@@ -37,14 +37,14 @@ discard block
		block discarded – undo
37	37	* @subpackage scripts
38	38	*/
39	39	function lsx_admin_scripts() {
40		- wp_enqueue_script( 'lsx-admin', get_template_directory_uri() . '/assets/js/admin/lsx-admin.js', array( 'jquery' ), LSX_VERSION, true );
	40	+ wp_enqueue_script('lsx-admin', get_template_directory_uri() . '/assets/js/admin/lsx-admin.js', array('jquery'), LSX_VERSION, true);
41	41	}
42	42
43	43	endif;
44	44
45		-add_action( 'admin_enqueue_scripts', 'lsx_admin_scripts' );
	45	+add_action('admin_enqueue_scripts', 'lsx_admin_scripts');
46	46
47		-if ( ! function_exists( 'lsx_scripts_add_styles' ) ) :
	47	+if ( ! function_exists('lsx_scripts_add_styles')) :
48	48
49	49	/**
50	50	* Enqueue styles.
		@@ -53,23 +53,23 @@ discard block
		block discarded – undo
53	53	* @subpackage scripts
54	54	*/
55	55	function lsx_scripts_add_styles() {
56		- wp_register_style( 'fontawesome', get_template_directory_uri() . '/assets/css/vendor/font-awesome.css', array(), LSX_VERSION );
57		- wp_style_add_data( 'fontawesome', 'rtl', 'replace' );
	56	+ wp_register_style('fontawesome', get_template_directory_uri() . '/assets/css/vendor/font-awesome.css', array(), LSX_VERSION);
	57	+ wp_style_add_data('fontawesome', 'rtl', 'replace');
58	58
59		- wp_register_style( 'bootstrap', get_template_directory_uri() . '/assets/css/vendor/bootstrap.css', array(), LSX_VERSION );
60		- wp_style_add_data( 'bootstrap', 'rtl', 'replace' );
	59	+ wp_register_style('bootstrap', get_template_directory_uri() . '/assets/css/vendor/bootstrap.css', array(), LSX_VERSION);
	60	+ wp_style_add_data('bootstrap', 'rtl', 'replace');
61	61
62		- wp_enqueue_style( 'slick', get_template_directory_uri() . '/assets/css/vendor/slick.css', array(), LSX_VERSION, null );
63		- wp_enqueue_style( 'slick-lightbox', get_template_directory_uri() . '/assets/css/vendor/slick-lightbox.css', array( 'slick' ), LSX_VERSION, null );
	62	+ wp_enqueue_style('slick', get_template_directory_uri() . '/assets/css/vendor/slick.css', array(), LSX_VERSION, null);
	63	+ wp_enqueue_style('slick-lightbox', get_template_directory_uri() . '/assets/css/vendor/slick-lightbox.css', array('slick'), LSX_VERSION, null);
64	64
65		- wp_enqueue_style( 'lsx_main_style', get_template_directory_uri() . '/style.css', array(), LSX_VERSION );
66		- wp_enqueue_style( 'lsx_main', get_template_directory_uri() . '/assets/css/lsx.css', array( 'lsx_main_style', 'fontawesome', 'bootstrap', 'slick', 'slick-lightbox' ), LSX_VERSION );
67		- wp_style_add_data( 'lsx_main', 'rtl', 'replace' );
	65	+ wp_enqueue_style('lsx_main_style', get_template_directory_uri() . '/style.css', array(), LSX_VERSION);
	66	+ wp_enqueue_style('lsx_main', get_template_directory_uri() . '/assets/css/lsx.css', array('lsx_main_style', 'fontawesome', 'bootstrap', 'slick', 'slick-lightbox'), LSX_VERSION);
	67	+ wp_style_add_data('lsx_main', 'rtl', 'replace');
68	68	}
69	69
70	70	endif;
71	71
72		-if ( ! function_exists( 'lsx_scripts_add_fonts' ) ) :
	72	+if ( ! function_exists('lsx_scripts_add_fonts')) :
73	73
74	74	/**
75	75	* Enqueue fonts.
		@@ -80,36 +80,36 @@ discard block
		block discarded – undo
80	80	function lsx_scripts_add_fonts() {
81	81	// Font data (full JSON)
82	82
83		- $data_fonts = get_transient( 'lsx_font_data' );
	83	+ $data_fonts = get_transient('lsx_font_data');
84	84
85		- if ( is_customize_preview() \|\| false === $data_fonts ) {
	85	+ if (is_customize_preview() \|\| false === $data_fonts) {
86	86	$data_fonts_file = get_template_directory() . '/assets/jsons/lsx-fonts.json';
87		- $data_fonts = lsx_file_get_contents( $data_fonts_file );
88		- $data_fonts = apply_filters( 'lsx_fonts_json', $data_fonts );
	87	+ $data_fonts = lsx_file_get_contents($data_fonts_file);
	88	+ $data_fonts = apply_filters('lsx_fonts_json', $data_fonts);
89	89	}
90	90
91		- if ( ! empty( $data_fonts ) ) {
92		- set_transient( 'lsx_font_data', $data_fonts, ( 5 * 60 ) );
	91	+ if ( ! empty($data_fonts)) {
	92	+ set_transient('lsx_font_data', $data_fonts, (5 * 60));
93	93	}
94	94
95	95	$data_fonts = '{' . $data_fonts . '}';
96		- $data_fonts = json_decode( $data_fonts, true );
	96	+ $data_fonts = json_decode($data_fonts, true);
97	97
98	98	// Font data (saved)
99	99
100		- $font_saved = get_theme_mod( 'lsx_font', 'lora_noto_sans' );
	100	+ $font_saved = get_theme_mod('lsx_font', 'lora_noto_sans');
101	101
102		- if ( isset( $data_fonts[ $font_saved ] ) ) {
103		- $font = $data_fonts[ $font_saved ];
	102	+ if (isset($data_fonts[$font_saved])) {
	103	+ $font = $data_fonts[$font_saved];
104	104	} else {
105	105	$font = $data_fonts['lora_noto_sans'];
106	106	}
107	107
108	108	// Font declarations
109	109
110		- $font_declarations = get_transient( 'lsx_font_declarations' );
	110	+ $font_declarations = get_transient('lsx_font_declarations');
111	111
112		- if ( is_customize_preview() \|\| false === $font_declarations ) {
	112	+ if (is_customize_preview() \|\| false === $font_declarations) {
113	113	$font_declarations = array(
114	114	'header' => '',
115	115	'body' => '',
		@@ -121,93 +121,93 @@ discard block
		block discarded – undo
121	121	);
122	122
123	123	$font_declaration_placeholder_file = get_template_directory() . '/assets/css/lsx-fonts-placeholder.css';
124		- $font_declaration_placeholder = lsx_file_get_contents( $font_declaration_placeholder_file );
	124	+ $font_declaration_placeholder = lsx_file_get_contents($font_declaration_placeholder_file);
125	125
126		- foreach ( $fonts_to_load as $font_to_load_key => $font_to_load ) {
	126	+ foreach ($fonts_to_load as $font_to_load_key => $font_to_load) {
127	127	$font_title = $font_to_load['title'];
128		- $font_title_sanitize = sanitize_title( $font_title );
	128	+ $font_title_sanitize = sanitize_title($font_title);
129	129
130		- $font_data = explode( ':', $font_to_load['location'] );
131		- $font_weights = explode( ',', $font_data[1] );
	130	+ $font_data = explode(':', $font_to_load['location']);
	131	+ $font_weights = explode(',', $font_data[1]);
132	132
133		- foreach ( $font_weights as $font_weight_key => $font_weight ) {
	133	+ foreach ($font_weights as $font_weight_key => $font_weight) {
134	134	$font_style = 'normal';
135	135
136		- if ( preg_match( '/^[0-9]+i$/', $font_weight ) ) {
	136	+ if (preg_match('/^[0-9]+i$/', $font_weight)) {
137	137	$font_style = 'italic';
138		- $font_weight = preg_replace( '/^([0-9]+)(i)$/', '$1', $font_weight );
	138	+ $font_weight = preg_replace('/^([0-9]+)(i)$/', '$1', $font_weight);
139	139	}
140	140
141	141	$font_src = get_template_directory() . '/assets/fonts/' . $font_title_sanitize . '-' . $font_weight . '-' . $font_style;
142		- $font_src = apply_filters( 'lsx_fonts_src', $font_src, $font_title_sanitize, $font_weight, $font_style );
	142	+ $font_src = apply_filters('lsx_fonts_src', $font_src, $font_title_sanitize, $font_weight, $font_style);
143	143
144	144	$font_src_uri = get_template_directory_uri() . '/assets/fonts/' . $font_title_sanitize . '-' . $font_weight . '-' . $font_style;
145		- $font_src_uri = apply_filters( 'lsx_fonts_src_uri', $font_src_uri, $font_title_sanitize, $font_weight, $font_style );
	145	+ $font_src_uri = apply_filters('lsx_fonts_src_uri', $font_src_uri, $font_title_sanitize, $font_weight, $font_style);
146	146
147		- if ( file_exists( $font_src . '.ttf' ) && file_exists( $font_src . '.woff' ) ) {
	147	+ if (file_exists($font_src . '.ttf') && file_exists($font_src . '.woff')) {
148	148	$font_declaration = $font_declaration_placeholder;
149		- $font_declaration = str_replace( '[font-family]', '\'' . $font_title . '\'', $font_declaration );
150		- $font_declaration = str_replace( '[font-style]', $font_style, $font_declaration );
151		- $font_declaration = str_replace( '[font-weight]', $font_weight, $font_declaration );
152		- $font_declaration = str_replace( '[font-src]', $font_src_uri, $font_declaration );
153		- $font_declaration = preg_replace( '/(\/\# ).+( \\/)/', '', $font_declaration );
	149	+ $font_declaration = str_replace('[font-family]', '\'' . $font_title . '\'', $font_declaration);
	150	+ $font_declaration = str_replace('[font-style]', $font_style, $font_declaration);
	151	+ $font_declaration = str_replace('[font-weight]', $font_weight, $font_declaration);
	152	+ $font_declaration = str_replace('[font-src]', $font_src_uri, $font_declaration);
	153	+ $font_declaration = preg_replace('/(\/\# ).+( \\/)/', '', $font_declaration);
154	154
155		- $font_declarations[ $font_to_load_key ] .= $font_declaration;
	155	+ $font_declarations[$font_to_load_key] .= $font_declaration;
156	156	}
157	157	}
158	158	}
159	159
160		- set_transient( 'lsx_font_declarations', $font_declarations, ( 24 * 60 * 60 ) );
	160	+ set_transient('lsx_font_declarations', $font_declarations, (24 * 60 * 60));
161	161	}
162	162
163	163	$http_var = 'http';
164	164
165		- if ( is_ssl() ) {
	165	+ if (is_ssl()) {
166	166	$http_var .= 's';
167	167	}
168	168
169		- if ( ! empty( $font_declarations ) && is_array( $font_declarations ) ) {
170		- foreach ( $font_declarations as $font_declaration_key => $font_declaration ) {
171		- if ( ! empty( $font_declaration ) ) {
172		- wp_add_inline_style( 'lsx_main', $font_declaration );
	169	+ if ( ! empty($font_declarations) && is_array($font_declarations)) {
	170	+ foreach ($font_declarations as $font_declaration_key => $font_declaration) {
	171	+ if ( ! empty($font_declaration)) {
	172	+ wp_add_inline_style('lsx_main', $font_declaration);
173	173	} else {
174		- wp_enqueue_style( 'lsx-' . $font_declaration_key . '-font', esc_url( $http_var . '://fonts.googleapis.com/css?family=' . $font[ $font_declaration_key ]['location'] ) );
	174	+ wp_enqueue_style('lsx-' . $font_declaration_key . '-font', esc_url($http_var . '://fonts.googleapis.com/css?family=' . $font[$font_declaration_key]['location']));
175	175	}
176	176	}
177	177	} else {
178		- wp_enqueue_style( 'lsx-header-font', esc_url( $http_var . '://fonts.googleapis.com/css?family=' . $font['header']['location'] ) );
179		- wp_enqueue_style( 'lsx-body-font', esc_url( $http_var . '://fonts.googleapis.com/css?family=' . $font['body']['location'] ) );
	178	+ wp_enqueue_style('lsx-header-font', esc_url($http_var . '://fonts.googleapis.com/css?family=' . $font['header']['location']));
	179	+ wp_enqueue_style('lsx-body-font', esc_url($http_var . '://fonts.googleapis.com/css?family=' . $font['body']['location']));
180	180	}
181	181
182	182	// Font styles
183	183
184		- $font_styles = get_transient( 'lsx_font_styles' );
	184	+ $font_styles = get_transient('lsx_font_styles');
185	185
186		- if ( is_customize_preview() \|\| false === $font_styles ) {
	186	+ if (is_customize_preview() \|\| false === $font_styles) {
187	187	$font_styles = '';
188	188
189	189	$css_fonts_file = get_template_directory() . '/assets/css/lsx-fonts.css';
190		- $css_fonts = lsx_file_get_contents( $css_fonts_file );
191		- $css_fonts = apply_filters( 'lsx_fonts_css', $css_fonts );
	190	+ $css_fonts = lsx_file_get_contents($css_fonts_file);
	191	+ $css_fonts = apply_filters('lsx_fonts_css', $css_fonts);
192	192
193		- if ( ! empty( $css_fonts ) ) {
	193	+ if ( ! empty($css_fonts)) {
194	194	$font_styles = $css_fonts;
195		- $font_styles = str_replace( '[font-family-headings]', $font['header']['cssDeclaration'], $font_styles );
196		- $font_styles = str_replace( '[font-family-body]', $font['body']['cssDeclaration'], $font_styles );
197		- $font_styles = preg_replace( '/(\/\# ).+( \\/)/', '', $font_styles );
	195	+ $font_styles = str_replace('[font-family-headings]', $font['header']['cssDeclaration'], $font_styles);
	196	+ $font_styles = str_replace('[font-family-body]', $font['body']['cssDeclaration'], $font_styles);
	197	+ $font_styles = preg_replace('/(\/\# ).+( \\/)/', '', $font_styles);
198	198	}
199	199
200		- set_transient( 'lsx_font_styles', $font_styles, ( 24 * 60 * 60 ) );
	200	+ set_transient('lsx_font_styles', $font_styles, (24 * 60 * 60));
201	201	}
202	202
203		- if ( ! empty( $font_styles ) ) {
204		- wp_add_inline_style( 'lsx_main', $font_styles );
	203	+ if ( ! empty($font_styles)) {
	204	+ wp_add_inline_style('lsx_main', $font_styles);
205	205	}
206	206	}
207	207
208	208	endif;
209	209
210		-if ( ! function_exists( 'lsx_scripts_add_scripts' ) ) :
	210	+if ( ! function_exists('lsx_scripts_add_scripts')) :
211	211
212	212	/**
213	213	* Enqueue scripts.
		@@ -216,31 +216,31 @@ discard block
		block discarded – undo
216	216	* @subpackage scripts
217	217	*/
218	218	function lsx_scripts_add_scripts() {
219		- if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
220		- wp_enqueue_script( 'comment-reply' );
	219	+ if (is_singular() && comments_open() && get_option('thread_comments')) {
	220	+ wp_enqueue_script('comment-reply');
221	221	}
222	222
223		- wp_enqueue_script( 'platform', get_template_directory_uri() . '/assets/js/vendor/platform.min.js', array(), LSX_VERSION, true );
224		- wp_enqueue_script( 'bootstrap', get_template_directory_uri() . '/assets/js/vendor/bootstrap.min.js', array( 'jquery' ), LSX_VERSION, true );
	223	+ wp_enqueue_script('platform', get_template_directory_uri() . '/assets/js/vendor/platform.min.js', array(), LSX_VERSION, true);
	224	+ wp_enqueue_script('bootstrap', get_template_directory_uri() . '/assets/js/vendor/bootstrap.min.js', array('jquery'), LSX_VERSION, true);
225	225
226		- wp_enqueue_script( 'imagesLoaded', get_template_directory_uri() . '/assets/js/vendor/imagesloaded.pkgd.min.js', array( 'masonry' ), LSX_VERSION, true );
227		- wp_enqueue_script( 'scrolltofixed', get_template_directory_uri() . '/assets/js/vendor/jquery-scrolltofixed-min.js', array( 'jquery' ), LSX_VERSION, true );
228		- wp_enqueue_script( 'slick', get_template_directory_uri() . '/assets/js/vendor/slick.min.js', array( 'jquery' ), LSX_VERSION, true );
229		- wp_enqueue_script( 'slick-lightbox', get_template_directory_uri() . '/assets/js/vendor/slick-lightbox.min.js', array( 'jquery', 'slick' ), LSX_VERSION, true );
230		- wp_enqueue_script( 'picturefill', get_template_directory_uri() . '/assets/js/vendor/picturefill.min.js', array(), LSX_VERSION, true );
	226	+ wp_enqueue_script('imagesLoaded', get_template_directory_uri() . '/assets/js/vendor/imagesloaded.pkgd.min.js', array('masonry'), LSX_VERSION, true);
	227	+ wp_enqueue_script('scrolltofixed', get_template_directory_uri() . '/assets/js/vendor/jquery-scrolltofixed-min.js', array('jquery'), LSX_VERSION, true);
	228	+ wp_enqueue_script('slick', get_template_directory_uri() . '/assets/js/vendor/slick.min.js', array('jquery'), LSX_VERSION, true);
	229	+ wp_enqueue_script('slick-lightbox', get_template_directory_uri() . '/assets/js/vendor/slick-lightbox.min.js', array('jquery', 'slick'), LSX_VERSION, true);
	230	+ wp_enqueue_script('picturefill', get_template_directory_uri() . '/assets/js/vendor/picturefill.min.js', array(), LSX_VERSION, true);
231	231
232		- wp_enqueue_script( 'lsx_script', get_template_directory_uri() . '/assets/js/lsx.min.js', array( 'jquery', 'platform', 'bootstrap', 'masonry', 'imagesLoaded', 'scrolltofixed', 'slick', 'slick-lightbox', 'picturefill' ), LSX_VERSION, true );
	232	+ wp_enqueue_script('lsx_script', get_template_directory_uri() . '/assets/js/lsx.min.js', array('jquery', 'platform', 'bootstrap', 'masonry', 'imagesLoaded', 'scrolltofixed', 'slick', 'slick-lightbox', 'picturefill'), LSX_VERSION, true);
233	233
234	234	$param_array = array(
235		- 'columns' => apply_filters( 'lsx_archive_column_number', 3 ),
	235	+ 'columns' => apply_filters('lsx_archive_column_number', 3),
236	236	);
237	237
238		- wp_localize_script( 'lsx_script', 'lsx_params', $param_array );
	238	+ wp_localize_script('lsx_script', 'lsx_params', $param_array);
239	239	}
240	240
241	241	endif;
242	242
243		-if ( ! function_exists( 'lsx_scripts_child_theme' ) ) :
	243	+if ( ! function_exists('lsx_scripts_child_theme')) :
244	244
245	245	/**
246	246	* Enqueue scripts and styles (for child theme).
		@@ -249,12 +249,12 @@ discard block
		block discarded – undo
249	249	* @subpackage scripts
250	250	*/
251	251	function lsx_scripts_child_theme() {
252		- if ( is_child_theme() && file_exists( get_stylesheet_directory() . '/assets/css/custom.css' ) ) {
253		- wp_enqueue_style( 'child-css', get_stylesheet_directory_uri() . '/assets/css/custom.css', array( 'lsx_main' ), LSX_VERSION );
254		- wp_style_add_data( 'child-css', 'rtl', 'replace' );
	252	+ if (is_child_theme() && file_exists(get_stylesheet_directory() . '/assets/css/custom.css')) {
	253	+ wp_enqueue_style('child-css', get_stylesheet_directory_uri() . '/assets/css/custom.css', array('lsx_main'), LSX_VERSION);
	254	+ wp_style_add_data('child-css', 'rtl', 'replace');
255	255	}
256	256	}
257	257
258	258	endif;
259	259
260		-add_action( 'wp_enqueue_scripts', 'lsx_scripts_child_theme', 1999 );
	260	+add_action('wp_enqueue_scripts', 'lsx_scripts_child_theme', 1999);

lightspeeddevelopment / lsx

Push — master ( 3471a7...c447e1 )

Status

Category

Spacing +84 added lines, -84 removed lines patch added patch discarded remove patch