← All changes | app/Controllers/AssetsController.php +34 -16 2.1.0 → 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	];
		@@ -322,18 +322,20 @@
322	322	wp_localize_script(
323	323	'rtsb-public',
324	324	'rtsbPublicParams',
325	325	[
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' => [
	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' => [
333	335	'position' => Fns::get_option( 'general', 'notification', 'notification_position', 'center-center' ),
334	336	],
335		- rtsb()->nonceId => wp_create_nonce( rtsb()->nonceText ),
	337	+ rtsb()->nonceId => wp_create_nonce( rtsb()->nonceText ),
336	338	]
337	339	);
338	340	}
339	341
		@@ -346,9 +348,10 @@
346	348	/**
347	349	* Styles.
348	350	*/
349	351	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 );
	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 );
351	354	wp_register_style( 'rtsb-templatebuilder', rtsb()->get_assets_uri( 'css/backend/template-builder.css' ), '', $this->version );
352	355
353	356	/**
354	357	* Scripts.
		@@ -354,9 +357,8 @@
354	357	* Scripts.
355	358	*/
356	359	wp_register_script( 'rtsb-admin-app', rtsb()->get_assets_uri( 'js/backend/admin-settings.js' ), '', $this->version, true );
357	360	wp_register_script( 'rtsb-templatebuilder', rtsb()->get_assets_uri( 'js/backend/template-builder.js' ), '', $this->version, true );
358		-
359	361	}
360	362
361	363	/**
362	364	* Enqueues admin scripts.
		@@ -365,14 +367,28 @@
365	367	*
366	368	* @return void
367	369	*/
368	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	+ }
369	381
370		- 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' );
371	387
372	388	global $pagenow;
373	389
374		- 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
375	391	// Elementor Console Error Fixed For "rtsb-settings" Page.
376	392	wp_dequeue_script( 'elementor-admin-top-bar' );
377	393	wp_dequeue_script( 'elementor-common' );
378	394	wp_dequeue_script( 'elementor-dev-tools' );
		@@ -390,8 +406,9 @@
390	406	/**
391	407	* Styles.
392	408	*/
393	409	wp_enqueue_style( 'rtsb-admin-app' );
	410	+ wp_enqueue_style( 'rtsb-fonts' );
394	411
395	412	/**
396	413	* Scripts.
397	414	*/
		@@ -402,14 +419,15 @@
402	419	'rtsbParams',
403	420	[
404	421	'ajaxurl' => esc_url( self::$ajaxurl ),
405	422	'homeurl' => home_url(),
	423	+ 'adminLogo' => rtsb()->get_assets_uri( 'images/icon/ShopBuilder-Logo.svg' ),
406	424	'restApiUrl' => esc_url_raw( rest_url() ),
407	425	'rest_nonce' => wp_create_nonce( 'wp_rest' ),
408	426	'nonce' => wp_create_nonce( rtsb()->nonceText ),
409	427	'sections' => Settings::instance()->get_sections(),
410	428	'pages' => Fns::get_pages(),
411		- 'hasPro' => rtsb()->has_pro() ? 'yes' : 'no'
	429	+ 'hasPro' => rtsb()->has_pro() ? 'yes' : 'no',
412	430	]
413	431	);
414	432	} else {
415	433	$current_screen = get_current_screen();
		@@ -422,9 +440,9 @@
422	440	* Styles.
423	441	*/
424	442	wp_enqueue_style( 'rtsb-templatebuilder' );
425	443
426		- 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
427	445
428	446	wp_enqueue_script( 'selectWoo' );
429	447	/**
430	448	* Scripts.
		@@ -437,9 +455,9 @@
437	455	[
438	456	'ajaxurl' => esc_url( self::$ajaxurl ),
439	457	'homeurl' => home_url(),
440	458	rtsb()->nonceId => wp_create_nonce( rtsb()->nonceText ),
441		- 'hasPro' => rtsb()->has_pro() ? 'yes' : 'no'
	459	+ 'hasPro' => rtsb()->has_pro() ? 'yes' : 'no',
442	460	]
443	461	);
444	462	}
445	463	}