← All changes | loader.php +25 -19 3.0.3 → 3.1.4 View file →

		@@ -187,15 +187,15 @@
187	187	* Register all script that need for any specific widget on call basis.
188	188	* @return [type] [description]
189	189	*/
190	190	public function register_site_scripts() {
191		- wp_register_script('datatables', BDTUSK_ASSETS_URL . 'vendor/js/datatables.js', [], '1.0.0', true);
192		- wp_register_script('micromodal', BDTUSK_ASSETS_URL . 'vendor/js/micromodal.js', [], '1.0.0', true);
	191	+ wp_register_script('ultimate-store-kit-datatables', BDTUSK_ASSETS_URL . 'vendor/js/datatables.js', [], '1.0.0', true);
	192	+ wp_register_script('ultimate-store-kit-micromodal', BDTUSK_ASSETS_URL . 'vendor/js/micromodal.js', [], '1.0.0', true);
193	193	wp_register_script('usk-accordion', BDTUSK_ASSETS_URL . 'vendor/js/accordion.js', [], '1.0.0', true);
194	194
195	195	if (ultimate_store_kit_is_widget_enabled('image-hotspot')) {
196		- wp_register_script('popper', BDTUSK_ASSETS_URL . 'vendor/js/popper.min.js', ['jquery'], null, true);
197		- wp_register_script('tippyjs', BDTUSK_ASSETS_URL . 'vendor/js/tippy.all.min.js', ['jquery'], null, true);
	196	+ wp_register_script('ultimate-store-kit-popper', BDTUSK_ASSETS_URL . 'vendor/js/popper.min.js', ['jquery'], BDTUSK_VER, true);
	197	+ wp_register_script('ultimate-store-kit-tippyjs', BDTUSK_ASSETS_URL . 'vendor/js/tippy.all.min.js', ['jquery'], BDTUSK_VER, true);
198	198	}
199	199	}
200	200
201	201	public function register_site_styles() {
		@@ -203,9 +203,9 @@
203	203	wp_register_style('usk-all-styles', BDTUSK_URL . 'assets/css/all-styles' . $direction_suffix . '.css', [], BDTUSK_VER);
204	204	wp_register_style('usk-font', BDTUSK_URL . 'assets/css/font' . $direction_suffix . '.css', [], BDTUSK_VER);
205	205
206	206	if (ultimate_store_kit_is_widget_enabled('image-hotspot')) {
207		- wp_register_style('tippy', BDTUSK_URL . 'assets/css/tippy' . $direction_suffix . '.css', [], BDTUSK_VER);
	207	+ wp_register_style('ultimate-store-kit-tippy', BDTUSK_URL . 'assets/css/tippy' . $direction_suffix . '.css', [], BDTUSK_VER);
208	208	}
209	209	}
210	210
211	211	/**
		@@ -216,14 +216,18 @@
216	216
217	217	$direction_suffix = is_rtl() ? '.rtl' : '';
218	218
219	219	wp_register_style('usk-site', BDTUSK_ASSETS_URL . 'css/site' . $direction_suffix . '.css', [], BDTUSK_VER);
220		- wp_register_style('slick-modal', BDTUSK_ASSETS_URL . 'vendor/css/slickmodal.css', [], BDTUSK_VER);
221		- wp_register_style('toolslide-css', BDTUSK_ASSETS_URL . 'vendor/css/toolslide.css', [], BDTUSK_VER);
	220	+ // The Product Table widget lists this as a style dependency and the file has
	221	+ // always shipped, but it was never registered: the widget was silently
	222	+ // relying on another plugin registering a "datatables" stylesheet.
	223	+ wp_register_style('ultimate-store-kit-datatables', BDTUSK_ASSETS_URL . 'vendor/css/datatables.css', [], BDTUSK_VER);
	224	+ wp_register_style('ultimate-store-kit-slick-modal', BDTUSK_ASSETS_URL . 'vendor/css/slickmodal.css', [], BDTUSK_VER);
	225	+ wp_register_style('ultimate-store-kit-toolslide', BDTUSK_ASSETS_URL . 'vendor/css/toolslide.css', [], BDTUSK_VER);
222	226
223	227	wp_enqueue_style('usk-site');
224		- wp_enqueue_style('slick-modal');
225		- wp_enqueue_style('toolslide-css');
	228	+ wp_enqueue_style('ultimate-store-kit-slick-modal');
	229	+ wp_enqueue_style('ultimate-store-kit-toolslide');
226	230	}
227	231
228	232
229	233	/**
		@@ -233,18 +237,20 @@
233	237	public function enqueue_site_scripts() {
234	238
235	239	wp_register_script('usk-core', BDTUSK_ASSETS_URL . 'js/core.js', ['jquery'], BDTUSK_VER, true); // tooltip file should be separate
236	240	wp_register_script('usk-site', BDTUSK_ASSETS_URL . 'js/site.js', ['jquery'], BDTUSK_VER, true); // tooltip file should be separate
237		- wp_register_script('slick-modal', BDTUSK_ASSETS_URL . 'vendor/js/jquery.slickmodal.js', ['jquery'], BDTUSK_VER, true); // tooltip file should be separate
238		- wp_register_script('toolslide-js', BDTUSK_ASSETS_URL . 'vendor/js/toolslide.js', [], BDTUSK_VER, true); // tooltip file should be separate
	241	+ wp_register_script('ultimate-store-kit-slick-modal', BDTUSK_ASSETS_URL . 'vendor/js/jquery.slickmodal.js', ['jquery'], BDTUSK_VER, true); // tooltip file should be separate
	242	+ wp_register_script('ultimate-store-kit-toolslide', BDTUSK_ASSETS_URL . 'vendor/js/toolslide.js', [], BDTUSK_VER, true); // tooltip file should be separate
239	243
240	244	wp_enqueue_script('usk-core');
241	245	// wp_enqueue_script('usk-site');
242		- wp_enqueue_script('slick-modal');
243		- wp_enqueue_script('toolslide-js');
	246	+ wp_enqueue_script('ultimate-store-kit-slick-modal');
	247	+ wp_enqueue_script('ultimate-store-kit-toolslide');
244	248
245	249	wp_localize_script('usk-core', 'ultimate_store_kit_ajax_config', array(
246	250	'ajaxurl' => admin_url('admin-ajax.php'),
	251	+ // Only consumed for logged-in requests — see WishlistCompare::verify_request().
	252	+ 'nonce' => wp_create_nonce('usk_wishlist_compare'),
247	253	));
248	254	}
249	255
250	256	public function enqueue_editor_scripts() {
		@@ -252,20 +258,20 @@
252	258	wp_register_script('usk-editor', BDTUSK_ASSETS_URL . 'js/editor.js', ['backbone-marionette', 'elementor-common-modules', 'elementor-editor-modules',], BDTUSK_VER, true);
253	259
254	260	wp_enqueue_script('usk-editor');
255	261
256		- $_is_usk_pro_activated = false;
257		- if (function_exists('usk_license_validation') && true === usk_license_validation()) {
258		- $_is_usk_pro_activated = true;
	262	+ $ultimate_store_kit_is_pro_activated = false;
	263	+ if (function_exists('ultimate_store_kit_license_validation') && true === ultimate_store_kit_license_validation()) {
	264	+ $ultimate_store_kit_is_pro_activated = true;
259	265	}
260	266
261	267	$localize_data = [
262		- 'pro_installed' => _is_usk_pro_activated(),
263		- 'pro_license_activated' => $_is_usk_pro_activated,
	268	+ 'pro_installed' => ultimate_store_kit_is_pro_activated(),
	269	+ 'pro_license_activated' => $ultimate_store_kit_is_pro_activated,
264	270	'promotional_widgets' => [],
265	271	];
266	272
267		- if (!$_is_usk_pro_activated) {
	273	+ if (!$ultimate_store_kit_is_pro_activated) {
268	274	$pro_widget_map = new \UltimateStoreKit\Includes\Pro_Widget_Map();
269	275	$localize_data['promotional_widgets'] = $pro_widget_map->get_pro_widget_map();
270	276	}
271	277