mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-05 23:25:30 +02:00
Code Issues Releases Wiki Activity

[ticket/11915] Update the inline attachment bbcode indices on every upload.

Browse Source 
PHPBB3-11915
This commit is contained in:
Cesar G 2013-11-10 18:56:07 -08:00
parent 688ca7fade
commit 508b43c197
1 changed files with 55 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
phpBB/assets/javascript/plupload.js
View File

@ -148,6 +148,7 @@ phpbb.plupload.setData = function(data) {
* @return undefined * @return undefined
*/ */
phpbb.plupload.update = function (data, action, index) { phpbb.plupload.update = function (data, action, index) {
phpbb.plupload.updateBbcode(action, index);
phpbb.plupload.setData(data); phpbb.plupload.setData(data);
phpbb.plupload.updateRows(); phpbb.plupload.updateRows();
phpbb.plupload.clearParams(); phpbb.plupload.clearParams();
@ -306,6 +307,60 @@ phpbb.plupload.hideEmptyList = function() {
} }
} }
/**
* Update the indices used in inline attachment bbcodes. This ensures that the bbcodes
* correspond to the correct file after a file is added or removed. This should be called
* before the phpbb.plupload,data and phpbb.plupload.ids arrays are updated, otherwise it will
* not work correctly.
*
* @param string action The action that occurred -- either "addition" or "removal"
* @param int index The index of the attachment from phpbb.plupload.ids that was affected.
*
* @return undefined
*/
phpbb.plupload.updateBbcode = function (action, index) {
var textarea = $(phpbb.plupload.form).find('textarea[name="message"]'),
text = textarea.val(),
removal = (action === 'removal');
// Return if the bbcode isn't used at all.
if (text.indexOf('[attachment=') === -1) {
return;
}
// Private function used to replace the bbcode.
var updateBbcode = function(match, fileName) {
// Remove the bbcode if the file was removed.
if (removal && index === i) {
return '';
}
var newIndex = i + ((removal) ? -1 : 1);
return '[attachment=' + newIndex +']' + fileName + '[/attachment]';
};
// Private function used to generate search regexp
var searchRegexp = function (index) {
return new RegExp('\\[attachment=' + index + '\\](.*?)\\[\\/attachment\\]', 'g');
}
// The update order of the indices is based on the action taken to ensure that we don't corrupt
// the bbcode index by updating it several times as we move through the loop.
// Removal loop starts at the removed index and moves to the end of the array.
// Addition loop starts at the end of the array and moves to the added index at 0.
var searchLoop = function () {
if (typeof i === 'undefined') {
i = (removal) ? index : phpbb.plupload.ids.length - 1;
}
return (removal) ? (i < phpbb.plupload.ids.length): (i >= index);
}
var i;
while (searchLoop()) {
text = text.replace(searchRegexp(i), updateBbcode);
(removal) ? i++ : i--;
}
textarea.val(text);
};
/** /**
* Get Plupload file objects based on their upload status. * Get Plupload file objects based on their upload status.
* *