← All changes | includes/ui_settings/class-page-structure.php +34 -21 11.8.2 → 11.9 View file →

		@@ -21,10 +21,11 @@
21	21	* == All Page Parameters ==
22	22	*
23	23	* TODO Refactorig: Continue work with description of the: List of all parameters, that possible to use in public function tabs() { ... }
24	24
25		-'is_default_full_screen' => false, // true | false. Default: false.
26		-'is_force_full_screen' => false, // true | false. Default: false.
	25	+'is_default_full_screen' => false, // true | false. Default: false.
	26	+'is_force_full_screen' => false, // true | false. Default: false.
	27	+'is_force_normal_screen' => false, // true | false. Default: false.
27	28	'right_vertical_sidebar__is_show' => false, // true | false. Default: false.
28	29	'right_vertical_sidebar__default_view_mode' => 'max', // '' | 'min' | 'compact' | 'max' | 'none'. Default: ''.
29	30	'right_vertical_sidebar__content_click_collapse_mode' => '', // '' | 'min' | 'compact' | 'none'. Collapse or hide an expanded right sidebar when the page content is clicked. Default: ''.
30	31	'left_navigation__default_view_mode' => 'max', // '' | 'min' | 'compact' | 'max' | 'none'. Default: ''.
		@@ -458,21 +459,27 @@
458	459
459	460	return $page_default_mode;
460	461	}
461	462
462		- /**
463		- * Check whether the current page should open in fullscreen.
	463	+ /**
	464	+ * Check whether the current page should open in fullscreen.
	465	+ *
	466	+ * Forced normal mode wins first, followed by forced fullscreen, the saved user
	467	+ * preference, and finally the page default. This order lets passive pages leave
	468	+ * fullscreen without changing the administrator's preference for other pages.
464	469	*
465		- * Forced page mode wins, then the saved user preference, then the page default.
466		- *
467	470	* @return bool
468	471	*/
469		- public function is_full_screen_mode_enabled() {
	472	+ public function is_full_screen_mode_enabled() {
	473	+
	474	+ if ( $this->is_use_option__in_subtabs_or_tabs( 'is_force_normal_screen' ) ) {
	475	+ return false;
	476	+ }
	477	+
	478	+ if ( $this->is_use_option__in_subtabs_or_tabs( 'is_force_full_screen' ) ) {
	479	+ return true;
	480	+ }
470	481
471		- if ( $this->is_use_option__in_subtabs_or_tabs( 'is_force_full_screen' ) ) {
472		- return true;
473		- }
474		-
475	482	if ( class_exists( 'WPBC_User_Custom_Data_Saver' ) ) {
476	483	$saved_full_screen = WPBC_User_Custom_Data_Saver::get_user_data_value( wpbc_get_current_user_id(), 'is_full_screen' );
477	484	$saved_full_screen = function_exists( 'wpbc_ui__get_full_screen_mode_from_cookie' )
478	485	? wpbc_ui__get_full_screen_mode_from_cookie( $saved_full_screen )
		@@ -489,18 +496,24 @@
489	496
490	497	return (bool) $this->is_use_option__in_subtabs_or_tabs( 'is_default_full_screen' );
491	498	}
492	499
493		- /**
494		- * Check whether the current page should save and restore the user fullscreen preference.
495		- *
496		- * @return bool
497		- */
498		- public function is_full_screen_user_mode_enabled() {
499		-
500		- if ( $this->is_use_option__in_subtabs_or_tabs( 'is_force_full_screen' ) ) {
501		- return false;
502		- }
	500	+ /**
	501	+ * Check whether the current page should save and restore the user fullscreen preference.
	502	+ *
	503	+ * Pages with either forced display mode are page-controlled and must not mutate
	504	+ * the administrator's reusable fullscreen preference.
	505	+ *
	506	+ * @return bool
	507	+ */
	508	+ public function is_full_screen_user_mode_enabled() {
	509	+
	510	+ if (
	511	+ $this->is_use_option__in_subtabs_or_tabs( 'is_force_normal_screen' )
	512	+ || $this->is_use_option__in_subtabs_or_tabs( 'is_force_full_screen' )
	513	+ ) {
	514	+ return false;
	515	+ }
503	516
504	517	return true;
505	518	}
506	519