From a8cbfe310c52285de54a135e63174870c72ab006 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Fri, 7 Oct 2016 06:09:47 +0200 Subject: [PATCH] Fixed a scope bug for a JS state variable in a user control --- Site/Automation/SwarmFunctions.aspx.cs | 5 ++-- Site/Bases/DataV5Base.cs | 2 +- Site/Controls/v5/Base/AjaxTextBox.ascx | 14 +++++------ Site/Master-v5.master | 32 +++++++++++++++++++++----- 4 files changed, 37 insertions(+), 16 deletions(-) diff --git a/Site/Automation/SwarmFunctions.aspx.cs b/Site/Automation/SwarmFunctions.aspx.cs index 4f46a66e..3808f1b4 100644 --- a/Site/Automation/SwarmFunctions.aspx.cs +++ b/Site/Automation/SwarmFunctions.aspx.cs @@ -10,11 +10,12 @@ using Swarmops.Logic.Security; using Swarmops.Logic.Structure; using Swarmops.Logic.Swarm; using Swarmops.Common.Exceptions; +using Swarmops.Frontend; namespace Swarmops.Frontend.Automation { - public partial class SwarmFunctions : Swarmops.Frontend.DataV5Base + public partial class SwarmFunctions : DataV5Base { protected void Page_Load (object sender, EventArgs e) { @@ -276,7 +277,7 @@ namespace Swarmops.Frontend.Automation return new AjaxInputCallResult { Success = false, - DisplayMessage = Resources.Global.Global_FieldCannotBeEmpty, + DisplayMessage = JavascriptEscape(Resources.Global.Global_FieldCannotBeEmpty), FailReason = AjaxInputCallResult.ErrorInvalidFormat, NewValue = GetPersonValue (personId, field) }; diff --git a/Site/Bases/DataV5Base.cs b/Site/Bases/DataV5Base.cs index c025848d..a42e7f52 100644 --- a/Site/Bases/DataV5Base.cs +++ b/Site/Bases/DataV5Base.cs @@ -174,7 +174,7 @@ namespace Swarmops.Frontend return input.Replace ("\"", "\\\"").Replace (" ", " ").Trim(); } - public string JavascriptEscape (string input) + public static string JavascriptEscape (string input) { return CommonV5.JavascriptEscape (input); } diff --git a/Site/Controls/v5/Base/AjaxTextBox.ascx b/Site/Controls/v5/Base/AjaxTextBox.ascx index d89a6543..20e2d846 100644 --- a/Site/Controls/v5/Base/AjaxTextBox.ascx +++ b/Site/Controls/v5/Base/AjaxTextBox.ascx @@ -1,17 +1,17 @@ <%@ Control Language="C#" AutoEventWireup="True" CodeBehind="AjaxTextBox.ascx.cs" Inherits="Swarmops.Frontend.Controls.Base.AjaxTextBox" %> +<%-- ReSharper disable HeuristicallyUnreachableCode --%> <%-- ReSharper disable once ConditionIsAlwaysConst --%>