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

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

Browse source
This commit is contained in:
David Monllao 2016-10-03 13:53:29 +08:00
commit 2e5a8fd7aa
2 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/form/form.js
View file

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

1
mod/lti/tests/behat/addtool.feature
View file

@ -32,6 +32,7 @@ Feature: Add tools
And I turn editing mode on And I turn editing mode on
And I add a "Teaching Tool 1" to section "1" 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. # 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 the "Select content" "button" should be disabled
And I set the field "Activity name" to "Test tool activity 1" And I set the field "Activity name" to "Test tool activity 1"
And I click on "Show more..." "link" And I click on "Show more..." "link"