Skip to content

Commit 5c13361

Browse files
marcuswestinmarcuswestin
committed
Conflicts: WebViewJavascriptBridge/WebViewJavascriptBridge.h WebViewJavascriptBridge/WebViewJavascriptBridge.m
2 parents 5775ebb + c4fbcd6 commit 5c13361

26 files changed

+4591
-345
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
*.mode2v3
88
*.perspectivev3
99
*.xcuserstate
10-
project.xcworkspace/
10+
*.xcworkspace/
1111
xcuserdata/

‎ExampleApp-OSX.xcodeproj/project.pbxproj‎

Lines changed: 325 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,325 @@
1+
// !$*UTF8*$!
2+
{
3+
archiveVersion = 1;
4+
classes = {
5+
};
6+
objectVersion = 46;
7+
objects = {
8+
9+
/* Begin PBXBuildFile section */
10+
2CA045DA171178E5006DEE8B /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CA045D9171178E5006DEE8B /* Cocoa.framework */; };
11+
2CA045E4171178E6006DEE8B /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2CA045E2171178E6006DEE8B /* InfoPlist.strings */; };
12+
2CA045E6171178E6006DEE8B /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 2CA045E5171178E6006DEE8B /* main.m */; };
13+
2CA045ED171178E6006DEE8B /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 2CA045EC171178E6006DEE8B /* AppDelegate.m */; };
14+
2CA045F0171178E6006DEE8B /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2CA045EE171178E6006DEE8B /* MainMenu.xib */; };
15+
2CA0460517117B56006DEE8B /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CA0460417117B56006DEE8B /* WebKit.framework */; };
16+
2CA046531711AC29006DEE8B /* WebViewJavascriptBridge.js.txt in Resources */ = {isa = PBXBuildFile; fileRef = 2CA0464C1711AC29006DEE8B /* WebViewJavascriptBridge.js.txt */; };
17+
2CA046551711AC29006DEE8B /* WebViewJavascriptBridge_OSX.m in Sources */ = {isa = PBXBuildFile; fileRef = 2CA046501711AC29006DEE8B /* WebViewJavascriptBridge_OSX.m */; };
18+
2CA046561711AC29006DEE8B /* WebViewJavascriptBridgeAbstract.m in Sources */ = {isa = PBXBuildFile; fileRef = 2CA046521711AC29006DEE8B /* WebViewJavascriptBridgeAbstract.m */; };
19+
2CA0465E1711AC96006DEE8B /* ExampleApp.html in Resources */ = {isa = PBXBuildFile; fileRef = 2CA0465D1711AC96006DEE8B /* ExampleApp.html */; };
20+
/* End PBXBuildFile section */
21+
22+
/* Begin PBXFileReference section */
23+
2CA045D5171178E5006DEE8B /* ExampleApp-OSX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ExampleApp-OSX.app"; sourceTree = BUILT_PRODUCTS_DIR; };
24+
2CA045D9171178E5006DEE8B /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
25+
2CA045DC171178E5006DEE8B /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
26+
2CA045DD171178E5006DEE8B /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
27+
2CA045DE171178E5006DEE8B /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
28+
2CA045E1171178E6006DEE8B /* ExampleApp-OSX-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "ExampleApp-OSX-Info.plist"; sourceTree = "<group>"; };
29+
2CA045E3171178E6006DEE8B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
30+
2CA045E5171178E6006DEE8B /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
31+
2CA045E7171178E6006DEE8B /* ExampleApp-OSX-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ExampleApp-OSX-Prefix.pch"; sourceTree = "<group>"; };
32+
2CA045EB171178E6006DEE8B /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
33+
2CA045EC171178E6006DEE8B /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
34+
2CA045EF171178E6006DEE8B /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainMenu.xib; sourceTree = "<group>"; };
35+
2CA0460417117B56006DEE8B /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
36+
2CA0464C1711AC29006DEE8B /* WebViewJavascriptBridge.js.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebViewJavascriptBridge.js.txt; sourceTree = "<group>"; };
37+
2CA0464F1711AC29006DEE8B /* WebViewJavascriptBridge_OSX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewJavascriptBridge_OSX.h; sourceTree = "<group>"; };
38+
2CA046501711AC29006DEE8B /* WebViewJavascriptBridge_OSX.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebViewJavascriptBridge_OSX.m; sourceTree = "<group>"; };
39+
2CA046511711AC29006DEE8B /* WebViewJavascriptBridgeAbstract.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewJavascriptBridgeAbstract.h; sourceTree = "<group>"; };
40+
2CA046521711AC29006DEE8B /* WebViewJavascriptBridgeAbstract.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebViewJavascriptBridgeAbstract.m; sourceTree = "<group>"; };
41+
2CA0465D1711AC96006DEE8B /* ExampleApp.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file; name = ExampleApp.html; path = ../ExampleApp.html; sourceTree = "<group>"; };
42+
/* End PBXFileReference section */
43+
44+
/* Begin PBXFrameworksBuildPhase section */
45+
2CA045D2171178E5006DEE8B /* Frameworks */ = {
46+
isa = PBXFrameworksBuildPhase;
47+
buildActionMask = 2147483647;
48+
files = (
49+
2CA0460517117B56006DEE8B /* WebKit.framework in Frameworks */,
50+
2CA045DA171178E5006DEE8B /* Cocoa.framework in Frameworks */,
51+
);
52+
runOnlyForDeploymentPostprocessing = 0;
53+
};
54+
/* End PBXFrameworksBuildPhase section */
55+
56+
/* Begin PBXGroup section */
57+
2CA045CA171178E5006DEE8B = {
58+
isa = PBXGroup;
59+
children = (
60+
2CA0460417117B56006DEE8B /* WebKit.framework */,
61+
2CA045DF171178E5006DEE8B /* ExampleApp-OSX */,
62+
2CA045D8171178E5006DEE8B /* Frameworks */,
63+
2CA045D6171178E5006DEE8B /* Products */,
64+
);
65+
sourceTree = "<group>";
66+
};
67+
2CA045D6171178E5006DEE8B /* Products */ = {
68+
isa = PBXGroup;
69+
children = (
70+
2CA045D5171178E5006DEE8B /* ExampleApp-OSX.app */,
71+
);
72+
name = Products;
73+
sourceTree = "<group>";
74+
};
75+
2CA045D8171178E5006DEE8B /* Frameworks */ = {
76+
isa = PBXGroup;
77+
children = (
78+
2CA045D9171178E5006DEE8B /* Cocoa.framework */,
79+
2CA045DB171178E5006DEE8B /* Other Frameworks */,
80+
);
81+
name = Frameworks;
82+
sourceTree = "<group>";
83+
};
84+
2CA045DB171178E5006DEE8B /* Other Frameworks */ = {
85+
isa = PBXGroup;
86+
children = (
87+
2CA045DC171178E5006DEE8B /* AppKit.framework */,
88+
2CA045DD171178E5006DEE8B /* CoreData.framework */,
89+
2CA045DE171178E5006DEE8B /* Foundation.framework */,
90+
);
91+
name = "Other Frameworks";
92+
sourceTree = "<group>";
93+
};
94+
2CA045DF171178E5006DEE8B /* ExampleApp-OSX */ = {
95+
isa = PBXGroup;
96+
children = (
97+
2CA0465D1711AC96006DEE8B /* ExampleApp.html */,
98+
2CA0464B1711AC29006DEE8B /* WebViewJavascriptBridge */,
99+
2CA045EB171178E6006DEE8B /* AppDelegate.h */,
100+
2CA045EC171178E6006DEE8B /* AppDelegate.m */,
101+
2CA045EE171178E6006DEE8B /* MainMenu.xib */,
102+
2CA045E0171178E6006DEE8B /* Supporting Files */,
103+
);
104+
path = "ExampleApp-OSX";
105+
sourceTree = "<group>";
106+
};
107+
2CA045E0171178E6006DEE8B /* Supporting Files */ = {
108+
isa = PBXGroup;
109+
children = (
110+
2CA045E1171178E6006DEE8B /* ExampleApp-OSX-Info.plist */,
111+
2CA045E2171178E6006DEE8B /* InfoPlist.strings */,
112+
2CA045E5171178E6006DEE8B /* main.m */,
113+
2CA045E7171178E6006DEE8B /* ExampleApp-OSX-Prefix.pch */,
114+
);
115+
name = "Supporting Files";
116+
sourceTree = "<group>";
117+
};
118+
2CA0464B1711AC29006DEE8B /* WebViewJavascriptBridge */ = {
119+
isa = PBXGroup;
120+
children = (
121+
2CA0464C1711AC29006DEE8B /* WebViewJavascriptBridge.js.txt */,
122+
2CA0464F1711AC29006DEE8B /* WebViewJavascriptBridge_OSX.h */,
123+
2CA046501711AC29006DEE8B /* WebViewJavascriptBridge_OSX.m */,
124+
2CA046511711AC29006DEE8B /* WebViewJavascriptBridgeAbstract.h */,
125+
2CA046521711AC29006DEE8B /* WebViewJavascriptBridgeAbstract.m */,
126+
);
127+
path = WebViewJavascriptBridge;
128+
sourceTree = SOURCE_ROOT;
129+
};
130+
/* End PBXGroup section */
131+
132+
/* Begin PBXNativeTarget section */
133+
2CA045D4171178E5006DEE8B /* ExampleApp-OSX */ = {
134+
isa = PBXNativeTarget;
135+
buildConfigurationList = 2CA045F3171178E6006DEE8B /* Build configuration list for PBXNativeTarget "ExampleApp-OSX" */;
136+
buildPhases = (
137+
2CA045D1171178E5006DEE8B /* Sources */,
138+
2CA045D2171178E5006DEE8B /* Frameworks */,
139+
2CA045D3171178E5006DEE8B /* Resources */,
140+
);
141+
buildRules = (
142+
);
143+
dependencies = (
144+
);
145+
name = "ExampleApp-OSX";
146+
productName = "ExampleApp-OSX";
147+
productReference = 2CA045D5171178E5006DEE8B /* ExampleApp-OSX.app */;
148+
productType = "com.apple.product-type.application";
149+
};
150+
/* End PBXNativeTarget section */
151+
152+
/* Begin PBXProject section */
153+
2CA045CC171178E5006DEE8B /* Project object */ = {
154+
isa = PBXProject;
155+
attributes = {
156+
LastUpgradeCheck = 0450;
157+
ORGANIZATIONNAME = "Antoine Lagadec";
158+
};
159+
buildConfigurationList = 2CA045CF171178E5006DEE8B /* Build configuration list for PBXProject "ExampleApp-OSX" */;
160+
compatibilityVersion = "Xcode 3.2";
161+
developmentRegion = English;
162+
hasScannedForEncodings = 0;
163+
knownRegions = (
164+
en,
165+
);
166+
mainGroup = 2CA045CA171178E5006DEE8B;
167+
productRefGroup = 2CA045D6171178E5006DEE8B /* Products */;
168+
projectDirPath = "";
169+
projectRoot = "";
170+
targets = (
171+
2CA045D4171178E5006DEE8B /* ExampleApp-OSX */,
172+
);
173+
};
174+
/* End PBXProject section */
175+
176+
/* Begin PBXResourcesBuildPhase section */
177+
2CA045D3171178E5006DEE8B /* Resources */ = {
178+
isa = PBXResourcesBuildPhase;
179+
buildActionMask = 2147483647;
180+
files = (
181+
2CA045E4171178E6006DEE8B /* InfoPlist.strings in Resources */,
182+
2CA045F0171178E6006DEE8B /* MainMenu.xib in Resources */,
183+
2CA046531711AC29006DEE8B /* WebViewJavascriptBridge.js.txt in Resources */,
184+
2CA0465E1711AC96006DEE8B /* ExampleApp.html in Resources */,
185+
);
186+
runOnlyForDeploymentPostprocessing = 0;
187+
};
188+
/* End PBXResourcesBuildPhase section */
189+
190+
/* Begin PBXSourcesBuildPhase section */
191+
2CA045D1171178E5006DEE8B /* Sources */ = {
192+
isa = PBXSourcesBuildPhase;
193+
buildActionMask = 2147483647;
194+
files = (
195+
2CA045E6171178E6006DEE8B /* main.m in Sources */,
196+
2CA045ED171178E6006DEE8B /* AppDelegate.m in Sources */,
197+
2CA046551711AC29006DEE8B /* WebViewJavascriptBridge_OSX.m in Sources */,
198+
2CA046561711AC29006DEE8B /* WebViewJavascriptBridgeAbstract.m in Sources */,
199+
);
200+
runOnlyForDeploymentPostprocessing = 0;
201+
};
202+
/* End PBXSourcesBuildPhase section */
203+
204+
/* Begin PBXVariantGroup section */
205+
2CA045E2171178E6006DEE8B /* InfoPlist.strings */ = {
206+
isa = PBXVariantGroup;
207+
children = (
208+
2CA045E3171178E6006DEE8B /* en */,
209+
);
210+
name = InfoPlist.strings;
211+
sourceTree = "<group>";
212+
};
213+
2CA045EE171178E6006DEE8B /* MainMenu.xib */ = {
214+
isa = PBXVariantGroup;
215+
children = (
216+
2CA045EF171178E6006DEE8B /* en */,
217+
);
218+
name = MainMenu.xib;
219+
sourceTree = "<group>";
220+
};
221+
/* End PBXVariantGroup section */
222+
223+
/* Begin XCBuildConfiguration section */
224+
2CA045F1171178E6006DEE8B /* Debug */ = {
225+
isa = XCBuildConfiguration;
226+
buildSettings = {
227+
ALWAYS_SEARCH_USER_PATHS = NO;
228+
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
229+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
230+
CLANG_CXX_LIBRARY = "libc++";
231+
CLANG_ENABLE_OBJC_ARC = YES;
232+
CLANG_WARN_EMPTY_BODY = YES;
233+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
234+
COPY_PHASE_STRIP = NO;
235+
GCC_C_LANGUAGE_STANDARD = gnu99;
236+
GCC_DYNAMIC_NO_PIC = NO;
237+
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
238+
GCC_OPTIMIZATION_LEVEL = 0;
239+
GCC_PREPROCESSOR_DEFINITIONS = (
240+
"DEBUG=1",
241+
"$(inherited)",
242+
);
243+
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
244+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
245+
GCC_WARN_ABOUT_RETURN_TYPE = YES;
246+
GCC_WARN_UNINITIALIZED_AUTOS = YES;
247+
GCC_WARN_UNUSED_VARIABLE = YES;
248+
MACOSX_DEPLOYMENT_TARGET = 10.7;
249+
ONLY_ACTIVE_ARCH = YES;
250+
SDKROOT = macosx;
251+
};
252+
name = Debug;
253+
};
254+
2CA045F2171178E6006DEE8B /* Release */ = {
255+
isa = XCBuildConfiguration;
256+
buildSettings = {
257+
ALWAYS_SEARCH_USER_PATHS = NO;
258+
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
259+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
260+
CLANG_CXX_LIBRARY = "libc++";
261+
CLANG_ENABLE_OBJC_ARC = YES;
262+
CLANG_WARN_EMPTY_BODY = YES;
263+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
264+
COPY_PHASE_STRIP = YES;
265+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
266+
GCC_C_LANGUAGE_STANDARD = gnu99;
267+
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
268+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
269+
GCC_WARN_ABOUT_RETURN_TYPE = YES;
270+
GCC_WARN_UNINITIALIZED_AUTOS = YES;
271+
GCC_WARN_UNUSED_VARIABLE = YES;
272+
MACOSX_DEPLOYMENT_TARGET = 10.7;
273+
SDKROOT = macosx;
274+
};
275+
name = Release;
276+
};
277+
2CA045F4171178E6006DEE8B /* Debug */ = {
278+
isa = XCBuildConfiguration;
279+
buildSettings = {
280+
COMBINE_HIDPI_IMAGES = YES;
281+
GCC_PRECOMPILE_PREFIX_HEADER = YES;
282+
GCC_PREFIX_HEADER = "ExampleApp-OSX/ExampleApp-OSX-Prefix.pch";
283+
INFOPLIST_FILE = "ExampleApp-OSX/ExampleApp-OSX-Info.plist";
284+
PRODUCT_NAME = "$(TARGET_NAME)";
285+
WRAPPER_EXTENSION = app;
286+
};
287+
name = Debug;
288+
};
289+
2CA045F5171178E6006DEE8B /* Release */ = {
290+
isa = XCBuildConfiguration;
291+
buildSettings = {
292+
COMBINE_HIDPI_IMAGES = YES;
293+
GCC_PRECOMPILE_PREFIX_HEADER = YES;
294+
GCC_PREFIX_HEADER = "ExampleApp-OSX/ExampleApp-OSX-Prefix.pch";
295+
INFOPLIST_FILE = "ExampleApp-OSX/ExampleApp-OSX-Info.plist";
296+
PRODUCT_NAME = "$(TARGET_NAME)";
297+
WRAPPER_EXTENSION = app;
298+
};
299+
name = Release;
300+
};
301+
/* End XCBuildConfiguration section */
302+
303+
/* Begin XCConfigurationList section */
304+
2CA045CF171178E5006DEE8B /* Build configuration list for PBXProject "ExampleApp-OSX" */ = {
305+
isa = XCConfigurationList;
306+
buildConfigurations = (
307+
2CA045F1171178E6006DEE8B /* Debug */,
308+
2CA045F2171178E6006DEE8B /* Release */,
309+
);
310+
defaultConfigurationIsVisible = 0;
311+
defaultConfigurationName = Release;
312+
};
313+
2CA045F3171178E6006DEE8B /* Build configuration list for PBXNativeTarget "ExampleApp-OSX" */ = {
314+
isa = XCConfigurationList;
315+
buildConfigurations = (
316+
2CA045F4171178E6006DEE8B /* Debug */,
317+
2CA045F5171178E6006DEE8B /* Release */,
318+
);
319+
defaultConfigurationIsVisible = 0;
320+
defaultConfigurationName = Release;
321+
};
322+
/* End XCConfigurationList section */
323+
};
324+
rootObject = 2CA045CC171178E5006DEE8B /* Project object */;
325+
}

‎ExampleApp-OSX/AppDelegate.h‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
//
2+
// AppDelegate.h
3+
// ExampleApp-OSX
4+
//
5+
// Created by Antoine Lagadec on 07/04/13.
6+
// Copyright (c) 2013 Antoine Lagadec. All rights reserved.
7+
//
8+
9+
#import <Cocoa/Cocoa.h>
10+
#import "WebViewJavascriptBridge_OSX.h"
11+
12+
@interface AppDelegate : NSObject <NSApplicationDelegate>
13+
14+
@property (assign) IBOutlet NSWindow *window;
15+
@property (weak) IBOutlet WebView *webView;
16+
17+
- (IBAction)sendMessage:(id)sender;
18+
- (IBAction)callHandler:(id)sender;
19+
20+
@property (strong, nonatomic) WebViewJavascriptBridge *javascriptBridge;
21+
22+
@end

0 commit comments

Comments
 (0)