From commits-return-10577-apmail-roller-commits-archive=roller.apache.org@roller.apache.org Sun Nov 3 13:20:41 2019 Return-Path: X-Original-To: apmail-roller-commits-archive@www.apache.org Delivered-To: apmail-roller-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by minotaur.apache.org (Postfix) with SMTP id F135C10A3C for ; Sun, 3 Nov 2019 13:20:40 +0000 (UTC) Received: (qmail 88189 invoked by uid 500); 3 Nov 2019 13:20:40 -0000 Delivered-To: apmail-roller-commits-archive@roller.apache.org Received: (qmail 88059 invoked by uid 500); 3 Nov 2019 13:20:40 -0000 Mailing-List: contact commits-help@roller.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@roller.apache.org Delivered-To: mailing list commits@roller.apache.org Received: (qmail 88022 invoked by uid 99); 3 Nov 2019 13:20:40 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 Nov 2019 13:20:40 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id E136B805E4; Sun, 3 Nov 2019 13:20:39 +0000 (UTC) Date: Sun, 03 Nov 2019 13:20:40 +0000 To: "commits@roller.apache.org" Subject: [roller] 01/03: Fixed: Variables scoping in ajax-user.js (ROL-2157) Pattern is identified and reported at sonacloud.io as Blocker MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: adityasharma@apache.org In-Reply-To: <157278723981.24830.17665544562992405087@gitbox.apache.org> References: <157278723981.24830.17665544562992405087@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: roller X-Git-Refname: refs/heads/ROL-2157 X-Git-Reftype: branch X-Git-Rev: a541cc0dcf238e0168111f598a22f5dcbce36086 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20191103132039.E136B805E4@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. adityasharma pushed a commit to branch ROL-2157 in repository https://gitbox.apache.org/repos/asf/roller.git commit a541cc0dcf238e0168111f598a22f5dcbce36086 Author: Aditya Sharma AuthorDate: Sun Nov 3 18:16:41 2019 +0530 Fixed: Variables scoping in ajax-user.js (ROL-2157) Pattern is identified and reported at sonacloud.io as Blocker JavaScript variable scope can be particularly difficult to understand and get right. The situation gets even worse when you consider the accidental creation of global variables, which is what happens when you declare a variable inside a function or the for clause of a for-loop without using the let, const or var keywords. --- .../webapp/WEB-INF/jsps/editor/MembersInvite.jsp | 22 +++++++------- app/src/main/webapp/roller-ui/scripts/ajax-user.js | 34 +++++++++++----------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp index 0f3aabe..f285705 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp @@ -23,12 +23,12 @@ - +
-
@@ -38,8 +38,8 @@
- - + +
@@ -49,9 +49,9 @@ -
- -
+ + +
@@ -67,12 +67,12 @@ }); function onMemberNameChange(enabled) { - u = userURL; + var u = userURL; if (enabled != null) { u = u + "&enabled=" + enabled; } - userName = $('#userName').val(); + var userName = $('#userName').val(); if (userName.length > 0) { u = u + "&startsWith=" + userName; } @@ -81,7 +81,7 @@ } function onMemberSelected() { - userName = $('#userList').children("option:selected").val(); + var userName = $('#userList').children("option:selected").val(); if (userName !== '') { $('#inviteButton').attr("disabled", false); } @@ -90,7 +90,7 @@ function onMemberNameFocus(enabled) { if (!init) { init = true; - u = userURL; + var u = userURL; if (enabled != null) { u = u + "&enabled=" + enabled; diff --git a/app/src/main/webapp/roller-ui/scripts/ajax-user.js b/app/src/main/webapp/roller-ui/scripts/ajax-user.js index f3bbfb2..49715b3 100644 --- a/app/src/main/webapp/roller-ui/scripts/ajax-user.js +++ b/app/src/main/webapp/roller-ui/scripts/ajax-user.js @@ -37,30 +37,30 @@ var userURL = "<%= request.getContextPath() %>" + "/roller-ui/authoring/userdata function onUserNameFocus(enabled) { if (!init) { init = true; - u = userURL; + var u = userURL; if (enabled != null) u = u + "&enabled=" + enabled; sendUserRequest(u); } else { - userSubmitButton = document.getElementById("user-submit"); + var userSubmitButton = document.getElementById("user-submit"); userSubmitButton.disabled = true; } } function onUserNameChange(enabled) { - u = userURL; + var u = userURL; if (enabled != null) u = u + "&enabled=" + enabled; - userName = document.getElementById("userName"); + var userName = document.getElementById("userName"); if (userName.value.length > 0) u = u + "&startsWith=" + userName.value; sendUserRequest(u); } function onUserSelected() { - userList = document.getElementById("userList"); - user = userList.options[userList.options.selectedIndex]; - userName = document.getElementById("userName"); + var userList = document.getElementById("userList"); + var user = userList.options[userList.options.selectedIndex]; + var userName = document.getElementById("userName"); userName.value = user.value; - userSubmitButton = document.getElementById("user-submit"); + var userSubmitButton = document.getElementById("user-submit"); userSubmitButton.disabled = false; } @@ -74,21 +74,21 @@ function sendUserRequest(url) { function handleUserResponse() { if (http.readyState === 4) { - userList = document.getElementById("userList"); - for (i = userList.options.length; i >= 0; i--) { + var userList = document.getElementById("userList"); + for (var i = userList.options.length; i >= 0; i--) { userList.options[i] = null; - } - data = http.responseText; + } + var data = http.responseText; if (data.indexOf("\n") !== -1) { - lines = data.split('\n'); - for (i = 0; i < lines.length; i++) { + var lines = data.split('\n'); + for (var i = 0; i < lines.length; i++) { if (lines[i].indexOf(',') !== -1) { - userArray = lines[i].split(','); - userList.options[userList.length] = + var userArray = lines[i].split(','); + userList.options[userList.length] = new Option(userArray[0] + " (" + userArray[1] + ")", userArray[0]); } } - } + } } isBusy = false;