--- a/wp/wp-admin/js/widgets.js Tue Oct 22 16:11:46 2019 +0200
+++ b/wp/wp-admin/js/widgets.js Tue Dec 15 13:49:49 2020 +0100
@@ -16,20 +16,6 @@
hoveredSidebar: null,
/**
- * Translations.
- *
- * Exported from PHP in wp_default_scripts().
- *
- * @var {object}
- */
- l10n: {
- save: '{save}',
- saved: '{saved}',
- saveAlert: '{saveAlert}',
- widgetAdded: '{widgetAdded}'
- },
-
- /**
* Lookup of which widgets have had change events triggered.
*
* @var {object}
@@ -109,7 +95,7 @@
$( this ).find( '.widget-inside :tabbable:first' ).focus();
} );
- event.returnValue = wpWidgets.l10n.saveAlert;
+ event.returnValue = wp.i18n.__( 'The changes you made will be lost if you navigate away from this page.' );
return event.returnValue;
}
});
@@ -127,8 +113,7 @@
});
$(document.body).bind('click.widgets-toggle', function(e) {
- var target = $(e.target),
- css = { 'z-index': 100 },
+ var target = $(e.target), css = {},
widget, inside, targetWidth, widgetWidth, margin, saveButton, widgetId,
toggleBtn = target.closest( '.widget' ).find( '.widget-top button.widget-action' );
@@ -142,11 +127,11 @@
// Save button is initially disabled, but is enabled when a field is changed.
if ( ! widget.data( 'dirty-state-initialized' ) ) {
saveButton = inside.find( '.widget-control-save' );
- saveButton.prop( 'disabled', true ).val( wpWidgets.l10n.saved );
+ saveButton.prop( 'disabled', true ).val( wp.i18n.__( 'Saved' ) );
inside.on( 'input change', function() {
self.dirtyWidgets[ widgetId ] = true;
widget.addClass( 'widget-dirty' );
- saveButton.prop( 'disabled', false ).val( wpWidgets.l10n.save );
+ saveButton.prop( 'disabled', false ).val( wp.i18n.__( 'Save' ) );
});
widget.data( 'dirty-state-initialized', true );
}
@@ -212,7 +197,7 @@
handle: '> .widget-top > .widget-title',
distance: 2,
helper: 'clone',
- zIndex: 100,
+ zIndex: 101,
containment: '#wpwrap',
refreshPositions: true,
start: function( event, ui ) {
@@ -222,9 +207,9 @@
the_id = this.id;
if ( chooser.length ) {
- // Hide the chooser and move it out of the widget
+ // Hide the chooser and move it out of the widget.
$( '#wpbody-content' ).append( chooser.hide() );
- // Delete the cloned chooser from the drag helper
+ // Delete the cloned chooser from the drag helper.
ui.helper.find('.widgets-chooser').remove();
self.clearWidgetSelection();
}
@@ -249,7 +234,7 @@
*
* @ignore
*
- * @param {object} event jQuery event object.
+ * @param {Object} event jQuery event object.
*/
over: function( event ) {
var $wrap = $( event.target ).parent();
@@ -274,7 +259,7 @@
*
* @ignore
*
- * @param {object} event jQuery event object.
+ * @param {Object} event jQuery event object.
*/
out: function( event ) {
if ( wpWidgets.hoveredSidebar ) {
@@ -321,7 +306,7 @@
wpWidgets.hoveredSidebar = null;
if ( $widget.hasClass('deleting') ) {
- wpWidgets.save( $widget, 1, 0, 1 ); // delete widget
+ wpWidgets.save( $widget, 1, 0, 1 ); // Delete widget.
$widget.remove();
return;
}
@@ -363,7 +348,7 @@
$children = $sidebar.children('.widget');
- // Make sure the dropped widget is at the top
+ // Make sure the dropped widget is at the top.
if ( $children.length > 1 ) {
child = $children.get(0);
item = $widget.get(0);
@@ -386,14 +371,14 @@
},
deactivate: function() {
- // Remove all min-height added on "start"
+ // Remove all min-height added on "start".
$(this).css( 'min-height', '' ).parent().removeClass( 'widget-hover' );
},
receive: function( event, ui ) {
var $sender = $( ui.sender );
- // Don't add more widgets to orphaned sidebars
+ // Don't add more widgets to orphaned sidebars.
if ( this.id.indexOf('orphaned_widgets') > -1 ) {
$sender.sortable('cancel');
return;
@@ -431,7 +416,7 @@
}
});
- // Area Chooser
+ // Area Chooser.
$( '#widgets-right .widgets-holder-wrap' ).each( function( index, element ) {
var $element = $( element ),
name = $element.find( '.sidebar-name h2' ).text(),
@@ -465,7 +450,7 @@
toggleButton.attr( 'aria-expanded', 'false' );
self.closeChooser();
} else {
- // Open the chooser
+ // Open the chooser.
self.clearWidgetSelection();
$( '#widgets-left' ).addClass( 'chooser' );
// Add CSS class and insert the chooser after the widget description.
@@ -486,7 +471,7 @@
}
});
- // Add event handlers
+ // Add event handlers.
chooser.on( 'click.widgets-chooser', function( event ) {
var $target = $( event.target );
@@ -587,7 +572,7 @@
wpWidgets.appendTitle( widget );
// Re-disable the save button.
- widget.find( '.widget-control-save' ).prop( 'disabled', true ).val( wpWidgets.l10n.saved );
+ widget.find( '.widget-control-save' ).prop( 'disabled', true ).val( wp.i18n.__( 'Saved' ) );
widget.removeClass( 'widget-dirty' );
@@ -662,7 +647,7 @@
add = widget.find( 'input.add_new' ).val();
n = widget.find( 'input.multi_number' ).val();
- // Remove the cloned chooser from the widget
+ // Remove the cloned chooser from the widget.
widget.find('.widgets-chooser').remove();
if ( 'multi' === add ) {
@@ -689,7 +674,7 @@
sidebar.sortable('refresh');
wpWidgets.save( widget, 0, 0, 1 );
- // No longer "new" widget
+ // No longer "new" widget.
widget.find( 'input.add_new' ).val('');
$document.trigger( 'widget-added', [ widget ] );
@@ -718,7 +703,7 @@
// have to queue this "by hand".
widget.find( '.widget-title' ).trigger('click');
// At the end of the animation, announce the widget has been added.
- window.wp.a11y.speak( wpWidgets.l10n.widgetAdded, 'assertive' );
+ window.wp.a11y.speak( wp.i18n.__( 'Widget has been added to the selected sidebar' ), 'assertive' );
}, 250 );
},
@@ -744,7 +729,7 @@
*
* Used when a Widget gets dragged in/out of the Sidebar and never dropped.
*
- * @param {object} event jQuery event object.
+ * @param {Object} event jQuery event object.
*/
closeSidebar: function( event ) {
this.hoveredSidebar
@@ -759,3 +744,20 @@
$document.ready( function(){ wpWidgets.init(); } );
})(jQuery);
+
+/**
+ * Removed in 5.5.0, needed for back-compatibility.
+ *
+ * @since 4.9.0
+ * @deprecated 5.5.0
+ *
+ * @type {object}
+*/
+wpWidgets.l10n = wpWidgets.l10n || {
+ save: '',
+ saved: '',
+ saveAlert: '',
+ widgetAdded: ''
+};
+
+wpWidgets.l10n = window.wp.deprecateL10nObject( 'wpWidgets.l10n', wpWidgets.l10n );