← All changes | app/Controllers/AssetsController.php +24 -72 2.2.0 → 2.0.2 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,30 +136,11 @@
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		-
159	140	$this->scripts[] = [
160	141	'handle' => 'swiper',
161		- 'src' => esc_url( $default_swiper_path ),
	142	+ 'src' => rtsb()->get_assets_uri( 'vendor/swiper/js/swiper-bundle.min.js' ),
162	143	'deps' => [ 'jquery' ],
163	144	'footer' => true,
164	145	];
165	146
		@@ -322,20 +303,18 @@
322	303	wp_localize_script(
323	304	'rtsb-public',
324	305	'rtsbPublicParams',
325	306	[
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' => [
	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' => [
335	314	'position' => Fns::get_option( 'general', 'notification', 'notification_position', 'center-center' ),
336	315	],
337		- rtsb()->nonceId => wp_create_nonce( rtsb()->nonceText ),
	316	+ rtsb()->nonceId => wp_create_nonce( rtsb()->nonceText ),
338	317	]
339	318	);
340	319	}
341	320
		@@ -348,20 +327,9 @@
348	327	/**
349	328	* Styles.
350	329	*/
351	330	wp_register_style( 'rtsb-admin-app', rtsb()->get_assets_uri( 'css/backend/admin-settings.css' ), '', $this->version );
352		- wp_register_style( 'rtsb-fonts', rtsb()->get_assets_uri( 'css/frontend/rtsb-fonts.css' ), '', $this->version );
353		-
354		- $current_screen = get_current_screen();
355		-
356		- if ( 'edit-rtsb_builder' === $current_screen->id ) {
357		- if ( ! function_exists( 'woocommerce_get_asset_url' ) ) {
358		- include_once WC_ABSPATH . 'includes/wc-template-functions.php';
359		- }
360		-
361		- wp_deregister_style( 'select2' );
362		- wp_register_style( 'select2', plugins_url( 'assets/css/select2.css', WC_PLUGIN_FILE ) ); // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion
363		- }
	331	+ wp_register_style( 'rtsb-admin-global', rtsb()->get_assets_uri( 'css/backend/admin-global.css' ), '', $this->version );
364	332	wp_register_style( 'rtsb-templatebuilder', rtsb()->get_assets_uri( 'css/backend/template-builder.css' ), '', $this->version );
365	333
366	334	/**
367	335	* Scripts.
		@@ -367,8 +335,9 @@
367	335	* Scripts.
368	336	*/
369	337	wp_register_script( 'rtsb-admin-app', rtsb()->get_assets_uri( 'js/backend/admin-settings.js' ), '', $this->version, true );
370	338	wp_register_script( 'rtsb-templatebuilder', rtsb()->get_assets_uri( 'js/backend/template-builder.js' ), '', $this->version, true );
	339	+
371	340	}
372	341
373	342	/**
374	343	* Enqueues admin scripts.
		@@ -377,28 +346,14 @@
377	346	*
378	347	* @return void
379	348	*/
380	349	public function enqueue_backend_scripts( $hook ) {
381		- ob_start(); ?>
382		- #adminmenu .toplevel_page_rtsb .wp-menu-image img {
383		- width: auto;
384		- height: 22px;
385		- padding: 4px 0;
386		- }
387		- .post-type-rtsb_builder li#wp-admin-bar-WPML_ALS_all,
388		- .post-type-rtsb_builder li.language_all{
389		- display: none;
390		- }
391	350
392		- <?php
393		- $admin_global_style = ob_get_clean();
394		- // Speed Optimization.
395		- wp_add_inline_style( 'admin-menu', $admin_global_style );
396		- // wp_enqueue_style( 'rtsb-admin-global' );
	351	+ wp_enqueue_style( 'rtsb-admin-global' );
397	352
398	353	global $pagenow;
399	354
400		- if ( 'admin.php' === $pagenow && ! empty( $_GET['page'] ) && 'rtsb-settings' === $_GET['page'] ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
	355	+ if ( 'admin.php' === $pagenow && ! empty( $_GET['page'] ) && 'rtsb-settings' === $_GET['page'] ) {
401	356	// Elementor Console Error Fixed For "rtsb-settings" Page.
402	357	wp_dequeue_script( 'elementor-admin-top-bar' );
403	358	wp_dequeue_script( 'elementor-common' );
404	359	wp_dequeue_script( 'elementor-dev-tools' );
		@@ -416,9 +371,8 @@
416	371	/**
417	372	* Styles.
418	373	*/
419	374	wp_enqueue_style( 'rtsb-admin-app' );
420		- wp_enqueue_style( 'rtsb-fonts' );
421	375
422	376	/**
423	377	* Scripts.
424	378	*/
		@@ -427,18 +381,16 @@
427	381	wp_localize_script(
428	382	'rtsb-admin-app',
429	383	'rtsbParams',
430	384	[
431		- 'ajaxurl' => esc_url( self::$ajaxurl ),
432		- 'homeurl' => home_url(),
433		- 'adminLogo' => rtsb()->get_assets_uri( 'images/icon/ShopBuilder-Logo.svg' ),
434		- 'restApiUrl' => esc_url_raw( rest_url() ),
435		- 'rest_nonce' => wp_create_nonce( 'wp_rest' ),
436		- 'nonce' => wp_create_nonce( rtsb()->nonceText ),
437		- 'sections' => Settings::instance()->get_sections(),
438		- 'pages' => Fns::get_pages(),
439		- 'hasPro' => rtsb()->has_pro() ? 'yes' : 'no',
440		- 'updateRates' => esc_html__( 'Update All Rates', 'shopbuilder' ),
	385	+ 'ajaxurl' => esc_url( self::$ajaxurl ),
	386	+ 'homeurl' => home_url(),
	387	+ 'restApiUrl' => esc_url_raw( rest_url() ),
	388	+ 'rest_nonce' => wp_create_nonce( 'wp_rest' ),
	389	+ 'nonce' => wp_create_nonce( rtsb()->nonceText ),
	390	+ 'sections' => Settings::instance()->get_sections(),
	391	+ 'pages' => Fns::get_pages(),
	392	+ 'hasPro' => rtsb()->has_pro() ? 'yes' : 'no'
441	393	]
442	394	);
443	395	} else {
444	396	$current_screen = get_current_screen();
		@@ -451,9 +403,9 @@
451	403	* Styles.
452	404	*/
453	405	wp_enqueue_style( 'rtsb-templatebuilder' );
454	406
455		- wp_enqueue_style( 'select2', plugins_url( 'assets/css/select2.css', WC_PLUGIN_FILE ) ); // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion
	407	+ wp_enqueue_style( 'select2', plugins_url( 'assets/css/select2.css', WC_PLUGIN_FILE ) );
456	408
457	409	wp_enqueue_script( 'selectWoo' );
458	410	/**
459	411	* Scripts.
		@@ -466,9 +418,9 @@
466	418	[
467	419	'ajaxurl' => esc_url( self::$ajaxurl ),
468	420	'homeurl' => home_url(),
469	421	rtsb()->nonceId => wp_create_nonce( rtsb()->nonceText ),
470		- 'hasPro' => rtsb()->has_pro() ? 'yes' : 'no',
	422	+ 'hasPro' => rtsb()->has_pro() ? 'yes' : 'no'
471	423	]
472	424	);
473	425	}
474	426	}