makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 05:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10620] Fixed some stylistic issues in JS

Browse source 
PHPBB3-10620
This commit is contained in:
JoshyPHP 2015-06-24 22:36:44 +02:00
parent 7ce2d996a8
commit 4c9507e20a
1 changed files with 14 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
phpBB/assets/javascript/editor.js
View file

@ -111,7 +111,6 @@ function bbfontstyle(bbopen, bbclose) {
} }
textarea.focus(); textarea.focus();
return;
} }
/** /**
@ -177,6 +176,9 @@ function addquote(post_id, username, l_wrote, attributes) {
// Backwards compatibility // Backwards compatibility
l_wrote = 'wrote'; l_wrote = 'wrote';
} }
if (typeof attributes !== 'object') {
attributes = {};
}
if (document.all) { if (document.all) {
divarea = document.all[message_name]; divarea = document.all[message_name];
@ -213,12 +215,8 @@ function addquote(post_id, username, l_wrote, attributes) {
if (theSelection) { if (theSelection) {
if (bbcodeEnabled) { if (bbcodeEnabled) {
if (typeof attributes === 'undefined')
{
attributes = {};
}
attributes.author = username; attributes.author = username;
insert_text(generate_quote(theSelection, attributes)); insert_text(generateQuote(theSelection, attributes));
} else { } else {
insert_text(username + ' ' + l_wrote + ':' + '\n'); insert_text(username + ' ' + l_wrote + ':' + '\n');
var lines = split_lines(theSelection); var lines = split_lines(theSelection);
@ -227,8 +225,6 @@ function addquote(post_id, username, l_wrote, attributes) {
} }
} }
} }
return;
} }
/** /**
@ -244,19 +240,18 @@ function addquote(post_id, username, l_wrote, attributes) {
* @param {!Object} attributes Quote's attributes * @param {!Object} attributes Quote's attributes
* @return {!string} Quote block to be used in a new post/text * @return {!string} Quote block to be used in a new post/text
*/ */
function generate_quote(text, attributes) function generateQuote(text, attributes) {
{
var quote = '[quote'; var quote = '[quote';
if ('author' in attributes) if (attributes.author) {
{
// Add the author as the BBCode's default attribute // Add the author as the BBCode's default attribute
quote += '=' + format_attribute_value(attributes.author); quote += '=' + formatAttributeValue(attributes.author);
delete attributes.author; delete attributes.author;
} }
for (var name in attributes) for (var name in attributes) {
{ if (attributes.hasOwnProperty(name)) {
var value = attributes[name]; var value = attributes[name];
quote += ' ' + name + '=' + format_attribute_value(String(value)); quote += ' ' + name + '=' + formatAttributeValue(value.toString());
}
} }
quote += ']' + text + '[/quote]'; quote += ']' + text + '[/quote]';
@ -273,10 +268,8 @@ function generate_quote(text, attributes)
* @param {!string} str Original string * @param {!string} str Original string
* @return {!string} Same string if possible, escaped string within quotes otherwise * @return {!string} Same string if possible, escaped string within quotes otherwise
*/ */
function format_attribute_value(str) function formatAttributeValue(str) {
{ if (!/[ "'\\\]]/.test(str)) {
if (!/[ "'\\\]]/.test(str))
{
// Return as-is if it contains none of: space, ' " \ or ] // Return as-is if it contains none of: space, ' " \ or ]
return str; return str;
} }