Merge branch 'MDL-66601-master' of git://github.com/mihailges/moodle

lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js

@@ -488,7 +488,9 @@ Y.namespace('M.atto_image').Button = Y.Base.create('button', Y.M.editor_atto.Edi
             focusAfterHide: true,
             focusOnShowSelector: SELECTORS.INPUTURL
         });
-
+        // Set a maximum width for the dialog. This will prevent the dialog width to extend beyond the screen width
+        // in cases when the uploaded image has larger width.
+        dialogue.get('boundingBox').setStyle('maxWidth', '90%');
         // Set the dialogue content, and then show the dialogue.
         dialogue.set('bodyContent', this._getDialogueContent())
                 .show();

lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js

@@ -488,7 +488,9 @@ Y.namespace('M.atto_image').Button = Y.Base.create('button', Y.M.editor_atto.Edi
             focusAfterHide: true,
             focusOnShowSelector: SELECTORS.INPUTURL
         });
-
+        // Set a maximum width for the dialog. This will prevent the dialog width to extend beyond the screen width
+        // in cases when the uploaded image has larger width.
+        dialogue.get('boundingBox').setStyle('maxWidth', '90%');
         // Set the dialogue content, and then show the dialogue.
         dialogue.set('bodyContent', this._getDialogueContent())
                 .show();

lib/editor/atto/plugins/image/yui/src/button/js/button.js

@@ -486,7 +486,9 @@ Y.namespace('M.atto_image').Button = Y.Base.create('button', Y.M.editor_atto.Edi
             focusAfterHide: true,
             focusOnShowSelector: SELECTORS.INPUTURL
         });
-
+        // Set a maximum width for the dialog. This will prevent the dialog width to extend beyond the screen width
+        // in cases when the uploaded image has larger width.
+        dialogue.get('boundingBox').setStyle('maxWidth', '90%');
         // Set the dialogue content, and then show the dialogue.
         dialogue.set('bodyContent', this._getDialogueContent())
                 .show();