← All changes | includes/admin/class-wdkit-enqueue.php +122 -32 2.5.3 → 2.6.6 View file →

		@@ -83,9 +83,21 @@
83	83	*
84	84	* @since 1.0.0
85	85	* @return void
86	86	*/
87		- public function wdkit_enqueue_styles_library() {
	87	+ public function wdkit_enqueue_styles_library( $hook = '' ) {
	88	+ // Hooked on admin_enqueue_scripts with no screen check at all, so this loaded the icon
	89	+ // font on every wp-admin screen (ClickUp 86d41cnze). admin_enqueue_scripts passes the
	90	+ // screen hook as its first argument, so the same guard wdkit_admin_scripts() uses can
	91	+ // apply here. Kept as a separate handle from 'wdkit-library-preview' — both point at the
	92	+ // same stylesheet, and deduplicating the handles is a separate change.
	93	+ $is_nexter_page = isset( $_GET['page'] ) && sanitize_key( wp_unslash( $_GET['page'] ) ) === 'nxt_code_snippets';
	94	+ $is_theme_builder_page = ( isset( $_GET['post_type'] ) && sanitize_key( wp_unslash( $_GET['post_type'] ) ) === 'nxt_builder' ) || ( isset( $_GET['page'] ) && sanitize_key( wp_unslash( $_GET['page'] ) ) === 'nxt_builder' );
	95	+
	96	+ if ( ! in_array( $hook, array( 'toplevel_page_wdesign-kit', 'elementor', 'post-new.php', 'post.php' ), true ) && ! $is_nexter_page && ! $is_theme_builder_page ) {
	97	+ return;
	98	+ }
	99	+
88	100	wp_enqueue_style( 'wdkit-library', WDKIT_URL . 'assets/fonts/style.css', array(), WDKIT_VERSION, false );
89	101	}
90	102
91	103	/**
		@@ -215,9 +227,13 @@
215	227	* @param string $hook use for check page type.
216	228	*/
217	229	public function wdkit_admin_scripts( $hook ) {
218	230
219		- wp_enqueue_style( 'wdkit-library-preview', WDKIT_URL . 'assets/fonts/style.css', array(), WDKIT_VERSION, false );
	231	+ // Deliberately BEFORE the screen guard below: this 1.4 KB stylesheet contains nothing but
	232	+ // #adminmenu rules for the WDesignKit menu item, and the admin menu is rendered on every
	233	+ // admin screen. Gating it to WDesignKit's own screens leaves the menu icon unstyled
	234	+ // everywhere else — the masked-SVG ::before never applies, so the raw <img> shows through.
	235	+ // Do not "optimise" this into the guard (ClickUp 86d41cnze).
220	236	wp_enqueue_style( 'wdkit-out-dashborad', WDKIT_URL . 'assets/css/dashborad/wdkit-dashborad.css', array(), WDKIT_VERSION, false );
221	237
222	238	$page = isset( $_GET['page'] ) ? sanitize_key( wp_unslash( $_GET['page'] ) ) : '';
223	239	$ptype = isset( $_GET['post_type'] ) ? sanitize_key( wp_unslash( $_GET['post_type'] ) ) : '';
		@@ -226,15 +242,21 @@
226	242	$is_nexter_page = isset( $_GET['page'] ) && sanitize_key( wp_unslash( $_GET['page'] ) ) === 'nxt_code_snippets';
227	243
228	244	// Check if we're on a Theme Builder page (via post_type or page parameter)
229	245	$is_theme_builder_page = ( isset( $_GET['post_type'] ) && sanitize_key( wp_unslash( $_GET['post_type'] ) ) === 'nxt_builder' ) || ( isset( $_GET['page'] ) && sanitize_key( wp_unslash( $_GET['page'] ) ) === 'nxt_builder' );
230		-
	246	+
231	247	if ( ! in_array( $hook, array( 'toplevel_page_wdesign-kit', 'elementor', 'post-new.php', 'post.php' ), true ) && !$is_nexter_page && !$is_theme_builder_page ) {
232	248	return;
233	249	}
234	250
235		- wp_enqueue_media();
	251	+ // Moved BELOW the screen guard: this is the 9 KB WDesignKit icon font, used only by
	252	+ // WDesignKit's own UI (no #adminmenu rules in it), yet it was enqueued on every wp-admin
	253	+ // screen — dashboard, posts list, media library, plugins page (ClickUp 86d41cnze).
	254	+ // The admin-menu stylesheet is NOT gated here; see the note at the top of this method.
	255	+ wp_enqueue_style( 'wdkit-library-preview', WDKIT_URL . 'assets/fonts/style.css', array(), WDKIT_VERSION, false );
236	256
	257	+ wp_enqueue_media();
	258	+
237	259	$this->wdkit_enqueue_scripts( $hook );
238	260	$this->wdkit_enqueue_styles();
239	261	}
240	262
		@@ -244,8 +266,16 @@
244	266	* @since 1.0.0
245	267	*/
246	268	public function wdkit_enqueue_styles() {
247	269	wp_enqueue_style( 'wdkit-editor-css', WDKIT_URL . 'build/index.css', array(), WDKIT_VERSION );
	270	+
	271	+ /**
	272	+ * The build emits a right-to-left stylesheet (build/index-rtl.css) because the
	273	+ * source CSS uses physical left/right properties. WordPress does not auto-load
	274	+ * the -rtl variant; registering it here makes core swap in index-rtl.css on RTL
	275	+ * locales (Arabic, Hebrew, Farsi, Urdu) so the admin layout mirrors correctly.
	276	+ */
	277	+ wp_style_add_data( 'wdkit-editor-css', 'rtl', 'replace' );
248	278	}
249	279
250	280	/**
251	281	* Register the JavaScript for the admin area.
		@@ -253,11 +283,32 @@
253	283	* @param string $hook give builder name.
254	284	* @since 1.0.0
255	285	*/
256	286	public function wdkit_enqueue_scripts( $hook ) {
257		- $asset_file = WDKIT_PATH . 'build/index.asset.php';
	287	+ $asset_file = WDKIT_PATH . 'build/index.min.asset.php';
258	288	$asset = file_exists( $asset_file ) ? require $asset_file : array( 'dependencies' => array( 'wp-i18n', 'wp-element', 'wp-components' ), 'version' => WDKIT_VERSION );
259		- wp_enqueue_script( 'wdkit-editor-js', WDKIT_URL . 'build/index.js', $asset['dependencies'], $asset['version'], true );
	289	+
	290	+ /**
	291	+ * JS translations catalog.
	292	+ *
	293	+ * The app ships as a large minified bundle (build/index.min.js) which
	294	+ * `wp i18n make-pot` skips (all *.min.js are skipped) and could not parse
	295	+ * within WordPress.org's budget anyway. build/wdk-i18n-strings.js is a
	296	+ * small, readable catalog of every translatable JS string (generated from
	297	+ * src/ by bin/generate-i18n-strings.js). WordPress.org extracts strings
	298	+ * from it and builds the per-locale JSON keyed to this handle; loading it
	299	+ * here populates the shared wp.i18n store so the whole React app is
	300	+ * translated. It is a dependency of the app bundle so it (and its inline
	301	+ * translation data) load first.
	302	+ */
	303	+ $script_deps = $asset['dependencies'];
	304	+ if ( file_exists( WDKIT_PATH . 'build/wdk-i18n-strings.js' ) ) {
	305	+ wp_enqueue_script( 'wdkit-editor-i18n', WDKIT_URL . 'build/wdk-i18n-strings.js', array( 'wp-i18n' ), $asset['version'], array( 'in_footer' => true, 'strategy' => 'defer' ) );
	306	+ wp_set_script_translations( 'wdkit-editor-i18n', 'wdesignkit' );
	307	+ $script_deps = array_merge( $script_deps, array( 'wdkit-editor-i18n' ) );
	308	+ }
	309	+
	310	+ wp_enqueue_script( 'wdkit-editor-js', WDKIT_URL . 'build/index.min.js', $script_deps, $asset['version'], array( 'in_footer' => true, 'strategy' => 'defer' ) );
260	311	wp_set_script_translations( 'wdkit-editor-js', 'wdesignkit' );
261	312
262	313	$onbording_end = get_option( $this->wdkit_onbording_end );
263	314	$white_label = get_option( 'wkit_white_label', false );
		@@ -266,43 +317,82 @@
266	317	wp_localize_script(
267	318	'wdkit-editor-js',
268	319	'wdkitData',
269	320	array(
270		- 'ajax_url' => admin_url( 'admin-ajax.php' ),
271		- 'WDKIT_URL' => WDKIT_URL,
272		- 'WDKIT_ASSETS' => WDKIT_ASSETS,
273		- 'wdkit_server_url' => WDKIT_SERVER_SITE_URL,
274		- 'wdkit_site_api_url' => WDKIT_SERVER_API_URL,
275		- 'wdkit_wp_version' => get_bloginfo( 'version' ),
276		- 'home_url' => esc_url( home_url( '/' ) ),
277		- 'kit_nonce' => wp_create_nonce( 'wdkit_nonce' ),
278		- 'post_id' => get_the_ID(),
279		- 'post_type' => get_post_type(),
280		- 'text_domain' => WDKIT_TEXT_DOMAIN,
281		- 'use_editor' => $this->wdkit_use_editor(),
282		- 'post_type_list' => $this->wdkit_get_post_type_list(),
283		- 'WDKIT_onbording_end' => $onbording_end,
284		- 'wdkit_white_label' => $white_label,
285		- 'WDKIT_dark_mode' => $dark_mode,
	321	+ 'ajax_url' => admin_url( 'admin-ajax.php' ),
	322	+ 'WDKIT_URL' => WDKIT_URL,
	323	+ 'WDKIT_ASSETS' => WDKIT_ASSETS,
	324	+ 'wdkit_server_url' => WDKIT_SERVER_SITE_URL,
	325	+ 'wdkit_site_api_url' => WDKIT_SERVER_API_URL,
	326	+ 'wdkit_wp_version' => get_bloginfo( 'version' ),
	327	+ 'home_url' => esc_url( home_url( '/' ) ),
	328	+ 'kit_nonce' => wp_create_nonce( 'wdkit_nonce' ),
	329	+ 'post_id' => get_the_ID(),
	330	+ 'post_type' => get_post_type(),
	331	+ 'text_domain' => WDKIT_TEXT_DOMAIN,
	332	+ 'use_editor' => $this->wdkit_use_editor(),
	333	+ 'post_type_list' => $this->wdkit_get_post_type_list(),
	334	+ 'WDKIT_onbording_end' => $onbording_end,
	335	+ 'wdkit_white_label' => $white_label,
	336	+ 'WDKIT_dark_mode' => $dark_mode,
286	337	/** Widget Builder — public URL only, no server filesystem paths */
287		- 'WDKIT_SITE_URL' => WDKIT_GET_SITE_URL,
288		- 'WDKIT_DOC_URL' => WDKIT_DOCUMENT,
289		- 'WDKIT_SERVER_PATH' => WDKIT_SERVER_PATH,
290		- 'WDKIT_VERSION' => WDKIT_VERSION,
	338	+ 'WDKIT_SITE_URL' => WDKIT_GET_SITE_URL,
	339	+ 'WDKIT_DOC_URL' => WDKIT_DOCUMENT,
	340	+ 'WDKIT_SERVER_PATH' => WDKIT_SERVER_PATH,
	341	+ 'WDKIT_VERSION' => WDKIT_VERSION,
291	342
292		- 'gutenberg_template' => Wdkit_Wdesignkit::wdkit_is_compatible( 'gutenberg_template', 'template' )
	343	+ 'gutenberg_template' => Wdkit_Wdesignkit::wdkit_is_compatible( 'gutenberg_template', 'template' ),
	344	+
	345	+ /**
	346	+ * Data Sharing switcher, Settings panel.
	347	+ *
	348	+ * Read as a SITE option — the consent is one answer per install, not per blog. The
	349	+ * class guard matches the one in wdesignkit.php: on a white-labelled install, or when
	350	+ * a sibling POSIMYTH plugin's SDK copy won the loader, the tracker class is never
	351	+ * declared and the constant reference would fatal.
	352	+ *
	353	+ * Both references are root-namespaced. This file lives in wdkit\WdKit_enqueue while
	354	+ * the SDK class is declared in the global namespace: a string class name is always
	355	+ * global so the guard passed either way, but an unprefixed `Posimyth_Tracker_WDK::`
	356	+ * resolves against THIS namespace and fatals on every admin page load.
	357	+ */
	358	+ 'wdkit_data_sharing' => class_exists( '\Posimyth_Tracker_WDK' ) ? (bool) get_site_option( \Posimyth_Tracker_WDK::OPT_IN_OPTION, false ) : false,
	359	+ 'wdkit_consent_nonce' => wp_create_nonce( 'posimyth_consent_wdk' ),
	360	+
	361	+ /**
	362	+ * Whether the Data Sharing card may be shown at all.
	363	+ *
	364	+ * Tracks the tracker class rather than the white-label flag: a rebranded install now
	365	+ * keeps the feature (see wdesignkit.php), so this is false only when the SDK genuinely
	366	+ * failed to load — a sibling POSIMYTH plugin winning the loader with a diverged copy.
	367	+ * Rendering a switch in that case would offer a save with no handler behind it.
	368	+ *
	369	+ * Separate from wdkit_data_sharing on purpose: that one is false both when sharing is
	370	+ * off and when the feature is absent, which cannot tell the two apart.
	371	+ */
	372	+ 'wdkit_data_sharing_available' => class_exists( '\Posimyth_Tracker_WDK' ),
	373	+
	374	+ /**
	375	+ * Reseller's product name, for the Data Sharing copy that would otherwise say
	376	+ * "WDesignKit" on a plugin they have rebranded as their own.
	377	+ */
	378	+ 'wdkit_data_sharing_name' => ! empty( $white_label['plugin_name'] ) ? $white_label['plugin_name'] : 'WDesignKit',
	379	+
	380	+ /** help_link is the reseller's "hide POSIMYTH documentation links" switch. */
	381	+ 'wdkit_data_sharing_docs' => empty( $white_label['help_link'] ) ? WDKIT_DOCUMENT . 'data-sharing/' : ''
293	382	)
294	383	);
295	384
296	385	/**Ace Editor files for Widget-builder */
297	386	if ( 'toplevel_page_wdesign-kit' === $hook && Wdkit_Wdesignkit::wdkit_is_compatible( 'builder', 'widget' ) ) {
298		- wp_enqueue_script( 'widgetBuilder-script-editor-js', WDKIT_URL . 'assets/js/extra/ace.min.js', array( 'wp-element' ), WDKIT_VERSION, true );
299		- wp_enqueue_script( 'widgetBuilder-script-editor-cobalt', WDKIT_URL . 'assets/js/extra/theme-cobalt.js', array( 'wp-element' ), WDKIT_VERSION, true );
300		- wp_enqueue_script( 'widgetBuilder-script-editor-html', WDKIT_URL . 'assets/js/extra/mode-html.js', array( 'wp-element' ), WDKIT_VERSION, true );
	387	+ wp_enqueue_script( 'widgetBuilder-script-editor-js', WDKIT_URL . 'assets/js/extra/ace.min.js', array( 'wp-element' ), WDKIT_VERSION, array( 'in_footer' => true, 'strategy' => 'defer' ) );
	388	+ wp_enqueue_script( 'widgetBuilder-script-editor-cobalt', WDKIT_URL . 'assets/js/extra/theme-cobalt.js', array( 'wp-element' ), WDKIT_VERSION, array( 'in_footer' => true, 'strategy' => 'defer' ) );
	389	+ wp_enqueue_script( 'widgetBuilder-script-editor-html', WDKIT_URL . 'assets/js/extra/mode-html.js', array( 'wp-element' ), WDKIT_VERSION, array( 'in_footer' => true, 'strategy' => 'defer' ) );
301	390	}
302	391
303	392	if ( 'elementor' === $hook && Wdkit_Wdesignkit::wdkit_is_compatible( 'elementor_template', 'template' ) ) {
304		- wp_enqueue_script( 'wdkit-frontend-editor', WDKIT_ASSETS . '/js/main/elementor/elementor-editor.js', array( 'jquery', 'wp-i18n' ), WDKIT_VERSION, true );
	393	+ wp_enqueue_script( 'wdkit-frontend-editor', WDKIT_ASSETS . 'js/main/elementor/elementor-editor.js', array( 'jquery', 'wp-i18n' ), WDKIT_VERSION, array( 'in_footer' => true, 'strategy' => 'defer' ) );
	394	+ wp_set_script_translations( 'wdkit-frontend-editor', 'wdesignkit' );
305	395	$this->wdkit_cross_copy_paste_script( 'elementor' );
306	396	}
307	397	}
308	398
		@@ -344,9 +434,9 @@
344	434	$deps[] = 'wp-blocks';
345	435	$deps[] = 'wp-dom-ready';
346	436	}
347	437
348		- wp_enqueue_script( 'wdkit-cross-copy-paste', WDKIT_ASSETS . '/js/main/wdkit-cross-copy-paste.js', $deps, WDKIT_VERSION, true );
	438	+ wp_enqueue_script( 'wdkit-cross-copy-paste', WDKIT_ASSETS . 'js/main/wdkit-cross-copy-paste.js', $deps, WDKIT_VERSION, array( 'in_footer' => true, 'strategy' => 'defer' ) );
349	439	wp_set_script_translations( 'wdkit-cross-copy-paste', 'wdesignkit' );
350	440	wp_localize_script(
351	441	'wdkit-cross-copy-paste',
352	442	'wdkitCrossCopyPaste',