Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

[[ BrowserWidget ]] Allow compilation with iOS SDK < v7.0 #3133

Merged
livecodeali merged 2 commits into from
Oct 28, 2015
Merged

[[ BrowserWidget ]] Allow compilation with iOS SDK < v7.0 #3133

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f73a183
[[ BrowserWidget ]] Allow compilation with iOS SDK < v7.0
livecodeian Oct 28, 2015
0770486
[[ BrowserWidget ]] Fix compile error when building for iOS < v7.0
livecodeian Oct 28, 2015
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
41 changes: 32 additions & 9 deletions libbrowser/src/libbrowser_uiwebview.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@

#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>

/* JSCore not supported on iOS version < 7.0 */
#ifdef __IPHONE_7_0
#import <JavaScriptCore/JavaScriptCore.h>
#endif

#include <core.h>

Expand Down Expand Up @@ -230,6 +234,9 @@ inline void MCBrowserRunBlockOnMainFiber(void (^p_block)(void))

if (m_delegate != nil)
[m_delegate release];

if (m_js_handler_list != nil)
[m_js_handler_list release];
});
}

Expand Down Expand Up @@ -312,23 +319,34 @@ inline void MCBrowserRunBlockOnMainFiber(void (^p_block)(void))

if (m_js_handlers != nil)
{
[m_js_handler_list release];
m_js_handler_list = nil;

MCCStringFree(m_js_handlers);
m_js_handlers = nil;
}

m_js_handlers = t_handlers;
t_handlers = nil;

if (m_js_handlers != nil)
m_js_handler_list = [[[NSString stringWithCString: m_js_handlers encoding:NSUTF8StringEncoding] componentsSeparatedByString: @"\n"] retain];

MCBrowserRunBlockOnMainFiber(^{
SyncJavaScriptHandlers(m_js_handler_list);
});
/* JSCore not supported on iOS version < 7.0 */
#ifdef __IPHONE_7_0

if (NSClassFromString(@"JSContext"))
{
if (m_js_handlers != nil)
{
if (m_js_handler_list != nil)
[m_js_handler_list release];
m_js_handler_list = nil;

m_js_handler_list = [[[NSString stringWithCString: m_js_handlers encoding:NSUTF8StringEncoding] componentsSeparatedByString: @"\n"] retain];
}

MCBrowserRunBlockOnMainFiber(^{
SyncJavaScriptHandlers(m_js_handler_list);
});
}

#endif

return true;
}

Expand All @@ -337,6 +355,9 @@ inline void MCBrowserRunBlockOnMainFiber(void (^p_block)(void))
bool t_success;
t_success = true;

/* JSCore not supported on iOS version < 7.0 */
#ifdef __IPHONE_7_0

// get js context for browser
JSContext *t_context;
t_context = nil;
Expand Down Expand Up @@ -376,6 +397,8 @@ inline void MCBrowserRunBlockOnMainFiber(void (^p_block)(void))
}
}

#endif

return t_success;
}

Expand Down