← All changes | app/Controllers/AssetsController.php +21 -41 2.2.0 → 2.1.3 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,20 +322,18 @@
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		- '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' => [
	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' => [
335	333	'position' => Fns::get_option( 'general', 'notification', 'notification_position', 'center-center' ),
336	334	],
337		- rtsb()->nonceId => wp_create_nonce( rtsb()->nonceText ),
	335	+ rtsb()->nonceId => wp_create_nonce( rtsb()->nonceText ),
338	336	]
339	337	);
340	338	}
341	339
		@@ -348,20 +346,9 @@
348	346	/**
349	347	* Styles.
350	348	*/
351	349	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		- }
	350	+ // wp_register_style( 'rtsb-admin-global', rtsb()->get_assets_uri( 'css/backend/admin-global.css' ), '', $this->version );
364	351	wp_register_style( 'rtsb-templatebuilder', rtsb()->get_assets_uri( 'css/backend/template-builder.css' ), '', $this->version );
365	352
366	353	/**
367	354	* Scripts.
		@@ -367,8 +354,9 @@
367	354	* Scripts.
368	355	*/
369	356	wp_register_script( 'rtsb-admin-app', rtsb()->get_assets_uri( 'js/backend/admin-settings.js' ), '', $this->version, true );
370	357	wp_register_script( 'rtsb-templatebuilder', rtsb()->get_assets_uri( 'js/backend/template-builder.js' ), '', $this->version, true );
	358	+
371	359	}
372	360
373	361	/**
374	362	* Enqueues admin scripts.
		@@ -383,13 +371,8 @@
383	371	width: auto;
384	372	height: 22px;
385	373	padding: 4px 0;
386	374	}
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		-
392	375	<?php
393	376	$admin_global_style = ob_get_clean();
394	377	// Speed Optimization.
395	378	wp_add_inline_style( 'admin-menu', $admin_global_style );
		@@ -416,9 +399,8 @@
416	399	/**
417	400	* Styles.
418	401	*/
419	402	wp_enqueue_style( 'rtsb-admin-app' );
420		- wp_enqueue_style( 'rtsb-fonts' );
421	403
422	404	/**
423	405	* Scripts.
424	406	*/
		@@ -427,18 +409,16 @@
427	409	wp_localize_script(
428	410	'rtsb-admin-app',
429	411	'rtsbParams',
430	412	[
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' ),
	413	+ 'ajaxurl' => esc_url( self::$ajaxurl ),
	414	+ 'homeurl' => home_url(),
	415	+ 'restApiUrl' => esc_url_raw( rest_url() ),
	416	+ 'rest_nonce' => wp_create_nonce( 'wp_rest' ),
	417	+ 'nonce' => wp_create_nonce( rtsb()->nonceText ),
	418	+ 'sections' => Settings::instance()->get_sections(),
	419	+ 'pages' => Fns::get_pages(),
	420	+ 'hasPro' => rtsb()->has_pro() ? 'yes' : 'no'
441	421	]
442	422	);
443	423	} else {
444	424	$current_screen = get_current_screen();
		@@ -451,9 +431,9 @@
451	431	* Styles.
452	432	*/
453	433	wp_enqueue_style( 'rtsb-templatebuilder' );
454	434
455		- wp_enqueue_style( 'select2', plugins_url( 'assets/css/select2.css', WC_PLUGIN_FILE ) ); // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion
	435	+ wp_enqueue_style( 'select2', plugins_url( 'assets/css/select2.css', WC_PLUGIN_FILE ) );
456	436
457	437	wp_enqueue_script( 'selectWoo' );
458	438	/**
459	439	* Scripts.
		@@ -466,9 +446,9 @@
466	446	[
467	447	'ajaxurl' => esc_url( self::$ajaxurl ),
468	448	'homeurl' => home_url(),
469	449	rtsb()->nonceId => wp_create_nonce( rtsb()->nonceText ),
470		- 'hasPro' => rtsb()->has_pro() ? 'yes' : 'no',
	450	+ 'hasPro' => rtsb()->has_pro() ? 'yes' : 'no'
471	451	]
472	452	);
473	453	}
474	454	}