← All changes | app/Controllers/AssetsController.php +32 -57 3.4.0 → 3.1.2 View file →

		@@ -6,9 +6,8 @@
6	6	*/
7	7
8	8	namespace RadiusTheme\SB\Controllers;
9	9
10		-use RadiusTheme\SB\AI\AIFns;
11	10	use RadiusTheme\SB\Helpers\Fns;
12	11	use RadiusTheme\SB\Models\Settings;
13	12	use RadiusTheme\SB\Helpers\BuilderFns;
14	13	use RadiusTheme\SB\Traits\SingletonTrait;
		@@ -206,9 +205,9 @@
206	205	];
207	206
208	207	if ( BuilderFns::is_builder_preview() && 'elementor' == Fns::page_edit_with( get_the_ID() ) ) {
209	208	$this->scripts[] = [
210		- 'handle' => 'wc-flexslider',
	209	+ 'handle' => 'flexslider',
211	210	'src' => plugins_url( 'assets/js/flexslider/jquery.flexslider.js', WC_PLUGIN_FILE ),
212	211	'deps' => [ 'jquery' ],
213	212	'footer' => true,
214	213	];
		@@ -220,9 +219,9 @@
220	219	'footer' => true,
221	220	];
222	221
223	222	$this->scripts[] = [
224		- 'handle' => 'wc-zoom',
	223	+ 'handle' => 'zoom',
225	224	'src' => plugins_url( 'assets/js/zoom/jquery.zoom.js', WC_PLUGIN_FILE ),
226	225	'deps' => [ 'jquery' ],
227	226	'footer' => true,
228	227	];
		@@ -227,9 +226,9 @@
227	226	'footer' => true,
228	227	];
229	228
230	229	$this->scripts[] = [
231		- 'handle' => 'wc-photoswipe-ui-default',
	230	+ 'handle' => 'photoswipe-ui-default',
232	231	'src' => plugins_url( 'assets/js/photoswipe/photoswipe-ui-default.js', WC_PLUGIN_FILE ),
233	232	'deps' => [ 'jquery', 'photoswipe' ],
234	233	'footer' => true,
235	234	];
		@@ -236,9 +235,9 @@
236	235
237	236	$this->scripts[] = [
238	237	'handle' => 'wc-single-product',
239	238	'src' => plugins_url( 'assets/js/frontend/single-product.js', WC_PLUGIN_FILE ),
240		- 'deps' => [ 'jquery', 'wc-flexslider', 'photoswipe', 'wc-photoswipe-ui-default', 'wc-zoom' ],
	239	+ 'deps' => [ 'jquery', 'flexslider', 'photoswipe', 'photoswipe-ui-default', 'zoom' ],
241	240	'footer' => true,
242	241	];
243	242
244	243	}
		@@ -335,9 +334,9 @@
335	334	* Scripts.
336	335	*/
337	336	$handle = Fns::optimized_handle( 'rtsb-public' );
338	337
339		- wp_enqueue_script( 'wc-flexslider' );
	338	+ wp_enqueue_script( 'flexslider' );
340	339	wp_enqueue_script( 'wc-single-product' );
341	340	wp_dequeue_script( $handle );
342	341	wp_enqueue_script( 'swiper' );
343	342
		@@ -370,18 +369,16 @@
