Merge branch 'MDL-44949-master' of git://github.com/damyon/moodle

This commit is contained in:
Sam Hemelryk
2014-04-07 08:15:34 +12:00
4 changed files with 7 additions and 7 deletions
@@ -411,8 +411,8 @@ Y.namespace('M.atto_image').Button = Y.Base.create('button', Y.M.editor_atto.Edi
input.set('value', params.url);
// Auto set the width and height.
self._form.one('.' + CSS.INPUTWIDTH).set('value', '');
self._form.one('.' + CSS.INPUTHEIGHT).set('value', '');
this._form.one('.' + CSS.INPUTWIDTH).set('value', '');
this._form.one('.' + CSS.INPUTHEIGHT).set('value', '');
// Load the preview image.
this._loadPreviewImage(params.url);
File diff suppressed because one or more lines are too long
@@ -411,8 +411,8 @@ Y.namespace('M.atto_image').Button = Y.Base.create('button', Y.M.editor_atto.Edi
input.set('value', params.url);
// Auto set the width and height.
self._form.one('.' + CSS.INPUTWIDTH).set('value', '');
self._form.one('.' + CSS.INPUTHEIGHT).set('value', '');
this._form.one('.' + CSS.INPUTWIDTH).set('value', '');
this._form.one('.' + CSS.INPUTHEIGHT).set('value', '');
// Load the preview image.
this._loadPreviewImage(params.url);
+2 -2
View File
@@ -409,8 +409,8 @@ Y.namespace('M.atto_image').Button = Y.Base.create('button', Y.M.editor_atto.Edi
input.set('value', params.url);
// Auto set the width and height.
self._form.one('.' + CSS.INPUTWIDTH).set('value', '');
self._form.one('.' + CSS.INPUTHEIGHT).set('value', '');
this._form.one('.' + CSS.INPUTWIDTH).set('value', '');
this._form.one('.' + CSS.INPUTHEIGHT).set('value', '');
// Load the preview image.
this._loadPreviewImage(params.url);