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

MDL-22504 Course drag and drop upload - (mostly) fixed the dragging of text between Firefox <==> Chrome

Browse Source
This commit is contained in:
Davo Smith 2012-05-17 21:19:52 +01:00
parent b64300fc42
commit 5a4decbc2d
2 changed files with 59 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
course/dndupload.js
View File

@ -235,15 +235,17 @@ M.course_dndupload = {
// Check for files first.
if (this.types_includes(e, 'Files')) {
if (this.handlers.filehandlers.length == 0) {
return false; // No available file handlers - ignore this drag.
if (e.type != 'drop' || e._event.dataTransfer.files.length != 0) {
if (this.handlers.filehandlers.length == 0) {
return false; // No available file handlers - ignore this drag.
}
return {
realtype: 'Files',
addmessage: M.util.get_string('addfilehere', 'moodle'),
namemessage: null, // Should not be asked for anyway
type: 'Files'
};
}
return {
realtype: 'Files',
addmessage: M.util.get_string('addfilehere', 'moodle'),
namemessage: null, // Should not be asked for anyway
type: 'Files'
};
}
// Check each of the registered types.
@ -703,6 +705,11 @@ M.course_dndupload = {
if (result.onclick) {
resel.a.onclick = result.onclick;
}
if (self.Y.UA.gecko > 0) {
// Fix a Firefox bug which makes sites with a '~' in their wwwroot
// log the user out when clicking on the link (before refreshing the page).
resel.div.innerHTML = unescape(resel.div.innerHTML);
}
self.add_editing(result.elementid);
} else {
// Error - remove the dummy element
@ -844,6 +851,7 @@ M.course_dndupload = {
* @param contents the actual data that was dropped
* @param section the DOM element representing the selected course section
* @param sectionnumber the number of the selected course section
* @param module the module chosen to handle this upload
*/
upload_item: function(name, type, contents, section, sectionnumber, module) {
@ -877,6 +885,11 @@ M.course_dndupload = {
if (result.onclick) {
resel.a.onclick = result.onclick;
}
if (self.Y.UA.gecko > 0) {
// Fix a Firefox bug which makes sites with a '~' in their wwwroot
// log the user out when clicking on the link (before refreshing the page).
resel.div.innerHTML = unescape(resel.div.innerHTML);
}
self.add_editing(result.elementid, sectionnumber);
} else {
// Error - remove the dummy element
@ -890,6 +903,34 @@ M.course_dndupload = {
}
};
if (type == 'text/html') {
// If this was html content dragged from Chrome => Firefox, we will
// need to fix the byte order of the content.
if (this.Y.UA.gecko > 0) {
if (contents.indexOf('<') == -1) {
// There are no html tags in this content => it probably needs fixing.
var codes = new Array();
for (i=0; i<contents.length; i++) {
var val = contents.charCodeAt(i);
var val1 = Math.floor(val / 256);
var val2 = val % 256;
codes[i*2] = val2;
codes[i*2+1] = val1;
}
var fixedcontents = '';
for (i=0; i<codes.length; i++) {
var val = codes[i];
// Ideally we should deal with multi-byte characters here; I'm not sure how.
fixedcontents += String.fromCharCode(val);
}
if (fixedcontents.indexOf('<') != -1) {
// The fixed content contains html tags => it is probably correct.
contents = fixedcontents;
}
}
}
}
// Prepare the data to send
var formData = new FormData();
formData.append('contents', contents);
@ -900,15 +941,17 @@ M.course_dndupload = {
formData.append('type', type);
formData.append('module', module);
// Contents from Firefox have their unicode byte-order reversed, swap back and
// provide as an alternative.
if (type == 'text/html') {
var fixedcontents = '';
for (i=0; i<contents.length; i+=2) {
var val = contents.charCodeAt(i+1) * 256 + contents.charCodeAt(i);
fixedcontents += String.fromCharCode(val);
// This html content might have been dragged from Firefox to Chrome (in Linux).
// Need to provide an extra fixed version of the contents, in case the original does not upload.
if (this.Y.UA.webkit > 0 && this.Y.UA.os == 'linux') {
var fixedcontents = '';
for (i=0; i<contents.length; i+=2) {
var val = contents.charCodeAt(i+1) * 256 + contents.charCodeAt(i);
fixedcontents += String.fromCharCode(val);
}
formData.append('fixedcontents', fixedcontents);
}
formData.append('fixedcontents', fixedcontents);
}
// Send the data

2
course/dnduploadlib.php
View File

@ -109,7 +109,7 @@ class dndupload_handler {
// Add some default types to handle.
// Note: 'Files' type is hard-coded into the Javascript as this needs to be ...
// ... treated a little differently.
$this->add_type('url', array('url', 'text/uri-list'), get_string('addlinkhere', 'moodle'),
$this->add_type('url', array('url', 'text/uri-list', 'text/x-moz-url'), get_string('addlinkhere', 'moodle'),
get_string('nameforlink', 'moodle'), 10);
$this->add_type('text/html', array('text/html'), get_string('addpagehere', 'moodle'),
get_string('nameforpage', 'moodle'), 20);