makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/13887] Made unreadable code readable

Browse source 
PHPBB3-13887
This commit is contained in:
Callum Macrae 2015-05-29 13:01:33 +02:00
parent 143578ad09
commit 0fc6816be6
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
phpBB/assets/javascript/plupload.js
View file

@ -329,22 +329,20 @@ phpbb.plupload.updateBbcode = function(action, index) {
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);
i += (removal) ? 1 : -1;
// Loop forwards when removing and backwards when adding ensures we don't
// corrupt the bbcode index.
var i;
if (removal) {
for (i = index; i < phpbb.plupload.ids.length; i++) {
text = text.replace(searchRegexp(i), updateBbcode);
}
} else {
for (i = phpbb.plupload.ids.length - 1; i >= index; i--) {
text = text.replace(searchRegexp(i), updateBbcode);
}
}
textarea.val(text);
};