← All changes | app/Controllers/AssetsController.php +108 -29 2.1.0 → 2.6.5 View file →

		@@ -87,13 +87,18 @@
87	87	* @return object
88	88	*/
89	89	private function get_public_styles() {
90	90	$rtl_suffix = is_rtl() ? '-rtl' : '';
	91	+
91	92	$this->styles[] = [
	93	+ 'handle' => 'rtsb-odometer',
	94	+ 'src' => rtsb()->get_assets_uri( 'vendor/odometer/css/odometer.min.css' ),
	95	+ ];
	96	+
	97	+ $this->styles[] = [
92	98	'handle' => 'rtsb-fonts',
93	99	'src' => rtsb()->get_assets_uri( 'css/frontend/rtsb-fonts.css' ),
94	100	];
95		-
96	101	if ( rtsb()->has_pro() ) {
97	102	$this->styles[] = [
98	103	'handle' => 'rtsb-noui-slider',
99	104	'src' => rtsbpro()->get_assets_uri( 'vendors/nouislider/nouislider.min.css' ),
		@@ -99,17 +104,28 @@
99	104	'src' => rtsbpro()->get_assets_uri( 'vendors/nouislider/nouislider.min.css' ),
100	105	];
101	106	}
102	107
	108	+ $pro_version = defined( 'RTSBPRO_VERSION' ) ? RTSBPRO_VERSION : '0';
	109	+ $addon_condition = version_compare( $pro_version, '1.9.0', '<' );
	110	+
	111	+ if ( $addon_condition ) {
	112	+ $this->styles[] = [
	113	+ 'handle' => 'rtsb-general-addons',
	114	+ 'src' => rtsb()->get_assets_uri( 'css/frontend/general-addons' . $rtl_suffix . '.css' ),
	115	+ ];
	116	+ }
103	117	$this->styles[] = [
104	118	'handle' => 'rtsb-frontend',
105	119	'src' => rtsb()->get_assets_uri( 'css/frontend/frontend' . $rtl_suffix . '.css' ),
106	120	];
107	121
	122	+ /*
108	123	$this->styles[] = [
109	124	'handle' => 'swiper',
110	125	'src' => rtsb()->get_assets_uri( 'vendor/swiper/css/swiper-bundle.min.css' ),
111	126	];
	127	+ */
112	128
113	129	if ( BuilderFns::is_builder_preview() && 'elementor' == Fns::page_edit_with( get_the_ID() ) ) {
114	130	$this->styles[] = [
115	131	'handle' => 'photoswipe',
		@@ -161,8 +177,20 @@
161	177	'src' => esc_url( $default_swiper_path ),
162	178	'deps' => [ 'jquery' ],
163	179	'footer' => true,
164	180	];
	181	+ $this->scripts[] = [
	182	+ 'handle' => 'rtsb-waypoints',
	183	+ 'src' => rtsb()->get_assets_uri( 'vendor/waypoints/js/jquery.waypoints.min.js' ),
	184	+ 'deps' => [ 'jquery' ],
	185	+ 'footer' => true,
	186	+ ];
	187	+ $this->scripts[] = [
	188	+ 'handle' => 'rtsb-odometer',
	189	+ 'src' => rtsb()->get_assets_uri( 'vendor/odometer/js/odometer.min.js' ),
	190	+ 'deps' => [ 'jquery' ],
	191	+ 'footer' => true,
	192	+ ];
165	193
166	194	$this->scripts[] = [
167	195	'handle' => 'rtsb-imagesloaded',
168	196	'src' => rtsb()->get_assets_uri( 'vendor/isotope/imagesloaded.pkgd.min.js' ),
		@@ -228,8 +256,22 @@
228	256	'src' => rtsbpro()->get_assets_uri( 'vendors/sticky-sidebar/sticky-sidebar.min.js' ),
229	257	'deps' => [ 'jquery' ],
230	258	'footer' => true,
231	259	];
	260	+
	261	+ $this->scripts[] = [
	262	+ 'handle' => 'rtsb-popper',
	263	+ 'src' => rtsbpro()->get_assets_uri( 'vendors/tippy/popper.min.js' ),
	264	+ 'deps' => [ 'jquery' ],
	265	+ 'footer' => true,
	266	+ ];
	267	+
	268	+ $this->scripts[] = [
	269	+ 'handle' => 'rtsb-tippy',
	270	+ 'src' => rtsbpro()->get_assets_uri( 'vendors/tippy/tippy.min.js' ),
	271	+ 'deps' => [ 'jquery', 'rtsb-popper' ],
	272	+ 'footer' => true,
	273	+ ];
232	274	}
233	275
234	276	$this->scripts[] = [
235	277	'handle' => 'rtsb-public',
		@@ -269,8 +311,9 @@
269	311	/**
270	312	* Register scripts.
271	313	*/
272	314	$this->register_public_scripts();
	315	+ // wp_enqueue_style( 'swiper' );
273	316	/**
274	317	* Enqueue scripts.
275	318	*/
276	319	if ( BuilderFns::is_builder_preview() && 'elementor' === Fns::page_edit_with( get_the_ID() ) ) {
		@@ -276,9 +319,8 @@
276	319	if ( BuilderFns::is_builder_preview() && 'elementor' === Fns::page_edit_with( get_the_ID() ) ) {
277	320	/**
278	321	* Styles.
279	322	*/
280		- wp_enqueue_style( 'swiper' );
281	323	wp_enqueue_style( 'photoswipe' );
282	324	wp_enqueue_style( 'photoswipe-default-skin' );
283	325	wp_enqueue_style( 'elementor-editor-style-fix' );
284	326	wp_enqueue_style( 'woocommerce-general' );
		@@ -322,18 +364,20 @@
322	364	wp_localize_script(
323	365	'rtsb-public',
324	366	'rtsbPublicParams',
325	367	[
326		- 'ajaxUrl' => esc_url( self::$ajaxurl ),
327		- 'homeurl' => home_url(),
328		- 'wcCartUrl' => wc_get_cart_url(),
329		- 'addedToCartText' => esc_html__( 'Product Added', 'shopbuilder' ),
330		- 'browseCartText' => esc_html__( 'Browse Cart', 'shopbuilder' ),
331		- 'noProductsText' => apply_filters( 'rtsb/global/no_products_text', esc_html__( 'No more products to load', 'shopbuilder' ) ),
332		- 'notice' => [
	368	+ 'ajaxUrl' => esc_url( self::$ajaxurl ),
	369	+ 'homeurl' => home_url(),
	370	+ 'wcCartUrl' => wc_get_cart_url(),
	371	+ 'addedToCartText' => esc_html__( 'Product Added', 'shopbuilder' ),
	372	+ 'singleCartToastrText' => esc_html__( 'Successfully Added', 'shopbuilder' ),
	373	+ 'singleCartBtnText' => apply_filters( 'rtsb/global/single_add_to_cart_success', esc_html__( 'Added to Cart', 'shopbuilder' ) ),
	374	+ 'browseCartText' => esc_html__( 'Browse Cart', 'shopbuilder' ),
	375	+ 'noProductsText' => apply_filters( 'rtsb/global/no_products_text', esc_html__( 'No more products to load', 'shopbuilder' ) ),
	376	+ 'notice' => [
333	377	'position' => Fns::get_option( 'general', 'notification', 'notification_position', 'center-center' ),
334	378	],
335		- rtsb()->nonceId => wp_create_nonce( rtsb()->nonceText ),
	379	+ rtsb()->nonceId => wp_create_nonce( rtsb()->nonceText ),
336	380	]
337	381	);
338	382	}
339	383
		@@ -346,9 +390,20 @@
346	390	/**
347	391	* Styles.
348	392	*/
349	393	wp_register_style( 'rtsb-admin-app', rtsb()->get_assets_uri( 'css/backend/admin-settings.css' ), '', $this->version );
350		- wp_register_style( 'rtsb-admin-global', rtsb()->get_assets_uri( 'css/backend/admin-global.css' ), '', $this->version );
	394	+ wp_register_style( 'rtsb-fonts', rtsb()->get_assets_uri( 'css/frontend/rtsb-fonts.css' ), '', $this->version );
	395	+
	396	+ $current_screen = get_current_screen();
	397	+
	398	+ if ( 'edit-rtsb_builder' === $current_screen->id ) {
	399	+ if ( ! function_exists( 'woocommerce_get_asset_url' ) ) {
	400	+ include_once WC_ABSPATH . 'includes/wc-template-functions.php';
	401	+ }
	402	+
	403	+ wp_deregister_style( 'select2' );
	404	+ wp_register_style( 'select2', plugins_url( 'assets/css/select2.css', WC_PLUGIN_FILE ) ); // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion
	405	+ }
351	406	wp_register_style( 'rtsb-templatebuilder', rtsb()->get_assets_uri( 'css/backend/template-builder.css' ), '', $this->version );
352	407
353	408	/**
354	409	* Scripts.
		@@ -354,9 +409,8 @@
354	409	* Scripts.
355	410	*/
356	411	wp_register_script( 'rtsb-admin-app', rtsb()->get_assets_uri( 'js/backend/admin-settings.js' ), '', $this->version, true );
357	412	wp_register_script( 'rtsb-templatebuilder', rtsb()->get_assets_uri( 'js/backend/template-builder.js' ), '', $this->version, true );
358		-
359	413	}
360	414
361	415	/**
362	416	* Enqueues admin scripts.
		@@ -365,14 +419,40 @@
365	419	*
366	420	* @return void
367	421	*/
368	422	public function enqueue_backend_scripts( $hook ) {
	423	+ ob_start(); ?>
	424	+ #adminmenu .toplevel_page_rtsb .wp-menu-image img {
	425	+ width: auto;
	426	+ height: 22px;
	427	+ padding: 4px 0;
	428	+ box-sizing: content-box;
	429	+ }
	430	+ .post-type-rtsb_builder li#wp-admin-bar-WPML_ALS_all,
	431	+ .post-type-rtsb_builder li.language_all{
	432	+ display: none;
	433	+ }
369	434
370		- wp_enqueue_style( 'rtsb-admin-global' );
	435	+ <?php
	436	+ $admin_global_style = ob_get_clean();
	437	+ // Speed Optimization.
	438	+ wp_add_inline_style( 'admin-menu', $admin_global_style );
	439	+ // wp_enqueue_style( 'rtsb-admin-global' );
371	440
372	441	global $pagenow;
373	442
374		- if ( 'admin.php' === $pagenow && ! empty( $_GET['page'] ) && 'rtsb-settings' === $_GET['page'] ) {
	443	+ $whitelisted_pages = [ 'rtsb-settings', 'rtsb-get-help', 'rtsb-themes' ];
	444	+ $current_page = ! empty( $_GET['page'] ) ? sanitize_text_field( wp_unslash( $_GET['page'] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Recommended
	445	+
	446	+ if ( 'admin.php' === $pagenow && ! empty( $_GET['page'] ) && in_array( $current_page, $whitelisted_pages, true ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
	447	+ /**
	448	+ * Styles.
	449	+ */
	450	+ wp_enqueue_style( 'rtsb-admin-app' );
	451	+ wp_enqueue_style( 'rtsb-fonts' );
	452	+ }
	453	+
	454	+ if ( 'admin.php' === $pagenow && ! empty( $_GET['page'] ) && 'rtsb-settings' === $_GET['page'] ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
375	455	// Elementor Console Error Fixed For "rtsb-settings" Page.
376	456	wp_dequeue_script( 'elementor-admin-top-bar' );
377	457	wp_dequeue_script( 'elementor-common' );
378	458	wp_dequeue_script( 'elementor-dev-tools' );
		@@ -387,13 +467,8 @@
387	467	wp_dequeue_style( 'e-theme-ui-light' );
388	468	wp_dequeue_style( 'elementor-common' );
389	469
390	470	/**
391		- * Styles.
392		- */
393		- wp_enqueue_style( 'rtsb-admin-app' );
394		-
395		- /**
396	471	* Scripts.
397	472	*/
398	473	wp_enqueue_script( 'updates' );
399	474	wp_enqueue_script( 'rtsb-admin-app' );
		@@ -400,16 +475,20 @@
400	475	wp_localize_script(
401	476	'rtsb-admin-app',
402	477	'rtsbParams',
403	478	[
404		- 'ajaxurl' => esc_url( self::$ajaxurl ),
405		- 'homeurl' => home_url(),
406		- 'restApiUrl' => esc_url_raw( rest_url() ),
407		- 'rest_nonce' => wp_create_nonce( 'wp_rest' ),
408		- 'nonce' => wp_create_nonce( rtsb()->nonceText ),
409		- 'sections' => Settings::instance()->get_sections(),
410		- 'pages' => Fns::get_pages(),
411		- 'hasPro' => rtsb()->has_pro() ? 'yes' : 'no'
	479	+ 'ajaxurl' => esc_url( self::$ajaxurl ),
	480	+ 'homeurl' => home_url(),
	481	+ 'adminLogo' => rtsb()->get_assets_uri( 'images/icon/ShopBuilder-Logo.svg' ),
	482	+ 'restApiUrl' => esc_url_raw( rest_url() ),
	483	+ 'rest_nonce' => wp_create_nonce( 'wp_rest' ),
	484	+ 'nonce' => wp_create_nonce( rtsb()->nonceText ),
	485	+ 'pages' => Fns::get_pages(),
	486	+ 'hasPro' => rtsb()->has_pro() ? 'yes' : 'no',
	487	+ 'updateRates' => esc_html__( 'Update All Rates', 'shopbuilder' ),
	488	+ 'sections' => Settings::instance()->get_sections(),
	489	+ 'userRoles' => Fns::get_all_user_roles(),
	490	+ 'hasElementor' => defined( 'ELEMENTOR_VERSION' ),
412	491	]
413	492	);
414	493	} else {
415	494	$current_screen = get_current_screen();
		@@ -422,9 +501,9 @@
422	501	* Styles.
423	502	*/
424	503	wp_enqueue_style( 'rtsb-templatebuilder' );
425	504
426		- wp_enqueue_style( 'select2', plugins_url( 'assets/css/select2.css', WC_PLUGIN_FILE ) );
	505	+ wp_enqueue_style( 'select2', plugins_url( 'assets/css/select2.css', WC_PLUGIN_FILE ) ); // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion
427	506
428	507	wp_enqueue_script( 'selectWoo' );
429	508	/**
430	509	* Scripts.
		@@ -437,9 +516,9 @@
437	516	[
438	517	'ajaxurl' => esc_url( self::$ajaxurl ),
439	518	'homeurl' => home_url(),
440	519	rtsb()->nonceId => wp_create_nonce( rtsb()->nonceText ),
441		- 'hasPro' => rtsb()->has_pro() ? 'yes' : 'no'
	520	+ 'hasPro' => rtsb()->has_pro() ? 'yes' : 'no',
442	521	]
443	522	);
444	523	}
445	524	}