← All changes | classes/Publisher/EnqueueScript.php +23 -13 3.0.2 → 3.4 View file →

		@@ -6,9 +6,9 @@
6	6
7	7	use WPCoder\Dashboard\DBManager;
8	8	use WPCoder\Dashboard\FolderManager;
9	9	use WPCoder\Optimization\Obfuscator;
10		-use WPCoder\WOW_Plugin;
	10	+use WPCoder\WPCoder;
11	11
12	12	class EnqueueScript {
13	13
14	14	public static function init( $result ): void {
		@@ -16,17 +16,14 @@
16	16	$js = wp_specialchars_decode( $result->js_code, ENT_QUOTES );
17	17
18	18	self::include_scripts( $result );
19	19
20		- if ( ! empty( $js ) && ! empty( $param['inline_js'] ) ) {
21		- self::print_style( $js, $param, $result );
22		- }
23		-
24	20	if ( ! empty( $js ) && empty( $param['inline_js'] ) ) {
25	21	self::include_script( $result, $param );
26	22	}
27	23
28	24
	25	+
29	26	add_filter( 'script_loader_tag', [ __CLASS__, 'add_attribute' ], 20, 2 );
30	27	}
31	28
32	29	public static function add_attribute( $tag, $handle ) {
		@@ -38,13 +35,26 @@
38	35
39	36	return $tag;
40	37	}
41	38
42		- private static function print_style( $js, $param, $result ): void {
	39	+ public static function inline( $result ): void {
	40	+
43	41	if ( is_admin() ) {
44	42	return;
45	43	}
46	44
	45	+ $param = maybe_unserialize( $result->param );
	46	+ $js = wp_specialchars_decode( $result->js_code, ENT_QUOTES );
	47	+
	48	+ if ( empty( $param['inline_js'] ) ) {
	49	+ return;
	50	+ }
	51	+
	52	+ if ( empty( $js ) ) {
	53	+ return;
	54	+ }
	55	+
	56	+
47	57	$minified = ! empty( $param['minified_js'] ) ? $param['minified_js'] : 'obfuscate';
48	58
49	59	if ( $minified === 'obfuscate' ) {
50	60	$packer = new Obfuscator( $js, 'Normal', true, false );
		@@ -54,9 +64,9 @@
54	64	$packer = new Obfuscator( $js, 'None', true, false );
55	65	$js = $packer->pack();
56	66	}
57	67
58		- $slug = WOW_Plugin::SLUG . '-js-' . $result->id . '-inline';
	68	+ $slug = WPCoder::SLUG . '-js-' . $result->id . '-inline';
59	69	echo '<script id="' . esc_attr( $slug ) . '">' . $js . '</script>';
60	70	}
61	71
62	72	private static function include_script( $result, $param ): void {
		@@ -62,10 +72,10 @@
62	72	private static function include_script( $result, $param ): void {
63	73	$url = FolderManager::get_js_url( $result );
64	74	$time = ! empty( $param['time'] ) ? $param['time'] : time();
65	75	$dependency = ! empty( $param['jquery_dependency'] ) ? [] : [ 'jquery' ];
66		- wp_enqueue_script( WOW_Plugin::SLUG . '-script-' . $result->id, $url, $dependency,
67		- WOW_Plugin::VERSION . '_' . $time, true );
	76	+ wp_enqueue_script( WPCoder::SLUG . '-script-' . $result->id, $url, $dependency,
	77	+ WPCoder::info('version') . '_' . $time, true );
68	78	}
69	79
70	80	private static function include_scripts( $result ): void {
71	81	$scripts = self::get_scripts( $result );
		@@ -93,10 +103,10 @@
93	103	for ( $i = 0; $i < $count; $i ++ ) {
94	104	if ( $param['include'][ $i ] === 'js' && ! empty( $param['include_file'][ $i ] ) ) {
95	105	$scripts[] = [
96	106	'url' => $param['include_file'][ $i ],
97		- 'slug' => WOW_Plugin::SLUG . '-' . $result->id . '-js-' . $i,
98		- 'ver' => WOW_Plugin::VERSION . '_' . $time,
	107	+ 'slug' => WPCoder::SLUG . '-' . $result->id . '-js-' . $i,
	108	+ 'ver' => WPCoder::info('version') . '_' . $time,
99	109	];
100	110	}
101	111	}
102	112
		@@ -116,9 +126,9 @@
116	126	$id = $result->id;
117	127	$param = maybe_unserialize( $result->param );
118	128
119	129	if ( ! empty( $param['js_attributes'] ) && ! empty( $result->js_code ) ) {
120		- $scripts[ WOW_Plugin::SLUG . '-script-' . $id ] = $param['js_attributes'];
	130	+ $scripts[ WPCoder::SLUG . '-script-' . $id ] = $param['js_attributes'];
121	131	}
122	132
123	133
124	134	$count = ! empty( $param['include'] ) ? count( $param['include'] ) : 0;
		@@ -130,9 +140,9 @@
130	140	for ( $i = 0; $i < $count; $i ++ ) {
131	141	if ( $param['include'][ $i ] === 'js' && ! empty( $param['include_file'][ $i ] ) ) {
132	142	$attr = ! empty( $param['file_js_att'][ $i ] ) ? $param['file_js_att'][ $i ] : '';
133	143
134		- $scripts[ WOW_Plugin::SLUG . '-' . $id . '-js-' . $i ] = $attr;
	144	+ $scripts[ WPCoder::SLUG . '-' . $id . '-js-' . $i ] = $attr;
135	145	}
136	146	}
137	147	}
138	148