← All changes | include/widget-languages.php +52 -30 2.9 → 2.6.2 View file →

		@@ -1,8 +1,5 @@
1	1	<?php
2		-/**
3		- * @package Polylang
4		- */
5	2
6	3	/**
7	4	* The language switcher widget
8	5	*
		@@ -34,49 +31,26 @@
34	31	* @param array $args Display arguments including before_title, after_title, before_widget, and after_widget.
35	32	* @param array $instance The settings for the particular instance of the widget
36	33	*/
37	34	public function widget( $args, $instance ) {
38		- // Sets a unique id for dropdown.
	35	+ // Sets a unique id for dropdown
39	36	$instance['dropdown'] = empty( $instance['dropdown'] ) ? 0 : $args['widget_id'];
40	37
41	38	if ( $list = pll_the_languages( array_merge( $instance, array( 'echo' => 0 ) ) ) ) {
42	39	$title = empty( $instance['title'] ) ? '' : $instance['title'];
43		-
44	40	/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
45	41	$title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
46	42
47	43	echo $args['before_widget']; // phpcs:ignore WordPress.Security.EscapeOutput
48		-
49	44	if ( $title ) {
50	45	echo $args['before_title'] . $title . $args['after_title']; // phpcs:ignore WordPress.Security.EscapeOutput
51	46	}
52		-
53		- // The title may be filtered: Strip out HTML and make sure the aria-label is never empty.
54		- $aria_label = trim( wp_strip_all_tags( $title ) );
55		- if ( ! $aria_label ) {
56		- $aria_label = __( 'Choose a language', 'polylang' );
57		- }
58		-
59	47	if ( $instance['dropdown'] ) {
60		- echo '<label class="screen-reader-text" for="' . esc_attr( 'lang_choice_' . $instance['dropdown'] ) . '">' . esc_html( $aria_label ) . '</label>';
	48	+ echo '<label class="screen-reader-text" for="' . esc_attr( 'lang_choice_' . $instance['dropdown'] ) . '">' . esc_html__( 'Choose a language', 'polylang' ) . '</label>';
61	49	echo $list; // phpcs:ignore WordPress.Security.EscapeOutput
62	50	} else {
63		- $format = current_theme_supports( 'html5', 'navigation-widgets' ) ? 'html5' : 'xhtml';
64		-
65		- /** This filter is documented in wp-includes/widgets/class-wp-nav-menu-widget.php */
66		- $format = apply_filters( 'navigation_widgets_format', $format );
67		-
68		- if ( 'html5' === $format ) {
69		- echo '<nav role="navigation" aria-label="' . esc_attr( $aria_label ) . '">';
70		- }
71		-
72	51	echo "<ul>\n" . $list . "</ul>\n"; // phpcs:ignore WordPress.Security.EscapeOutput
73		-
74		- if ( 'html5' === $format ) {
75		- echo '</nav>';
76		- }
77	52	}
78		-
79	53	echo $args['after_widget']; // phpcs:ignore WordPress.Security.EscapeOutput
80	54	}
81	55	}
82	56
		@@ -88,10 +62,10 @@
88	62	* @param array $new_instance New settings for this instance as input by the user via form()
89	63	* @param array $old_instance Old settings for this instance
90	64	* @return array Settings to save or bool false to cancel saving
91	65	*/
92		- public function update( $new_instance, $old_instance ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
93		- $instance = array( 'title' => sanitize_text_field( $new_instance['title'] ) );
	66	+ public function update( $new_instance, $old_instance ) {
	67	+ $instance['title'] = sanitize_text_field( $new_instance['title'] );
94	68	foreach ( array_keys( PLL_Switcher::get_switcher_options( 'widget' ) ) as $key ) {
95	69	$instance[ $key ] = ! empty( $new_instance[ $key ] ) ? 1 : 0;
96	70	}
97	71
		@@ -129,6 +103,54 @@
129	103	( ! empty( $instance['dropdown'] ) && in_array( $key, array( 'show_names', 'show_flags', 'hide_current' ) ) ? ' style="display:none;"' : '' ),
130	104	esc_attr( 'pll-' . $key )
131	105	);
132	106	}
	107	+
	108	+ // FIXME echoing script in form is not very clean
	109	+ // but it does not work if enqueued properly :
	110	+ // clicking save on a widget makes this code unreachable for the just saved widget ( ?! )
	111	+ $this->admin_print_script();
	112	+ }
	113	+
	114	+ /**
	115	+ * Add javascript to control the language switcher options
	116	+ *
	117	+ * @since 1.3
	118	+ */
	119	+ public function admin_print_script() {
	120	+ static $done = false;
	121	+
	122	+ if ( $done ) {
	123	+ return;
	124	+ }
	125	+
	126	+ $done = true;
	127	+ ?>
	128	+ <script type='text/javascript'>
	129	+ //<![CDATA[
	130	+ jQuery( document ).ready( function( $ ) {
	131	+ function pll_toggle( a, test ) {
	132	+ test ? a.show() : a.hide();
	133	+ }
	134	+
	135	+ // Remove all options if dropdown is checked
	136	+ $( '.widgets-sortables,.control-section-sidebar' ).on( 'change', '.pll-dropdown', function() {
	137	+ var this_id = $( this ).parent().parent().parent().children( '.widget-id' ).attr( 'value' );
	138	+ pll_toggle( $( '.no-dropdown-' + this_id ), 'checked' != $( this ).attr( 'checked' ) );
	139	+ } );
	140	+
	141	+ // Disallow unchecking both show names and show flags
	142	+ var options = ['-show_flags', '-show_names'];
	143	+ $.each( options, function( i, v ) {
	144	+ $( '.widgets-sortables,.control-section-sidebar' ).on( 'change', '.pll' + v, function() {
	145	+ var this_id = $( this ).parent().parent().parent().children( '.widget-id' ).attr( 'value' );
	146	+ if ( 'checked' != $( this ).attr( 'checked' ) ) {
	147	+ $( '#widget-' + this_id + options[ 1-i ] ).prop( 'checked', true );
	148	+ }
	149	+ } );
	150	+ } );
	151	+ } );
	152	+ //]]>
	153	+ </script>
	154	+ <?php
133	155	}
134	156	}