mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-03 15:32:43 +02:00
Code Issues Projects Releases Wiki Activity

MDL-46061 atto_image: Prevent error when image does not have a size

Browse Source
This commit is contained in:
Frederic Massart 2014-06-19 13:31:36 +08:00
parent 337075d17b
commit 91bc9570e1
4 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js vendored
View File

@ -243,6 +243,9 @@ Y.namespace('M.atto_image').Button = Y.Base.create('button', Y.M.editor_atto.Edi
return;
}
// Reset the image dimensions.
this._rawImageDimensions = null;
var dialogue = this.getDialogue({
headerContent: M.util.get_string('imageproperties', COMPONENTNAME),
width: '480px',
@ -388,6 +391,11 @@ Y.namespace('M.atto_image').Button = Y.Base.create('button', Y.M.editor_atto.Edi
rawPercentage,
rawSize;
// If we do not know the image size, do not do anything.
if (!this._rawImageDimensions) {
return;
}
// Set the width back to default if it is empty.
if (keyFieldValue === '') {
keyFieldValue = this._rawImageDimensions[keyFieldType];

4
lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js vendored
View File

File diff suppressed because one or more lines are too long

8
lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js vendored
View File

@ -243,6 +243,9 @@ Y.namespace('M.atto_image').Button = Y.Base.create('button', Y.M.editor_atto.Edi
return;
}
// Reset the image dimensions.
this._rawImageDimensions = null;
var dialogue = this.getDialogue({
headerContent: M.util.get_string('imageproperties', COMPONENTNAME),
width: '480px',
@ -388,6 +391,11 @@ Y.namespace('M.atto_image').Button = Y.Base.create('button', Y.M.editor_atto.Edi
rawPercentage,
rawSize;
// If we do not know the image size, do not do anything.
if (!this._rawImageDimensions) {
return;
}
// Set the width back to default if it is empty.
if (keyFieldValue === '') {
keyFieldValue = this._rawImageDimensions[keyFieldType];

8
lib/editor/atto/plugins/image/yui/src/button/js/button.js vendored
View File

@ -241,6 +241,9 @@ Y.namespace('M.atto_image').Button = Y.Base.create('button', Y.M.editor_atto.Edi
return;
}
// Reset the image dimensions.
this._rawImageDimensions = null;
var dialogue = this.getDialogue({
headerContent: M.util.get_string('imageproperties', COMPONENTNAME),
width: '480px',
@ -386,6 +389,11 @@ Y.namespace('M.atto_image').Button = Y.Base.create('button', Y.M.editor_atto.Edi
rawPercentage,
rawSize;
// If we do not know the image size, do not do anything.
if (!this._rawImageDimensions) {
return;
}
// Set the width back to default if it is empty.
if (keyFieldValue === '') {
keyFieldValue = this._rawImageDimensions[keyFieldType];