From 2647aadad8f3bddaa6c1f72a1a5e39bbeb2fcd23 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Wed, 3 Oct 2012 10:08:45 -0700
Subject: [PATCH] Re-enable JS for the feedback form

---
 DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.m  |  2 +-
 .../DNSCrypt/en.lproj/DNSCrypt.xib            | 32 ++++++-------------
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.m b/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.m
index 8691340..20bf24c 100644
--- a/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.m
+++ b/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.m
@@ -309,7 +309,7 @@ DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN;
     res = [self fromCommand: @"/bin/ksh" withArguments: [NSArray arrayWithObjects: @"-c", @"/usr/local/sbin/dnscrypt-proxy --version | head -n 1", nil]];
     NSCharacterSet *charset = [NSCharacterSet characterSetWithCharactersInString: @"\r\n<>'"];
     res = [[res componentsSeparatedByCharactersInSet: charset] componentsJoinedByString: @" "];
-    NSString *script = [NSString stringWithFormat: @"document.querySelector('textarea[name=feedback]').value='\\n\\n\\n--\\nOpenDNS user interface for OSX " kDNSCRYPT_PACKAGE_VERSION "\\n%@'", res];;
+    NSString *script = [NSString stringWithFormat: @"document.querySelector('textarea[name=feedback]').value='\\n\\n\\n--\\nOpenDNS user interface for OSX " kDNSCRYPT_PACKAGE_VERSION "\\n%@'", res];
     [sender stringByEvaluatingJavaScriptFromString: script];
 }
 
diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/en.lproj/DNSCrypt.xib b/DNSCrypt-Preference-Pane/DNSCrypt/en.lproj/DNSCrypt.xib
index 4ffb142..f86d96b 100644
--- a/DNSCrypt-Preference-Pane/DNSCrypt/en.lproj/DNSCrypt.xib
+++ b/DNSCrypt-Preference-Pane/DNSCrypt/en.lproj/DNSCrypt.xib
@@ -65,13 +65,13 @@
 							<string key="NSFrame">{{13, 10}, {563, 359}}</string>
 							<reference key="NSSuperview" ref="1037298196"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="1025762247"/>
+							<reference key="NSNextKeyView" ref="111364239"/>
 							<string key="NSReuseIdentifierKey">_NS:461</string>
 							<array class="NSMutableArray" key="NSTabViewItems">
 								<object class="NSTabViewItem" id="19707695">
 									<string key="NSIdentifier">1</string>
 									<object class="NSView" key="NSView" id="1025762247">
-										<reference key="NSNextResponder" ref="821865429"/>
+										<nil key="NSNextResponder"/>
 										<int key="NSvFlags">256</int>
 										<array class="NSMutableArray" key="NSSubviews">
 											<object class="NSButton" id="894789954">
@@ -79,7 +79,6 @@
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{15, 238}, {204, 22}}</string>
 												<reference key="NSSuperview" ref="1025762247"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="300098131"/>
 												<string key="NSReuseIdentifierKey">_NS:239</string>
 												<bool key="NSEnabled">YES</bool>
@@ -115,7 +114,6 @@
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{15, 212}, {245, 24}}</string>
 												<reference key="NSSuperview" ref="1025762247"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="891532389"/>
 												<string key="NSReuseIdentifierKey">_NS:239</string>
 												<bool key="NSEnabled">YES</bool>
@@ -142,7 +140,6 @@
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{15, 157}, {244, 22}}</string>
 												<reference key="NSSuperview" ref="1025762247"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="384170040"/>
 												<string key="NSReuseIdentifierKey">_NS:239</string>
 												<bool key="NSEnabled">YES</bool>
@@ -173,7 +170,6 @@
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{15, 133}, {204, 22}}</string>
 												<reference key="NSSuperview" ref="1025762247"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="240318099"/>
 												<string key="NSReuseIdentifierKey">_NS:239</string>
 												<bool key="NSEnabled">YES</bool>
@@ -200,7 +196,6 @@
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{14, 96}, {173, 19}}</string>
 												<reference key="NSSuperview" ref="1025762247"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="496861916"/>
 												<string key="NSReuseIdentifierKey">_NS:3936</string>
 												<bool key="NSEnabled">YES</bool>
@@ -241,7 +236,6 @@
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{54, 284}, {72, 19}}</string>
 												<reference key="NSSuperview" ref="1025762247"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="908408940"/>
 												<string key="NSReuseIdentifierKey">_NS:3936</string>
 												<bool key="NSEnabled">YES</bool>
@@ -266,7 +260,6 @@
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{14, -3}, {240, 83}}</string>
 												<reference key="NSSuperview" ref="1025762247"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="855319081"/>
 												<string key="NSReuseIdentifierKey">_NS:3596</string>
 												<bool key="NSEnabled">YES</bool>
@@ -296,7 +289,6 @@
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{115, 283}, {125, 19}}</string>
 												<reference key="NSSuperview" ref="1025762247"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="894789954"/>
 												<string key="NSReuseIdentifierKey">_NS:3596</string>
 												<bool key="NSEnabled">YES</bool>
