L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-45364 qtype_ddimageortext: Fix JS Lint issues

Browse Source
This commit is contained in:
Andrew Nicols
2015-11-26 19:09:29 +00:00
committed by Dan Poltawski
parent b27d4eac7f
commit 2ccb8d006a
4 changed files with 50 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
question/type/ddimageortext/yui/build/moodle-qtype_ddimageortext-form/moodle-qtype_ddimageortext-form-debug.js
Vendored
+16 -17
View File
@@ -145,13 +145,9 @@ Y.extend(DDIMAGEORTEXT_FORM, M.qtype_ddimageortext.dd_base_class, {
if (value !== 0) { // No item option is always selectable.
var cbel = Y.one('#id_drags_' + (value - 1) + '_infinite');
if (cbel && !cbel.get('checked')) {
Y.all('fieldset#id_dropzoneheader select').some(function (selector) {
if (Number(selector.get('value')) === value) {
optionnode.set('disabled', true);
return true; // Stop looping.
}
return false;
}, this);
if (this.check_dropzone_for_selected_value(value)) {
optionnode.set('disabled', true);
}
}
}
}
@@ -163,6 +159,12 @@ Y.extend(DDIMAGEORTEXT_FORM, M.qtype_ddimageortext.dd_base_class, {
Y.all('fieldset#id_dropzoneheader select').detachAll();
},
check_dropzone_for_selected_value: function(value) {
return Y.all('fieldset#id_dropzoneheader select').some(function(selectNode) {
return Number(selectNode.get('value')) === value;
});
},
setup_form_events : function () {
// Events triggered by changes to form data.
@@ -190,16 +192,8 @@ Y.extend(DDIMAGEORTEXT_FORM, M.qtype_ddimageortext.dd_base_class, {
for (var i = 0; i < this.form.get_form_value('noitems', []); i++) {
// Change to group selector.
Y.all('#fgroup_id_drags_' + i + ' select.draggroup').on(
'change', function () {
this.doc.drag_items().remove(true);
this.draw_dd_area();
}, this);
Y.all('#fgroup_id_drags_' + i + ' select.dragitemtype').on(
'change', function () {
this.doc.drag_items().remove(true);
this.draw_dd_area();
}, this);
Y.all('#fgroup_id_drags_' + i + ' select.draggroup').on('change', this.clear_dd_area, this);
Y.all('#fgroup_id_drags_' + i + ' select.dragitemtype').on('change', this.clear_dd_area, this);
Y.all('fieldset#draggableitemheader_' + i + ' input[type="text"]')
.on('blur', this.set_options_for_drag_item_selectors, this);
// Change to infinite checkbox.
@@ -216,6 +210,11 @@ Y.extend(DDIMAGEORTEXT_FORM, M.qtype_ddimageortext.dd_base_class, {
}, M.form_filepicker, 'callback', this);
},
clear_dd_area: function() {
this.doc.drag_items().remove(true);
this.draw_dd_area();
},
update_visibility_of_file_pickers : function() {
for (var i = 0; i < this.form.get_form_value('noitems', []); i++) {
if ('image' === this.form.get_form_value('drags', [i, 'dragitemtype'])) {
question/type/ddimageortext/yui/build/moodle-qtype_ddimageortext-form/moodle-qtype_ddimageortext-form-min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
question/type/ddimageortext/yui/build/moodle-qtype_ddimageortext-form/moodle-qtype_ddimageortext-form.js
Vendored
+16 -17
View File
@@ -145,13 +145,9 @@ Y.extend(DDIMAGEORTEXT_FORM, M.qtype_ddimageortext.dd_base_class, {
if (value !== 0) { // No item option is always selectable.
var cbel = Y.one('#id_drags_' + (value - 1) + '_infinite');
if (cbel && !cbel.get('checked')) {
Y.all('fieldset#id_dropzoneheader select').some(function (selector) {
if (Number(selector.get('value')) === value) {
optionnode.set('disabled', true);
return true; // Stop looping.
}
return false;
}, this);
if (this.check_dropzone_for_selected_value(value)) {
optionnode.set('disabled', true);
}
}
}
}
@@ -163,6 +159,12 @@ Y.extend(DDIMAGEORTEXT_FORM, M.qtype_ddimageortext.dd_base_class, {
Y.all('fieldset#id_dropzoneheader select').detachAll();
},
check_dropzone_for_selected_value: function(value) {
return Y.all('fieldset#id_dropzoneheader select').some(function(selectNode) {
return Number(selectNode.get('value')) === value;
});
},
setup_form_events : function () {
// Events triggered by changes to form data.
@@ -190,16 +192,8 @@ Y.extend(DDIMAGEORTEXT_FORM, M.qtype_ddimageortext.dd_base_class, {
for (var i = 0; i < this.form.get_form_value('noitems', []); i++) {
// Change to group selector.
Y.all('#fgroup_id_drags_' + i + ' select.draggroup').on(
'change', function () {
this.doc.drag_items().remove(true);
this.draw_dd_area();
}, this);
Y.all('#fgroup_id_drags_' + i + ' select.dragitemtype').on(
'change', function () {
this.doc.drag_items().remove(true);
this.draw_dd_area();
}, this);
Y.all('#fgroup_id_drags_' + i + ' select.draggroup').on('change', this.clear_dd_area, this);
Y.all('#fgroup_id_drags_' + i + ' select.dragitemtype').on('change', this.clear_dd_area, this);
Y.all('fieldset#draggableitemheader_' + i + ' input[type="text"]')
.on('blur', this.set_options_for_drag_item_selectors, this);
// Change to infinite checkbox.
@@ -216,6 +210,11 @@ Y.extend(DDIMAGEORTEXT_FORM, M.qtype_ddimageortext.dd_base_class, {
}, M.form_filepicker, 'callback', this);
},
clear_dd_area: function() {
this.doc.drag_items().remove(true);
this.draw_dd_area();
},
update_visibility_of_file_pickers : function() {
for (var i = 0; i < this.form.get_form_value('noitems', []); i++) {
if ('image' === this.form.get_form_value('drags', [i, 'dragitemtype'])) {
question/type/ddimageortext/yui/src/form/js/form.js
Vendored
+16 -17
View File
@@ -143,13 +143,9 @@ Y.extend(DDIMAGEORTEXT_FORM, M.qtype_ddimageortext.dd_base_class, {
if (value !== 0) { // No item option is always selectable.
var cbel = Y.one('#id_drags_' + (value - 1) + '_infinite');
if (cbel && !cbel.get('checked')) {
Y.all('fieldset#id_dropzoneheader select').some(function (selector) {
if (Number(selector.get('value')) === value) {
optionnode.set('disabled', true);
return true; // Stop looping.
}
return false;
}, this);
if (this.check_dropzone_for_selected_value(value)) {
optionnode.set('disabled', true);
}
}
}
}
@@ -161,6 +157,12 @@ Y.extend(DDIMAGEORTEXT_FORM, M.qtype_ddimageortext.dd_base_class, {
Y.all('fieldset#id_dropzoneheader select').detachAll();
},
check_dropzone_for_selected_value: function(value) {
return Y.all('fieldset#id_dropzoneheader select').some(function(selectNode) {
return Number(selectNode.get('value')) === value;
});
},
setup_form_events : function () {
// Events triggered by changes to form data.
@@ -188,16 +190,8 @@ Y.extend(DDIMAGEORTEXT_FORM, M.qtype_ddimageortext.dd_base_class, {
for (var i = 0; i < this.form.get_form_value('noitems', []); i++) {
// Change to group selector.
Y.all('#fgroup_id_drags_' + i + ' select.draggroup').on(
'change', function () {
this.doc.drag_items().remove(true);
this.draw_dd_area();
}, this);
Y.all('#fgroup_id_drags_' + i + ' select.dragitemtype').on(
'change', function () {
this.doc.drag_items().remove(true);
this.draw_dd_area();
}, this);
Y.all('#fgroup_id_drags_' + i + ' select.draggroup').on('change', this.clear_dd_area, this);
Y.all('#fgroup_id_drags_' + i + ' select.dragitemtype').on('change', this.clear_dd_area, this);
Y.all('fieldset#draggableitemheader_' + i + ' input[type="text"]')
.on('blur', this.set_options_for_drag_item_selectors, this);
// Change to infinite checkbox.
@@ -214,6 +208,11 @@ Y.extend(DDIMAGEORTEXT_FORM, M.qtype_ddimageortext.dd_base_class, {
}, M.form_filepicker, 'callback', this);
},
clear_dd_area: function() {
this.doc.drag_items().remove(true);
this.draw_dd_area();
},
update_visibility_of_file_pickers : function() {
for (var i = 0; i < this.form.get_form_value('noitems', []); i++) {
if ('image' === this.form.get_form_value('drags', [i, 'dragitemtype'])) {