Quellcode durchsuchen

Renamed ScriptEditor Onclicked event; ensured that scripteditorcontrol always gets a non-null string.

Kenric Nugteren vor 1 Jahr
Ursprung
Commit
232b64d883

+ 2 - 2
InABox.Core/Editors/ScriptEditor.cs

@@ -16,7 +16,7 @@ namespace InABox.Core
         Default,
         TemplateEditor
     }
-    public delegate void OnEditorClicked();
+    public delegate void OnScriptEditorClickedEvent();
 
     public class ScriptEditor : BaseEditor
     {
@@ -27,7 +27,7 @@ namespace InABox.Core
             Type = ScriptEditorType.Default;
         }
 
-        public event OnEditorClicked OnEditorClicked;
+        public event OnScriptEditorClickedEvent OnEditorClicked;
 
         public SyntaxLanguage SyntaxLanguage { get; set; }
         public ScriptEditorType Type { get; set; }

+ 0 - 1
InABox.SMSProviders/InABox.SMSProviders.csproj

@@ -7,7 +7,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\InABox.Core\InABox.Core.csproj" />
       <ProjectReference Include="..\inabox.logging.shared\InABox.Logging.Shared.csproj" />
       <ProjectReference Include="..\inabox.mailer.exchange\InABox.Mailer.Exchange.csproj" />
       <ProjectReference Include="..\inabox.mailer.imap\InABox.Mailer.IMAP.csproj" />

+ 2 - 2
inabox.scripting/ScriptDocument.cs

@@ -221,11 +221,11 @@ namespace InABox.Scripting
                 {
                     if (method.ReturnType == typeof(bool))
                     {
-                        result = (bool)method.Invoke(obj, parameters != null ? parameters : new object[] { });
+                        result = (bool)(method.Invoke(obj, parameters ?? Array.Empty<object>()) ?? false);
                     }
                     else
                     {
-                        method.Invoke(obj, parameters != null ? parameters : new object[] { });
+                        method.Invoke(obj, parameters ?? Array.Empty<object>());
                         result = true;
                     }
 

+ 2 - 2
inabox.wpf/DynamicGrid/Editors/ScriptEditor/ScriptEditorControl.cs

@@ -27,7 +27,7 @@ namespace InABox.DynamicGrid
         }
         public SyntaxLanguage SyntaxLanguage { get; set; }
 
-        public event OnEditorClicked OnEditorClicked;
+        public event OnScriptEditorClickedEvent OnEditorClicked;
 
         public override void Configure()
         {
@@ -98,7 +98,7 @@ namespace InABox.DynamicGrid
 
         protected override void UpdateValue(string value)
         {
-            script = value;
+            script = value.NotWhiteSpaceOr("");
         }
 
         public override void SetFocus()