mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-22 00:20:37 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-48643-master' of git://github.com/merrill-oakland/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2014-12-22 15:22:37 +00:00
commit ca9ef112c6
6 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
course/dndupload.js
View File

@ -635,13 +635,14 @@ M.course_dndupload = {
bodyContent: content,
width: '350px',
modal: true,
visible: true,
visible: false,
render: true,
align: {
node: null,
points: [Y.WidgetPositionAlign.CC, Y.WidgetPositionAlign.CC]
}
});
panel.show();
// When the panel is hidden - destroy it and then check for other pending uploads
panel.after("visibleChange", function(e) {
if (!panel.get('visible')) {

4
course/yui/build/moodle-course-toolboxes/moodle-course-toolboxes-debug.js vendored
View File

@ -481,8 +481,10 @@ Y.extend(RESOURCETOOLBOX, TOOLBOX, {
// Create the confirmation dialogue.
var confirm = new M.core.confirm({
question: confirmstring,
modal: true
modal: true,
visible: false
});
confirm.show();
// If it is confirmed.
confirm.on('complete-yes', function() {

4
course/yui/build/moodle-course-toolboxes/moodle-course-toolboxes-min.js vendored
View File

File diff suppressed because one or more lines are too long

4
course/yui/build/moodle-course-toolboxes/moodle-course-toolboxes.js vendored
View File

@ -481,8 +481,10 @@ Y.extend(RESOURCETOOLBOX, TOOLBOX, {
// Create the confirmation dialogue.
var confirm = new M.core.confirm({
question: confirmstring,
modal: true
modal: true,
visible: false
});
confirm.show();
// If it is confirmed.
confirm.on('complete-yes', function() {

4
course/yui/src/toolboxes/js/resource.js vendored
View File

@ -277,8 +277,10 @@ Y.extend(RESOURCETOOLBOX, TOOLBOX, {
// Create the confirmation dialogue.
var confirm = new M.core.confirm({
question: confirmstring,
modal: true
modal: true,
visible: false
});
confirm.show();
// If it is confirmed.
confirm.on('complete-yes', function() {

6
enrol/yui/rolemanager/rolemanager.js vendored
View File

@ -114,14 +114,16 @@ YUI.add('moodle-enrol-rolemanager', function(Y) {
event.detach();
var confirmation = {
modal: true,
visible : true,
visible : false,
centered : true,
title : M.util.get_string('confirmunassigntitle', 'role'),
question : M.util.get_string('confirmunassign', 'role'),
yesLabel : M.util.get_string('confirmunassignyes', 'role'),
noLabel : M.util.get_string('confirmunassignno', 'role')
};
new M.core.confirm(confirmation).on('complete-yes', this.removeRoleCallback, this, user.get(USERID), roleid);
new M.core.confirm(confirmation)
.show()
.on('complete-yes', this.removeRoleCallback, this, user.get(USERID), roleid);
}, this);
this._loadAssignableRoles();
},