From 6f9fa35c5ac195cde1db89839c84dacf37d0726e Mon Sep 17 00:00:00 2001 From: Roopesh Chander Date: Tue, 22 Jan 2019 12:57:27 +0530 Subject: macOS: Disable save button if the syntax highlighter detects any errors Signed-off-by: Roopesh Chander --- .../UI/macOS/ViewController/TunnelEditViewController.swift | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'WireGuard/WireGuard/UI/macOS/ViewController/TunnelEditViewController.swift') diff --git a/WireGuard/WireGuard/UI/macOS/ViewController/TunnelEditViewController.swift b/WireGuard/WireGuard/UI/macOS/ViewController/TunnelEditViewController.swift index 7a6a4a0..27d60c7 100644 --- a/WireGuard/WireGuard/UI/macOS/ViewController/TunnelEditViewController.swift +++ b/WireGuard/WireGuard/UI/macOS/ViewController/TunnelEditViewController.swift @@ -84,7 +84,8 @@ class TunnelEditViewController: NSViewController { weak var delegate: TunnelEditViewControllerDelegate? - var textViewObservationToken: AnyObject? + var privateKeyObservationToken: AnyObject? + var hasErrorObservationToken: AnyObject? init(tunnelsManager: TunnelsManager, tunnel: TunnelContainer?) { self.tunnelsManager = tunnelsManager @@ -119,7 +120,7 @@ class TunnelEditViewController: NSViewController { textView.string = bootstrappingText selectedActivateOnDemandOption = .none } - textViewObservationToken = textView.observe(\.privateKeyString) { [weak publicKeyRow] textView, _ in + privateKeyObservationToken = textView.observe(\.privateKeyString) { [weak publicKeyRow] textView, _ in if let privateKeyString = textView.privateKeyString, let privateKey = Data(base64Encoded: privateKeyString), privateKey.count == TunnelConfiguration.keyLength { @@ -129,6 +130,9 @@ class TunnelEditViewController: NSViewController { publicKeyRow?.value = "" } } + hasErrorObservationToken = textView.observe(\.hasError) { [weak saveButton] textView, _ in + saveButton?.isEnabled = !textView.hasError + } onDemandRow.valueOptions = activateOnDemandOptions.map { TunnelViewModel.activateOnDemandOptionText(for: $0) } onDemandRow.selectedOptionIndex = activateOnDemandOptions.firstIndex(of: selectedActivateOnDemandOption)! -- cgit v1.2.3-59-g8ed1b