Merge branch 'master' of https://github.com/peyton/WebViewJavascriptBridge

marcuswestin · marcuswestin · commit 5ffda0952063 · 2013-06-06T14:00:00.000-07:00
Conflicts:
	WebViewJavascriptBridge_OSX/WebViewJavascriptBridge_OSX.m
diff --git a/WebViewJavascriptBridge.podspec b/WebViewJavascriptBridge.podspec
@@ -0,0 +1,17 @@
+Pod::Spec.new do |s|
+  s.name         = 'WebViewJavascriptBridge'
+  s.version      = '4.0.0pre'
+  s.summary      = 'An iOS/OSX bridge for sending messages between Obj-C and JavaScript in UIWebViews/WebViews.'
+  s.homepage     = 'http://github.com/marcuswestin/WebViewJavascriptBridge'
+  s.license      = { :type => 'MIT', :file => 'LICENSE' }
+  s.author       = { 'marcuswestin' => 'marcus.westin@gmail.com' }
+  s.requires_arc = true
+  s.source       = { :git => 'https://github.com/peyton/WebViewJavascriptBridge.git' }
+  s.ios.platform     = :ios, '5.0'
+  s.osx.platform     = :osx
+  s.ios.source_files = 'WebViewJavascriptBridge_iOS/*.{h,m}', 'WebViewJavascriptBridgeAbstract/*.{h,m}'
+  s.osx.source_files = 'WebViewJavascriptBridge_OSX/*.{h,m}', 'WebViewJavascriptBridgeAbstract/*.{h,m}'
+  s.resource     = 'WebViewJavascriptBridgeAbstract/WebViewJavascriptBridge.js.txt'
+  s.ios.framework    = 'UIKit'
+  s.osx.framework    = 'WebKit'
+end
diff --git a/WebViewJavascriptBridge_OSX/WebViewJavascriptBridge_OSX.m b/WebViewJavascriptBridge_OSX/WebViewJavascriptBridge_OSX.m
@@ -61,6 +61,7 @@ - (void)webView:(WebView *)webView didFinishLoadForFrame:(WebFrame *)frame
 
 - (void)webView:(WebView *)webView didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame {
     if (webView != self.webView) { return; }
+
     self.numRequestsLoading--;
 
     __strong typeof(self.webViewDelegate) strongDelegate = self.webViewDelegate;
