mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-02 12:34:59 +02:00
Code Issues Releases Wiki Activity

Merge branch 'ticket/nickvergessen/9530' into develop-olympus

Browse Source 
* ticket/nickvergessen/9530:
  [ticket/9530] The prosilver problem in #9531 exists in subsilver2 editor.js
  [ticket/9530] Subsilver2 is missing BBCode-less quotes fallback-option when bbcodes are disabled.
This commit is contained in:
Nils Adermann 2010-05-16 19:17:25 +02:00
commit 321f7a9946
3 changed files with 63 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
phpBB/styles/subsilver2/template/editor.js
View File

@ -6,6 +6,7 @@
// Startup variables
var imageTag = false;
var theSelection = false;
var bbcodeEnabled = true;
// Check for Browser & Platform for PC & IE specific bits
// More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html
@ -195,7 +196,7 @@ function attach_inline(index, filename)
/**
* Add quote text to message
*/
function addquote(post_id, username)
function addquote(post_id, username, l_wrote)
{
var message_name = 'message_' + post_id;
var theSelection = '';
@ -250,12 +251,62 @@ function addquote(post_id, username)
if (theSelection)
{
insert_text('[quote="' + username + '"]' + theSelection + '[/quote]');
if (bbcodeEnabled)
{
insert_text('[quote="' + username + '"]' + theSelection + '[/quote]');
}
else
{
insert_text(username + ' ' + l_wrote + ':' + '\n');
var lines = split_lines(theSelection);
for (i = 0; i < lines.length; i++)
{
insert_text('> ' + lines[i] + '\n');
}
}
}
return;
}
function split_lines(text)
{
var lines = text.split('\n');
var splitLines = new Array();
var j = 0;
for(i = 0; i < lines.length; i++)
{
if (lines[i].length <= 80)
{
splitLines[j] = lines[i];
j++;
}
else
{
var line = lines[i];
do
{
var splitAt = line.indexOf(' ', 80);
if (splitAt == -1)
{
splitLines[j] = line;
j++;
}
else
{
splitLines[j] = line.substring(0, splitAt);
line = line.substring(splitAt);
j++;
}
}
while(splitAt != -1);
}
}
return splitLines;
}
/**
* From http://www.massless.org/mozedit/
*/

5
phpBB/styles/subsilver2/template/posting_topic_review.html
View File

@ -1,3 +1,8 @@
<script type="text/javascript">
// <![CDATA[
bbcodeEnabled = {S_BBCODE_ALLOWED};
// ]]>
</script>
<table class="tablebg" width="100%" cellspacing="1">
<tr>

5
phpBB/styles/subsilver2/template/ucp_pm_history.html
View File

@ -1,3 +1,8 @@
<script type="text/javascript">
// <![CDATA[
bbcodeEnabled = {S_BBCODE_ALLOWED};
// ]]>
</script>
<table class="tablebg" width="100%" cellspacing="1">
<tr>