aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorCallum Macrae <callum@macr.ae>2014-08-14 00:19:34 +0100
committerCallum Macrae <callum@macr.ae>2014-08-14 00:19:34 +0100
commit9c87972385a1dce05ac622fcac42530d2885dfae (patch)
tree53b7b59798dd7d48cc363cc1c157aff9f63d1618 /phpBB
parent9e3db526d5ad8885806705dcd2ef2018975a136d (diff)
downloadforums-9c87972385a1dce05ac622fcac42530d2885dfae.tar
forums-9c87972385a1dce05ac622fcac42530d2885dfae.tar.gz
forums-9c87972385a1dce05ac622fcac42530d2885dfae.tar.bz2
forums-9c87972385a1dce05ac622fcac42530d2885dfae.tar.xz
forums-9c87972385a1dce05ac622fcac42530d2885dfae.zip
[ticket/12982] Refactoring: Cleaned up crazy insert users stuff
PHPBB3-12982
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/styles/prosilver/template/forum_fn.js42
1 files changed, 17 insertions, 25 deletions
diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index ddccb50c8b..1280ceb8ac 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -279,11 +279,13 @@ jQuery(function($) {
/**
* Functions for user search popup
*/
-function insert_user(formId, value)
+function insertUser(formId, value)
{
- var form = jQuery(formId),
- formName = form.attr('data-form-name'),
- fieldName = form.attr('data-field-name'),
+ 'use strict';
+
+ var $form = jQuery(formId),
+ formName = $form.attr('data-form-name'),
+ fieldName = $form.attr('data-field-name'),
item = opener.document.forms[formName][fieldName];
if (item.value.length && item.type == 'textarea') {
@@ -293,33 +295,23 @@ function insert_user(formId, value)
item.value = value;
}
-function insert_marked_users(formId, users)
-{
- if (typeof(users.length) == "undefined")
- {
- if (users.checked)
- {
- insert_user(formId, users.value);
- }
- }
- else if (users.length > 0)
- {
- for (i = 0; i < users.length; i++)
- {
- if (users[i].checked)
- {
- insert_user(formId, users[i].value);
- }
+function insert_marked_users(formId, users) {
+ 'use strict';
+
+ for (var i = 0; i < users.length; i++) {
+ if (users[i].checked) {
+ insertUser(formId, users[i].value);
}
}
- self.close();
+ window.close();
}
-function insert_single_user(formId, user)
-{
+function insert_single_user(formId, user) {
+ 'use strict';
+
insertUser(formId, user);
- self.close();
+ window.close();
}
/**