moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-55324-master-fix' of git://github.com/cameron1729/moodle

Browse source
This commit is contained in:
David Monllao 2016-11-25 11:11:20 +08:00
commit b4f82837ba
6 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/editor/atto/plugins/media/styles.css
View file

@ -6,7 +6,7 @@
} }
.atto_form.atto_media > .tab-content { .atto_form.atto_media > .tab-content {
max-height: 60vh; max-height: 45vh;
overflow-x: hidden; overflow-x: hidden;
padding-left: 20px; padding-left: 20px;
padding-right: 20px; padding-right: 20px;

1
lib/editor/atto/plugins/media/tests/behat/media.feature
View file

@ -58,6 +58,7 @@ Feature: Add media to Atto
And I click on "Private files" "link" in the ".moodle-dialogue-base[aria-hidden='false'] .fp-repo-area" "css_element" And I click on "Private files" "link" in the ".moodle-dialogue-base[aria-hidden='false'] .fp-repo-area" "css_element"
And I click on "moodle-logo.png" "link" And I click on "moodle-logo.png" "link"
And I click on "Select this file" "button" in the ".moodle-dialogue-base[aria-hidden='false']" "css_element" And I click on "Select this file" "button" in the ".moodle-dialogue-base[aria-hidden='false']" "css_element"
And I change window size to "large"
And I set the field with xpath "//*[contains(concat(' ', normalize-space(@class), ' '), ' atto_media_width_entry ')]" to "420" And I set the field with xpath "//*[contains(concat(' ', normalize-space(@class), ' '), ' atto_media_width_entry ')]" to "420"
And I set the field with xpath "//*[contains(concat(' ', normalize-space(@class), ' '), ' atto_media_height_entry ')]" to "69" And I set the field with xpath "//*[contains(concat(' ', normalize-space(@class), ' '), ' atto_media_height_entry ')]" to "69"
And I click on "Display options" "link" And I click on "Display options" "link"

3
lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-debug.js vendored
View file

@ -745,7 +745,8 @@ Y.namespace('M.atto_media').Button = Y.Base.create('button', Y.M.editor_atto.Edi
multisource: true, multisource: true,
id: CSS.MEDIA_SOURCE, id: CSS.MEDIA_SOURCE,
entersourcelabel: mediumType + 'sourcelabel', entersourcelabel: mediumType + 'sourcelabel',
addcomponentlabel: 'addsource' addcomponentlabel: 'addsource',
addsourcehelp: this.get('help').addsource
}); });
this._addComponent(element, TEMPLATES.FORM_COMPONENTS.SOURCE, SELECTORS.MEDIA_SOURCE, context, callback); this._addComponent(element, TEMPLATES.FORM_COMPONENTS.SOURCE, SELECTORS.MEDIA_SOURCE, context, callback);
}, },

2
lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-min.js vendored
View file

File diff suppressed because one or more lines are too long

3
lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button.js vendored
View file

@ -745,7 +745,8 @@ Y.namespace('M.atto_media').Button = Y.Base.create('button', Y.M.editor_atto.Edi
multisource: true, multisource: true,
id: CSS.MEDIA_SOURCE, id: CSS.MEDIA_SOURCE,
entersourcelabel: mediumType + 'sourcelabel', entersourcelabel: mediumType + 'sourcelabel',
addcomponentlabel: 'addsource' addcomponentlabel: 'addsource',
addsourcehelp: this.get('help').addsource
}); });
this._addComponent(element, TEMPLATES.FORM_COMPONENTS.SOURCE, SELECTORS.MEDIA_SOURCE, context, callback); this._addComponent(element, TEMPLATES.FORM_COMPONENTS.SOURCE, SELECTORS.MEDIA_SOURCE, context, callback);
}, },

3
lib/editor/atto/plugins/media/yui/src/button/js/button.js vendored
View file

@ -743,7 +743,8 @@ Y.namespace('M.atto_media').Button = Y.Base.create('button', Y.M.editor_atto.Edi
multisource: true, multisource: true,
id: CSS.MEDIA_SOURCE, id: CSS.MEDIA_SOURCE,
entersourcelabel: mediumType + 'sourcelabel', entersourcelabel: mediumType + 'sourcelabel',
addcomponentlabel: 'addsource' addcomponentlabel: 'addsource',
addsourcehelp: this.get('help').addsource
}); });
this._addComponent(element, TEMPLATES.FORM_COMPONENTS.SOURCE, SELECTORS.MEDIA_SOURCE, context, callback); this._addComponent(element, TEMPLATES.FORM_COMPONENTS.SOURCE, SELECTORS.MEDIA_SOURCE, context, callback);
}, },