Skip to content

Commit

Permalink
Merge branch 'MDL-46414-master' of git://github.com/sammarshallou/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
marinaglancy committed Aug 4, 2014
2 parents 1ad873c + 61f5302 commit eb06c9e
Show file tree
Hide file tree
Showing 20 changed files with 23 additions and 23 deletions.
Expand Up @@ -47,10 +47,10 @@ M.availability_completion.form.getNode = function(json) {
// Set initial values.
if (json.cm !== undefined &&
node.one('select[name=cm] > option[value=' + json.cm + ']')) {
node.one('select[name=cm]').set('value', json.cm);
node.one('select[name=cm]').set('value', '' + json.cm);
}
if (json.e !== undefined) {
node.one('select[name=e]').set('value', json.e);
node.one('select[name=e]').set('value', '' + json.e);
}

// Add event handlers (first time only).
Expand Down

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

Expand Up @@ -47,10 +47,10 @@ M.availability_completion.form.getNode = function(json) {
// Set initial values.
if (json.cm !== undefined &&
node.one('select[name=cm] > option[value=' + json.cm + ']')) {
node.one('select[name=cm]').set('value', json.cm);
node.one('select[name=cm]').set('value', '' + json.cm);
}
if (json.e !== undefined) {
node.one('select[name=e]').set('value', json.e);
node.one('select[name=e]').set('value', '' + json.e);
}

// Add event handlers (first time only).
Expand Down
4 changes: 2 additions & 2 deletions availability/condition/completion/yui/src/form/js/form.js
Expand Up @@ -45,10 +45,10 @@ M.availability_completion.form.getNode = function(json) {
// Set initial values.
if (json.cm !== undefined &&
node.one('select[name=cm] > option[value=' + json.cm + ']')) {
node.one('select[name=cm]').set('value', json.cm);
node.one('select[name=cm]').set('value', '' + json.cm);
}
if (json.e !== undefined) {
node.one('select[name=e]').set('value', json.e);
node.one('select[name=e]').set('value', '' + json.e);
}

// Add event handlers (first time only).
Expand Down
Expand Up @@ -53,7 +53,7 @@ M.availability_date.form.getNode = function(json) {
var fields = Y.JSON.parse(response.responseText);
for (var field in fields) {
var select = node.one('select[name=x\\[' + field + '\\]]');
select.set('value', fields[field]);
select.set('value', '' + fields[field]);
select.set('disabled', false);
}
},
Expand Down

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

Expand Up @@ -53,7 +53,7 @@ M.availability_date.form.getNode = function(json) {
var fields = Y.JSON.parse(response.responseText);
for (var field in fields) {
var select = node.one('select[name=x\\[' + field + '\\]]');
select.set('value', fields[field]);
select.set('value', '' + fields[field]);
select.set('disabled', false);
}
},
Expand Down
2 changes: 1 addition & 1 deletion availability/condition/date/yui/src/form/js/form.js
Expand Up @@ -51,7 +51,7 @@ M.availability_date.form.getNode = function(json) {
var fields = Y.JSON.parse(response.responseText);
for (var field in fields) {
var select = node.one('select[name=x\\[' + field + '\\]]');
select.set('value', fields[field]);
select.set('value', '' + fields[field]);
select.set('disabled', false);
}
},
Expand Down
Expand Up @@ -60,7 +60,7 @@ M.availability_grade.form.getNode = function(json) {
// Set initial values.
if (json.id !== undefined &&
node.one('select[name=id] > option[value=' + json.id + ']')) {
node.one('select[name=id]').set('value', json.id);
node.one('select[name=id]').set('value', '' + json.id);
}
if (json.min !== undefined) {
node.one('input[name=min]').set('checked', true);
Expand Down

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

Expand Up @@ -60,7 +60,7 @@ M.availability_grade.form.getNode = function(json) {
// Set initial values.
if (json.id !== undefined &&
node.one('select[name=id] > option[value=' + json.id + ']')) {
node.one('select[name=id]').set('value', json.id);
node.one('select[name=id]').set('value', '' + json.id);
}
if (json.min !== undefined) {
node.one('input[name=min]').set('checked', true);
Expand Down
2 changes: 1 addition & 1 deletion availability/condition/grade/yui/src/form/js/form.js
Expand Up @@ -58,7 +58,7 @@ M.availability_grade.form.getNode = function(json) {
// Set initial values.
if (json.id !== undefined &&
node.one('select[name=id] > option[value=' + json.id + ']')) {
node.one('select[name=id]').set('value', json.id);
node.one('select[name=id]').set('value', '' + json.id);
}
if (json.min !== undefined) {
node.one('input[name=min]').set('checked', true);
Expand Down
Expand Up @@ -50,7 +50,7 @@ M.availability_group.form.getNode = function(json) {
if (json.creating === undefined) {
if (json.id !== undefined &&
node.one('select[name=id] > option[value=' + json.id + ']')) {
node.one('select[name=id]').set('value', json.id);
node.one('select[name=id]').set('value', '' + json.id);
} else if (json.id === undefined) {
node.one('select[name=id]').set('value', 'any');
}
Expand Down

0 comments on commit eb06c9e

Please sign in to comment.