← All changes | app/Controllers/AssetsController.php +54 -17 2.0.2 → 2.1.13 View file →

		@@ -86,9 +86,9 @@
86	86	*
87	87	* @return object
88	88	*/
89	89	private function get_public_styles() {
90		- $rtl_suffix = is_rtl() ? '-rtl' : '';
	90	+ $rtl_suffix = is_rtl() ? '-rtl' : '';
91	91	$this->styles[] = [
92	92	'handle' => 'rtsb-fonts',
93	93	'src' => rtsb()->get_assets_uri( 'css/frontend/rtsb-fonts.css' ),
94	94	];
		@@ -136,11 +136,30 @@
136	136	*
137	137	* @return object
138	138	*/
139	139	private function get_public_scripts() {
	140	+
	141	+ $default_swiper_path = rtsb()->get_assets_uri( 'vendor/swiper/js/swiper-bundle.min.js' );
	142	+
	143	+ if ( defined( 'ELEMENTOR_ASSETS_PATH' ) ) {
	144	+ $is_swiper8_enable = get_option( 'elementor_experiment-e_swiper_latest' );
	145	+
	146	+ if ( 'active' === $is_swiper8_enable || 'default' === $is_swiper8_enable ) {
	147	+ $el_swiper_path = 'lib/swiper/v8/swiper.min.js';
	148	+ } else {
	149	+ $el_swiper_path = 'lib/swiper/swiper.min.js';
	150	+ }
	151	+
	152	+ $elementor_swiper_path = ELEMENTOR_ASSETS_PATH . $el_swiper_path;
	153	+
	154	+ if ( file_exists( $elementor_swiper_path ) ) {
	155	+ $default_swiper_path = ELEMENTOR_ASSETS_URL . $el_swiper_path;
	156	+ }
	157	+ }
	158	+
140	159	$this->scripts[] = [
141	160	'handle' => 'swiper',
142		- 'src' => rtsb()->get_assets_uri( 'vendor/swiper/js/swiper-bundle.min.js' ),
	161	+ 'src' => esc_url( $default_swiper_path ),
143	162	'deps' => [ 'jquery' ],
144	163	'footer' => true,
145	164	];
146	165
		@@ -303,18 +322,20 @@
303	322	wp_localize_script(
304	323	'rtsb-public',
305	324	'rtsbPublicParams',
306	325	[
307		- 'ajaxUrl' => esc_url( self::$ajaxurl ),
308		- 'homeurl' => home_url(),
309		- 'wcCartUrl' => wc_get_cart_url(),
310		- 'addedToCartText' => esc_html__( 'Product Added', 'shopbuilder' ),
311		- 'browseCartText' => esc_html__( 'Browse Cart', 'shopbuilder' ),
312		- 'noProductsText' => apply_filters( 'rtsb/global/no_products_text', esc_html__( 'No more products to load', 'shopbuilder' ) ),
313		- 'notice' => [
	326	+ 'ajaxUrl' => esc_url( self::$ajaxurl ),
	327	+ 'homeurl' => home_url(),
	328	+ 'wcCartUrl' => wc_get_cart_url(),
	329	+ 'addedToCartText' => esc_html__( 'Product Added', 'shopbuilder' ),
	330	+ 'singleCartToastrText' => esc_html__( 'Successfully Added', 'shopbuilder' ),
	331	+ 'singleCartBtnText' => apply_filters( 'rtsb/global/single_add_to_cart_success', esc_html__( 'Added to Cart', 'shopbuilder' ) ),
	332	+ 'browseCartText' => esc_html__( 'Browse Cart', 'shopbuilder' ),
	333	+ 'noProductsText' => apply_filters( 'rtsb/global/no_products_text', esc_html__( 'No more products to load', 'shopbuilder' ) ),
	334	+ 'notice' => [
314	335	'position' => Fns::get_option( 'general', 'notification', 'notification_position', 'center-center' ),
315	336	],
316		- rtsb()->nonceId => wp_create_nonce( rtsb()->nonceText ),
	337	+ rtsb()->nonceId => wp_create_nonce( rtsb()->nonceText ),
317	338	]
318	339	);
319	340	}
320	341
		@@ -327,9 +348,10 @@
327	348	/**
328	349	* Styles.
329	350	*/
330	351	wp_register_style( 'rtsb-admin-app', rtsb()->get_assets_uri( 'css/backend/admin-settings.css' ), '', $this->version );
331		- wp_register_style( 'rtsb-admin-global', rtsb()->get_assets_uri( 'css/backend/admin-global.css' ), '', $this->version );
	352	+ wp_register_style( 'rtsb-fonts', rtsb()->get_assets_uri( 'css/frontend/rtsb-fonts.css' ), '', $this->version );
	353	+ // wp_register_style( 'rtsb-admin-global', rtsb()->get_assets_uri( 'css/backend/admin-global.css' ), '', $this->version );
332	354	wp_register_style( 'rtsb-templatebuilder', rtsb()->get_assets_uri( 'css/backend/template-builder.css' ), '', $this->version );
333	355
334	356	/**
335	357	* Scripts.
		@@ -335,9 +357,8 @@
335	357	* Scripts.
336	358	*/
337	359	wp_register_script( 'rtsb-admin-app', rtsb()->get_assets_uri( 'js/backend/admin-settings.js' ), '', $this->version, true );
338	360	wp_register_script( 'rtsb-templatebuilder', rtsb()->get_assets_uri( 'js/backend/template-builder.js' ), '', $this->version, true );
339		-
340	361	}
341	362
342	363	/**
343	364	* Enqueues admin scripts.
		@@ -346,14 +367,28 @@
346	367	*
347	368	* @return void
348	369	*/
349	370	public function enqueue_backend_scripts( $hook ) {
	371	+ ob_start(); ?>
	372	+ #adminmenu .toplevel_page_rtsb .wp-menu-image img {
	373	+ width: auto;
	374	+ height: 22px;
	375	+ padding: 4px 0;
	376	+ }
	377	+ .post-type-rtsb_builder li#wp-admin-bar-WPML_ALS_all,
	378	+ .post-type-rtsb_builder li.language_all{
	379	+ display: none;
	380	+ }
350	381
351		- wp_enqueue_style( 'rtsb-admin-global' );
	382	+ <?php
	383	+ $admin_global_style = ob_get_clean();
	384	+ // Speed Optimization.
	385	+ wp_add_inline_style( 'admin-menu', $admin_global_style );
	386	+ // wp_enqueue_style( 'rtsb-admin-global' );
352	387
353	388	global $pagenow;
354	389
355		- if ( 'admin.php' === $pagenow && ! empty( $_GET['page'] ) && 'rtsb-settings' === $_GET['page'] ) {
	390	+ if ( 'admin.php' === $pagenow && ! empty( $_GET['page'] ) && 'rtsb-settings' === $_GET['page'] ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
356	391	// Elementor Console Error Fixed For "rtsb-settings" Page.
357	392	wp_dequeue_script( 'elementor-admin-top-bar' );
358	393	wp_dequeue_script( 'elementor-common' );
359	394	wp_dequeue_script( 'elementor-dev-tools' );
		@@ -371,8 +406,9 @@
371	406	/**
372	407	* Styles.
373	408	*/
374	409	wp_enqueue_style( 'rtsb-admin-app' );
	410	+ wp_enqueue_style( 'rtsb-fonts' );
375	411
376	412	/**
377	413	* Scripts.
378	414	*/
		@@ -383,14 +419,15 @@
383	419	'rtsbParams',
384	420	[
385	421	'ajaxurl' => esc_url( self::$ajaxurl ),
386	422	'homeurl' => home_url(),
	423	+ 'adminLogo' => rtsb()->get_assets_uri( 'images/icon/ShopBuilder-Logo.svg' ),
387	424	'restApiUrl' => esc_url_raw( rest_url() ),
388	425	'rest_nonce' => wp_create_nonce( 'wp_rest' ),
389	426	'nonce' => wp_create_nonce( rtsb()->nonceText ),
390	427	'sections' => Settings::instance()->get_sections(),
391	428	'pages' => Fns::get_pages(),
392		- 'hasPro' => rtsb()->has_pro() ? 'yes' : 'no'
	429	+ 'hasPro' => rtsb()->has_pro() ? 'yes' : 'no',
393	430	]
394	431	);
395	432	} else {
396	433	$current_screen = get_current_screen();
		@@ -403,9 +440,9 @@
403	440	* Styles.
404	441	*/
405	442	wp_enqueue_style( 'rtsb-templatebuilder' );
406	443
407		- wp_enqueue_style( 'select2', plugins_url( 'assets/css/select2.css', WC_PLUGIN_FILE ) );
	444	+ wp_enqueue_style( 'select2', plugins_url( 'assets/css/select2.css', WC_PLUGIN_FILE ) ); // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion
408	445
409	446	wp_enqueue_script( 'selectWoo' );
410	447	/**
411	448	* Scripts.
		@@ -418,9 +455,9 @@
418	455	[
419	456	'ajaxurl' => esc_url( self::$ajaxurl ),
420	457	'homeurl' => home_url(),
421	458	rtsb()->nonceId => wp_create_nonce( rtsb()->nonceText ),
422		- 'hasPro' => rtsb()->has_pro() ? 'yes' : 'no'
	459	+ 'hasPro' => rtsb()->has_pro() ? 'yes' : 'no',
423	460	]
424	461	);
425	462	}
426	463	}