Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#959872 by mfer: Fix poor JS usage in Drupal.js

merge-requests/26/head
Angie Byron 2010-11-13 07:34:46 +00:00
parent 339031a16e
commit 6c3f6337dd
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
misc/drupal.js
View File

@ -114,11 +114,14 @@ Drupal.detachBehaviors = function (context, settings, trigger) {
* Encode special characters in a plain-text string for display as HTML.
*/
Drupal.checkPlain = function (str) {
var character, regex,
replace = { '&': '&amp;', '"': '&quot;', '<': '&lt;', '>': '&gt;' };
str = String(str);
var replace = { '&': '&amp;', '"': '&quot;', '<': '&lt;', '>': '&gt;' };
for (var character in replace) {
var regex = new RegExp(character, 'g');
str = str.replace(regex, replace[character]);
for (character in replace) {
if (replace.hasOwnProperty(character)) {
regex = new RegExp(character, 'g');
str = str.replace(regex, replace[character]);
}
}
return str;
};
@ -240,9 +243,7 @@ Drupal.formatPlural = function (count, singular, plural, args) {
* but also a complex object.
*/
Drupal.theme = function (func) {
for (var i = 1, args = []; i < arguments.length; i++) {
args.push(arguments[i]);
}
var args = Array.prototype.slice.apply(arguments, [1]);
return (Drupal.theme[func] || Drupal.theme.prototype[func]).apply(this, args);
};