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

Merge branch 'wip-mdl-56210-fix' of https://github.com/rajeshtaneja/moodle

Browse Source
This commit is contained in:
David Monllao 2016-10-05 15:51:43 +08:00
commit 5be1491759
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/form/form.js
View File

@ -23,9 +23,6 @@ if (typeof M.form.dependencyManager === 'undefined') {
this._hides = {};
this._dirty = {};
// Let behat know that JS is pending.
M.util.js_pending('mform-dependency-manager-' + this.get('form').get('id'));
// Setup event handlers.
Y.Object.each(this.get('dependencies'), function(value, i) {
var elements = this.elementsByName(i);
@ -59,9 +56,6 @@ if (typeof M.form.dependencyManager === 'undefined') {
}, this);
this.updateAllDependencies();
// Let behat know that JS is complete.
M.util.js_complete('mform-dependency-manager-' + this.get('form').get('id'));
},
/**
@ -595,12 +589,6 @@ M.form.initFormDependencies = function(Y, formid, dependencies) {
*/
M.form.updateFormState = function(formid) {
if (formid in M.form.dependencyManagers) {
// Let behat know that JS is pending.
M.util.js_pending('mform-dependency-manager-' + formid);
M.form.dependencyManagers[formid].updateAllDependencies();
// Let behat know that JS is complete.
M.util.js_complete('mform-dependency-manager-' + formid);
}
};

3
mod/lti/tests/behat/addtool.feature
View File

@ -32,11 +32,10 @@ Feature: Add tools
And I turn editing mode on
And I add a "Teaching Tool 1" to section "1"
# For tool that does not support Content-Item message type, the Select content button must be disabled.
And I wait until the page is ready
And the "Select content" "button" should be disabled
And I set the field "Activity name" to "Test tool activity 1"
And I click on "Show more..." "link"
And I set the field "Launch container" to "Embed"
And the "Select content" "button" should be disabled
And I press "Save and return to course"
And I open "Test tool activity 1" actions menu
And I choose "Edit settings" in the open action menu