Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve debug capabilities in the Safari context by listing of configuration file(s) in the developer tools sidebar #265

Merged
merged 2 commits into from
Nov 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ Release: dd.mm.yyyy
### Changes

- Improve first launch experience by removing custom alert before accessibility prompt and terminating Phoenix.
- Improve debug capabilites in the Safari context by listing of configuration file(s) in the
developer tools sidebar

2.6.4
-----
Expand Down
6 changes: 4 additions & 2 deletions Phoenix.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -395,8 +395,8 @@
isa = PBXNativeTarget;
buildConfigurationList = A79C46741B5BF31200C460CF /* Build configuration list for PBXNativeTarget "Phoenix" */;
buildPhases = (
A7A6F57F1D1AD4CD000A0E5E /* Build Library */,
A32B0CB41F9B8F1C428EE663 /* [CP] Check Pods Manifest.lock */,
A7A6F57F1D1AD4CD000A0E5E /* Build Library */,
A79C46531B5BF31100C460CF /* Sources */,
A79C46541B5BF31100C460CF /* Frameworks */,
A79C46551B5BF31100C460CF /* Resources */,
Expand Down Expand Up @@ -437,7 +437,7 @@
isa = PBXProject;
attributes = {
CLASSPREFIX = PH;
LastUpgradeCheck = 1130;
LastUpgradeCheck = 1200;
ORGANIZATIONNAME = Phoenix;
TargetAttributes = {
A79C46561B5BF31100C460CF = {
Expand Down Expand Up @@ -654,6 +654,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand Down Expand Up @@ -709,6 +710,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand Down
2 changes: 1 addition & 1 deletion Phoenix.xcodeproj/xcshareddata/xcschemes/Phoenix.xcscheme
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1150"
LastUpgradeVersion = "1200"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
3 changes: 2 additions & 1 deletion Phoenix/PHContext.m
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ - (void) loadScript:(NSString *)path {

NSError *error;
NSString *script = [NSString stringWithContentsOfFile:path encoding:NSUTF8StringEncoding error:&error];
NSURL *url = [NSURL fileURLWithPath:path relativeToURL:[NSURL fileURLWithPath:path.stringByDeletingLastPathComponent isDirectory:true]];

if (error) {
script = @"";
Expand All @@ -172,7 +173,7 @@ - (void) loadScript:(NSString *)path {
[PHNotificationHelper deliver:@"Preprocessing failed. Refer to the logs for more information."];
}

[self.context evaluateScript:script];
[self.context evaluateScript:script withSourceURL:url];
[self.configurationPaths addObject:path];
}

Expand Down
4 changes: 3 additions & 1 deletion Pods/Pods.xcodeproj/project.pbxproj

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.