Skip to content

Commit

Permalink
Merge branch 'MDL-63768-35' of https://github.com/lucaboesch/moodle i…
Browse files Browse the repository at this point in the history
…nto MOODLE_35_STABLE
  • Loading branch information
David Monllao committed Nov 19, 2018
2 parents 8bee660 + 54216a5 commit 8b508a6
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 5 deletions.
Expand Up @@ -405,7 +405,7 @@ Y.namespace('M.atto_image').Button = Y.Base.create('button', Y.M.editor_atto.Edi

var dialogue = this.getDialogue({
headerContent: M.util.get_string('imageproperties', COMPONENTNAME),
width: '480px',
width: 'auto',
focusAfterHide: true,
focusOnShowSelector: SELECTORS.INPUTURL
});
Expand Down

Large diffs are not rendered by default.

Expand Up @@ -405,7 +405,7 @@ Y.namespace('M.atto_image').Button = Y.Base.create('button', Y.M.editor_atto.Edi

var dialogue = this.getDialogue({
headerContent: M.util.get_string('imageproperties', COMPONENTNAME),
width: '480px',
width: 'auto',
focusAfterHide: true,
focusOnShowSelector: SELECTORS.INPUTURL
});
Expand Down
2 changes: 1 addition & 1 deletion lib/editor/atto/plugins/image/yui/src/button/js/button.js
Expand Up @@ -403,7 +403,7 @@ Y.namespace('M.atto_image').Button = Y.Base.create('button', Y.M.editor_atto.Edi

var dialogue = this.getDialogue({
headerContent: M.util.get_string('imageproperties', COMPONENTNAME),
width: '480px',
width: 'auto',
focusAfterHide: true,
focusOnShowSelector: SELECTORS.INPUTURL
});
Expand Down
Expand Up @@ -130,6 +130,7 @@ Y.namespace('M.atto_link').Button = Y.Base.create('button', Y.M.editor_atto.Edit

var dialogue = this.getDialogue({
headerContent: M.util.get_string('createlink', COMPONENTNAME),
width: 'auto',
focusAfterHide: true,
focusOnShowSelector: SELECTORS.URLINPUT
});
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Expand Up @@ -130,6 +130,7 @@ Y.namespace('M.atto_link').Button = Y.Base.create('button', Y.M.editor_atto.Edit

var dialogue = this.getDialogue({
headerContent: M.util.get_string('createlink', COMPONENTNAME),
width: 'auto',
focusAfterHide: true,
focusOnShowSelector: SELECTORS.URLINPUT
});
Expand Down
1 change: 1 addition & 0 deletions lib/editor/atto/plugins/link/yui/src/button/js/button.js
Expand Up @@ -128,6 +128,7 @@ Y.namespace('M.atto_link').Button = Y.Base.create('button', Y.M.editor_atto.Edit

var dialogue = this.getDialogue({
headerContent: M.util.get_string('createlink', COMPONENTNAME),
width: 'auto',
focusAfterHide: true,
focusOnShowSelector: SELECTORS.URLINPUT
});
Expand Down

0 comments on commit 8b508a6

Please sign in to comment.