@@ -334,7 +326,6 @@
 												</set>
 												<string key="NSFrame">{{302, 222}, {224, 88}}</string>
 												<reference key="NSSuperview" ref="1025762247"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="487940586"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSImageCell" key="NSCell" id="107747299">
@@ -365,7 +356,6 @@
 												</set>
 												<string key="NSFrame">{{17, 277}, {32.395949255088134, 32.395949255088134}}</string>
 												<reference key="NSSuperview" ref="1025762247"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="372048088"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSImageCell" key="NSCell" id="336811923">
@@ -388,7 +378,6 @@
 												<int key="NSvFlags">12</int>
 												<string key="NSFrame">{{269.5, 2}, {4, 300}}</string>
 												<reference key="NSSuperview" ref="1025762247"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="429164099"/>
 												<string key="NSReuseIdentifierKey">_NS:1557</string>
 												<string key="NSOffsets">{0, 0}</string>
@@ -425,8 +414,6 @@
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{323, 190}, {183, 32}}</string>
 												<reference key="NSSuperview" ref="1025762247"/>
-												<reference key="NSWindow"/>
-												<reference key="NSNextKeyView"/>
 												<string key="NSReuseIdentifierKey">_NS:2419</string>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="675161177">
@@ -472,7 +459,6 @@
 												</set>
 												<string key="NSFrame">{{302, 2}, {224, 192}}</string>
 												<reference key="NSSuperview" ref="1025762247"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView"/>
 												<string key="NSReuseIdentifierKey">_NS:51</string>
 												<string key="FrameName"/>
@@ -487,7 +473,7 @@
 														<boolean value="NO" key="WebKitDisplayImagesKey"/>
 														<boolean value="NO" key="WebKitJavaEnabled"/>
 														<boolean value="NO" key="WebKitJavaScriptCanOpenWindowsAutomatically"/>
-														<boolean value="NO" key="WebKitJavaScriptEnabled"/>
+														<boolean value="YES" key="WebKitJavaScriptEnabled"/>
 														<integer value="1" key="WebKitMinimumFontSize"/>
 														<boolean value="NO" key="WebKitPluginsEnabled"/>
 													</dictionary>
@@ -500,7 +486,6 @@
 												<int key="NSvFlags">12</int>
 												<string key="NSFrame">{{17, 193}, {240, 5}}</string>
 												<reference key="NSSuperview" ref="1025762247"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="410495287"/>
 												<string key="NSReuseIdentifierKey">_NS:2411</string>
 												<string key="NSOffsets">{0, 0}</string>
@@ -522,8 +507,6 @@
 											</object>
 										</array>
 										<string key="NSFrame">{{10, 33}, {543, 313}}</string>
-										<reference key="NSSuperview" ref="821865429"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="423755939"/>
 										<string key="NSReuseIdentifierKey">_NS:463</string>
 									</object>
@@ -1089,7 +1072,7 @@ aW91cy5leGFtcGxlLm5ldA</string>
 								<object class="NSTabViewItem" id="40200058">
 									<string key="NSIdentifier">5</string>
 									<object class="NSView" key="NSView" id="111364239">
-										<nil key="NSNextResponder"/>
+										<reference key="NSNextResponder" ref="821865429"/>
 										<int key="NSvFlags">256</int>
 										<array class="NSMutableArray" key="NSSubviews">
 											<object class="WebView" id="605742401">
@@ -1114,6 +1097,7 @@ aW91cy5leGFtcGxlLm5ldA</string>
 												</set>
 												<string key="NSFrame">{{17, 17}, {509, 293}}</string>
 												<reference key="NSSuperview" ref="111364239"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView"/>
 												<string key="NSReuseIdentifierKey">_NS:51</string>
 												<string key="FrameName"/>
@@ -1124,6 +1108,8 @@ aW91cy5leGFtcGxlLm5ldA</string>
 											</object>
 										</array>
 										<string key="NSFrame">{{10, 33}, {543, 313}}</string>
+										<reference key="NSSuperview" ref="821865429"/>
+										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="605742401"/>
 										<string key="NSReuseIdentifierKey">_NS:610</string>
 									</object>
@@ -1132,13 +1118,13 @@ aW91cy5leGFtcGxlLm5ldA</string>
 									<reference key="NSTabView" ref="821865429"/>
 								</object>
 							</array>
-							<reference key="NSSelectedTabViewItem" ref="19707695"/>
+							<reference key="NSSelectedTabViewItem" ref="40200058"/>
 							<reference key="NSFont" ref="604491631"/>
 							<int key="NSTvFlags">0</int>
 							<bool key="NSAllowTruncatedLabels">YES</bool>
 							<bool key="NSDrawsBackground">YES</bool>
 							<array class="NSMutableArray" key="NSSubviews">
-								<reference ref="1025762247"/>
+								<reference ref="111364239"/>
 							</array>
 						</object>
 					</array>