370	369	* @static
371	370	* @return void
372	371	*/
373	372	public static function localizeData() {
374		- $handle = Fns::optimized_handle( 'rtsb-public' );
375		- $ai_data = AIFns::activated_ai_data();
	373	+ $handle = Fns::optimized_handle( 'rtsb-public' );
	374	+
376	375	wp_localize_script(
377	376	$handle,
378	377	'rtsbPublicParams',
379	378	[
380	379	'ajaxUrl' => esc_url( self::$ajaxurl ),
381		- 'aiActivated' => ! empty( $ai_data ),
382	380	'homeurl' => home_url(),
383		- 'shopUrl' => function_exists( 'wc_get_page_permalink' ) ? esc_url( wc_get_page_permalink( 'shop' ) ) : home_url( '/' ),
384	381	'wcCartUrl' => wc_get_cart_url(),
385	382	'addedToCartText' => esc_html__( 'Product Added', 'shopbuilder' ),
386	383	'singleCartToastrText' => esc_html__( 'Successfully Added', 'shopbuilder' ),
387	384	'singleCartBtnText' => apply_filters( 'rtsb/global/single_add_to_cart_success', esc_html__( 'Added to Cart', 'shopbuilder' ) ),
		@@ -390,9 +387,8 @@
390	387	'isOptimizationEnabled' => Fns::is_optimization_enabled(),
391	388	'isLoaderEnabled' => Fns::enable_loader(),
392	389	'notice' => [
393	390	'position' => Fns::get_option( 'general', 'notification', 'notification_position', 'center-center' ),
394		- 'timeOut' => absint( Fns::get_option( 'general', 'notification', 'notification_timeOut', 5 ) ),
395	391	],
396	392	rtsb()->nonceId => wp_create_nonce( rtsb()->nonceText ),
397	393	]
398	394	);
		@@ -426,46 +422,8 @@
426	422	* Scripts.
427	423	*/
428	424	wp_register_script( 'rtsb-admin-app', rtsb()->get_assets_uri( 'js/backend/admin-settings.js' ), '', $this->version, true );
429	425	wp_register_script( 'rtsb-templatebuilder', rtsb()->get_assets_uri( 'js/backend/template-builder.js' ), '', $this->version, true );
430		- wp_localize_script(
431		- 'rtsb-admin-app',
432		- 'rtsbParams',
433		- [
434		- 'ajaxurl' => esc_url( self::$ajaxurl ),
435		- 'homeurl' => home_url(),
436		- 'adminLogo' => rtsb()->get_assets_uri( 'images/icon/ShopBuilder-Logo.svg' ),
437		- 'blackFriday' => rtsb()->get_assets_uri( 'images/black-friday-ribbon.svg' ),
438		- 'restApiUrl' => esc_url_raw( rest_url() ),
439		- 'rest_nonce' => wp_create_nonce( 'wp_rest' ),
440		- 'nonce' => wp_create_nonce( rtsb()->nonceText ),
441		- 'pages' => Fns::get_pages(),
442		- 'hasPro' => rtsb()->has_pro() ? 'yes' : 'no',
443		- 'validLicence' => Fns::has_valid_license() ? 'yes' : 'no',
444		- 'proVersion' => defined( 'RTSBPRO_VERSION' ) ? RTSBPRO_VERSION : '0',
445		- 'updateRates' => esc_html__( 'Update All Rates', 'shopbuilder' ),
446		- 'sections' => Settings::instance()->get_sections(),
447		- 'userRoles' => Fns::get_all_user_roles(),
448		- 'hasElementor' => defined( 'ELEMENTOR_VERSION' ),
449		- 'loadElementor' => Fns::should_load_elementor_scripts(),
450		- 'isOptimizationEnabled' => Fns::is_optimization_enabled(),
451		- ]
452		- );
453		- wp_localize_script(
454		- 'rtsb-admin-app',
455		- 'rtsbCaAbandonment',
456		- [
457		- 'mainTitle' => esc_html__( 'Abandoned Carts Follow Up', 'shopbuilder' ),
458		- 'followUpColumnTitle' => [
459		- 'UserName' => esc_html__( 'Name', 'shopbuilder' ),
460		- 'EmailTo' => esc_html__( 'Email To', 'shopbuilder' ),
461		- 'CartTotal' => esc_html__( 'Cart Total', 'shopbuilder' ),
462		- 'OrderStatus' => esc_html__( 'Order Status', 'shopbuilder' ),
463		- 'DateTime' => esc_html__( 'Date / Time', 'shopbuilder' ),
464		- 'Action' => esc_html__( 'Action', 'shopbuilder' ),
465		- ],
466		- ]
467		- );
468	426	}
469	427
470	428	/**
471	429	* Enqueues admin scripts.
		@@ -525,8 +483,29 @@
525	483	*/
526	484	wp_enqueue_media();
527	485	wp_enqueue_script( 'updates' );
528	486	wp_enqueue_script( 'rtsb-admin-app' );
	487	+ wp_localize_script(
	488	+ 'rtsb-admin-app',
	489	+ 'rtsbParams',
	490	+ [
	491	+ 'ajaxurl' => esc_url( self::$ajaxurl ),
	492	+ 'homeurl' => home_url(),
	493	+ 'adminLogo' => rtsb()->get_assets_uri( 'images/icon/ShopBuilder-Logo.svg' ),
	494	+ 'restApiUrl' => esc_url_raw( rest_url() ),
	495	+ 'rest_nonce' => wp_create_nonce( 'wp_rest' ),
	496	+ 'nonce' => wp_create_nonce( rtsb()->nonceText ),
	497	+ 'pages' => Fns::get_pages(),
	498	+ 'hasPro' => rtsb()->has_pro() ? 'yes' : 'no',
	499	+ 'proVersion' => defined( 'RTSBPRO_VERSION' ) ? RTSBPRO_VERSION : '0',
	500	+ 'updateRates' => esc_html__( 'Update All Rates', 'shopbuilder' ),
	501	+ 'sections' => Settings::instance()->get_sections(),
	502	+ 'userRoles' => Fns::get_all_user_roles(),
	503	+ 'hasElementor' => defined( 'ELEMENTOR_VERSION' ),
	504	+ 'loadElementor' => Fns::should_load_elementor_scripts(),
	505	+ 'isOptimizationEnabled' => Fns::is_optimization_enabled(),
	506	+ ]
	507	+ );
529	508	} else {
530	509	$current_screen = get_current_screen();
531	510
532	511	if ( 'edit-rtsb_builder' === $current_screen->id ) {
		@@ -549,16 +528,12 @@
549	528	wp_localize_script(
550	529	'rtsb-templatebuilder',
551	530	'rtsbParams',
552	531	[
553		- 'ajaxurl' => esc_url( self::$ajaxurl ),
554		- 'homeurl' => home_url(),
555		- rtsb()->nonceId => wp_create_nonce( rtsb()->nonceText ),
556		- 'hasPro' => rtsb()->has_pro() ? 'yes' : 'no',
557		- 'singletonTypes' => apply_filters(
558		- 'rtsb/builder/singleton_types',
559		- array_keys( \RadiusTheme\SB\Helpers\BuilderFns::builder_page_types() )
560		- ),
	532	+ 'ajaxurl' => esc_url( self::$ajaxurl ),
	533	+ 'homeurl' => home_url(),
	534	+ rtsb()->nonceId => wp_create_nonce( rtsb()->nonceText ),
	535	+ 'hasPro' => rtsb()->has_pro() ? 'yes' : 'no',
561	536	]
562	537	);
563	538	}
564	539	}