← All changes | app/Controllers/AssetsController.php +13 -22 2.1.12 → 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,9 +346,8 @@
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	350	// wp_register_style( 'rtsb-admin-global', rtsb()->get_assets_uri( 'css/backend/admin-global.css' ), '', $this->version );
354	351	wp_register_style( 'rtsb-templatebuilder', rtsb()->get_assets_uri( 'css/backend/template-builder.css' ), '', $this->version );
355	352
356	353	/**
		@@ -357,8 +354,9 @@
357	354	* Scripts.
358	355	*/
359	356	wp_register_script( 'rtsb-admin-app', rtsb()->get_assets_uri( 'js/backend/admin-settings.js' ), '', $this->version, true );
360	357	wp_register_script( 'rtsb-templatebuilder', rtsb()->get_assets_uri( 'js/backend/template-builder.js' ), '', $this->version, true );
	358	+
361	359	}
362	360
363	361	/**
364	362	* Enqueues admin scripts.
		@@ -373,13 +371,8 @@
373	371	width: auto;
374	372	height: 22px;
375	373	padding: 4px 0;
376	374	}
377		- .post-type-rtsb_builder li#wp-admin-bar-WPML_ALS_all,
378		- .post-type-rtsb_builder li.language_all{
379		- display: none;
380		- }
381		-
382	375	<?php
383	376	$admin_global_style = ob_get_clean();
384	377	// Speed Optimization.
385	378	wp_add_inline_style( 'admin-menu', $admin_global_style );
		@@ -406,9 +399,8 @@
406	399	/**
407	400	* Styles.
408	401	*/
409	402	wp_enqueue_style( 'rtsb-admin-app' );
410		- wp_enqueue_style( 'rtsb-fonts' );
411	403
412	404	/**
413	405	* Scripts.
414	406	*/
		@@ -419,15 +411,14 @@
419	411	'rtsbParams',
420	412	[
421	413	'ajaxurl' => esc_url( self::$ajaxurl ),
422	414	'homeurl' => home_url(),
423		- 'adminLogo' => rtsb()->get_assets_uri( 'images/icon/ShopBuilder-Logo.svg' ),
424	415	'restApiUrl' => esc_url_raw( rest_url() ),
425	416	'rest_nonce' => wp_create_nonce( 'wp_rest' ),
426	417	'nonce' => wp_create_nonce( rtsb()->nonceText ),
427	418	'sections' => Settings::instance()->get_sections(),
428	419	'pages' => Fns::get_pages(),
429		- 'hasPro' => rtsb()->has_pro() ? 'yes' : 'no',
	420	+ 'hasPro' => rtsb()->has_pro() ? 'yes' : 'no'
430	421	]
431	422	);
432	423	} else {
433	424	$current_screen = get_current_screen();
		@@ -440,9 +431,9 @@
440	431	* Styles.
441	432	*/
442	433	wp_enqueue_style( 'rtsb-templatebuilder' );
443	434
444		- 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 ) );
445	436
446	437	wp_enqueue_script( 'selectWoo' );
447	438	/**
448	439	* Scripts.
		@@ -455,9 +446,9 @@
455	446	[
456	447	'ajaxurl' => esc_url( self::$ajaxurl ),
457	448	'homeurl' => home_url(),
458	449	rtsb()->nonceId => wp_create_nonce( rtsb()->nonceText ),
459		- 'hasPro' => rtsb()->has_pro() ? 'yes' : 'no',
	450	+ 'hasPro' => rtsb()->has_pro() ? 'yes' : 'no'
460	451	]
461	452	);
462	453	}
463	454	}