Merge branch 't/10851' into major

Author: Reinmar

plugins/image2/dialogs/image2.js

@@ -283,7 +283,7 @@ CKEDITOR.dialog.add( 'image2', function( editor ) {
 		},
 		onShow: function() {
 			// Create a "global" reference to edited widget.
-			widget = this._.widget;
+			widget = this.widget;
 
 			// Create a "global" reference to widget's image.
 			image = widget.parts.image;

plugins/image2/plugin.js

@@ -236,6 +236,11 @@
 			this.on( 'contextMenu', function( evt ) {
 				evt.data.image2 = CKEDITOR.TRISTATE_OFF;
 			} );
+
+			// Pass the reference to this widget to the dialog.
+			this.on( 'dialog', function( evt ) {
+				evt.data.widget = this;
+			}, this );
 		},
 
 		upcast: upcastWidgetElement,

plugins/widget/plugin.js

@@ -902,9 +902,6 @@
 				if ( !that.fire( 'dialog', dialog ) )
 					return;
 
-				// Make widget accessible beyond setup and commit.
-				dialog._.widget = that;
-
 				showListener = dialog.on( 'show', function() {
 					dialog.setupContent( that );
 				} );