Commit 5be14917 authored by David Monllaó's avatar David Monllaó
Browse files

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

parents b02c1639 86ebbed6
...@@ -23,9 +23,6 @@ if (typeof M.form.dependencyManager === 'undefined') { ...@@ -23,9 +23,6 @@ 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);
...@@ -59,9 +56,6 @@ if (typeof M.form.dependencyManager === 'undefined') { ...@@ -59,9 +56,6 @@ 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'));
}, },
/** /**
...@@ -595,12 +589,6 @@ M.form.initFormDependencies = function(Y, formid, dependencies) { ...@@ -595,12 +589,6 @@ 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);
} }
}; };
...@@ -32,11 +32,10 @@ Feature: Add tools ...@@ -32,11 +32,10 @@ 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 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"
And I set the field "Launch container" to "Embed" 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 press "Save and return to course"
And I open "Test tool activity 1" actions menu And I open "Test tool activity 1" actions menu
And I choose "Edit settings" in the open action menu And I choose "Edit settings" in the open action menu
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment