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

MDL-42989 JavaScript: Check result of navigation IO requests before reporting errors

Browse Source 
When making a request which fails, we need to ensure that the AJAX query
was not aborted before displaying the error.

This ensures that if the navigation tree is being requested at the same
time as a page load is being processed, the abortion of the AJAX request is
not displayed before the page reloads.
This commit is contained in:
Andrew Nicols
2013-12-03 16:05:18 +08:00
committed by Dan Poltawski
parent ed52eb4c88
commit 5259c6b402
4 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocks/navigation/yui/build/moodle-block_navigation-navigation/moodle-block_navigation-navigation-debug.js
Vendored
+7 -5
View File
@@ -679,11 +679,13 @@ BRANCH.prototype = {
}
Y.log('AJAX loading complete but there were no children.', 'note', 'moodle-block_navigation');
} catch (error) {
// If we got here then there was an error parsing the result.
Y.log('Error parsing AJAX response or adding branches to the navigation tree', 'error', 'moodle-block_navigation');
Y.use('moodle-core-notification-exception', function () {
return new M.core.exception(error).show();
});
if (outcome && outcome.status && outcome.status > 0) {
// If we got here then there was an error parsing the result.
Y.log('Error parsing AJAX response or adding branches to the navigation tree', 'error', 'moodle-block_navigation');
Y.use('moodle-core-notification-exception', function () {
return new M.core.exception(error).show();
});
}
return false;
}
blocks/navigation/yui/build/moodle-block_navigation-navigation/moodle-block_navigation-navigation-min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
blocks/navigation/yui/build/moodle-block_navigation-navigation/moodle-block_navigation-navigation.js
Vendored
+6 -4
View File
@@ -675,10 +675,12 @@ BRANCH.prototype = {
return true;
}
} catch (error) {
// If we got here then there was an error parsing the result.
Y.use('moodle-core-notification-exception', function () {
return new M.core.exception(error).show();
});
if (outcome && outcome.status && outcome.status > 0) {
// If we got here then there was an error parsing the result.
Y.use('moodle-core-notification-exception', function () {
return new M.core.exception(error).show();
});
}
return false;
}
blocks/navigation/yui/src/navigation/js/navigation.js
Vendored
+7 -5
View File
@@ -677,11 +677,13 @@ BRANCH.prototype = {
}
Y.log('AJAX loading complete but there were no children.', 'note', 'moodle-block_navigation');
} catch (error) {
// If we got here then there was an error parsing the result.
Y.log('Error parsing AJAX response or adding branches to the navigation tree', 'error', 'moodle-block_navigation');
Y.use('moodle-core-notification-exception', function () {
return new M.core.exception(error).show();
});
if (outcome && outcome.status && outcome.status > 0) {
// If we got here then there was an error parsing the result.
Y.log('Error parsing AJAX response or adding branches to the navigation tree', 'error', 'moodle-block_navigation');
Y.use('moodle-core-notification-exception', function () {
return new M.core.exception(error).show();
});
}
return false;
}