FLWebView.podspec

@@ -0,0 +1,129 @@
+#
+#  Be sure to run `pod spec lint FLWebView.podspec' to ensure this is a
+#  valid spec and to remove all comments including this before submitting the spec.
+#
+#  To learn more about Podspec attributes see http://docs.cocoapods.org/specification.html
+#  To see working Podspecs in the CocoaPods repo see https://github.com/CocoaPods/Specs/
+#
+
+Pod::Spec.new do |s|
+
+  # ―――  Spec Metadata  ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
+  #
+  #  These will help people to find your library, and whilst it
+  #  can feel like a chore to fill in it's definitely to your advantage. The
+  #  summary should be tweet-length, and the description more in depth.
+  #
+
+  s.name         = "FLWebView"
+  s.version      = "0.1.0"
+  s.summary      = "WKWebView with UIWebView fallback for iOS."
+
+  s.description  = <<-DESC
+                   This is an example Xcode project demonstrating how to use WKWebView in iOS 8 with a UIWebView fallback for earlier versions of iOS.
+                   DESC
+
+  s.homepage     = "https://github.com/floatlearning/FLWebView"
+
+
+  # ―――  Spec License  ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
+  #
+  #  Licensing your code is important. See http://choosealicense.com for more info.
+  #  CocoaPods will detect a license file if there is a named LICENSE*
+  #  Popular ones are 'MIT', 'BSD' and 'Apache License, Version 2.0'.
+  #
+
+  s.license      = { :type => "MIT", :file => "license.md" }
+
+
+  # ――― Author Metadata  ――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
+  #
+  #  Specify the authors of the library, with email addresses. Email addresses
+  #  of the authors are extracted from the SCM log. E.g. $ git log. CocoaPods also
+  #  accepts just a name if you'd rather not provide an email address.
+  #
+  #  Specify a social_media_url where others can refer to, for example a twitter
+  #  profile URL.
+  #
+
+  s.author             = { "Float Mobile Learning" => "srichey@floatlearning.com" }
+  # Or just: s.author    = "Steve Richey"
+  # s.authors            = { "Steve Richey" => "srichey@floatlearning.com" }
+  # s.social_media_url   = "http://twitter.com/Steve Richey"
+
+  # ――― Platform Specifics ――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
+  #
+  #  If this Pod runs only on iOS or OS X, then specify the platform and
+  #  the deployment target. You can optionally include the target after the platform.
+  #
+
+  s.platform     = :ios
+  # s.platform     = :ios, "5.0"
+
+  #  When using multiple platforms
+  # s.ios.deployment_target = "5.0"
+  # s.osx.deployment_target = "10.7"
+
+
+  # ――― Source Location ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
+  #
+  #  Specify the location from where the source should be retrieved.
+  #  Supports git, hg, bzr, svn and HTTP.
+  #
+
+  s.source       = { :git => "https://github.com/floatlearning/FLWebView.git", :tag => "0.1.0" }
+
+
+  # ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
+  #
+  #  CocoaPods is smart about how it includes source code. For source files
+  #  giving a folder will include any h, m, mm, c & cpp files. For header
+  #  files it will include any header in the folder.
+  #  Not including the public_header_files will make all headers public.
+  #
+
+  s.source_files  = "FLWebView", "FLWebView/**/*.{h,m}"
+  # ss.exclude_files = "Classes/Exclude"
+
+  # s.public_header_files = "Classes/**/*.h"
+
+
+  # ――― Resources ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
+  #
+  #  A list of resources included with the Pod. These are copied into the
+  #  target bundle with a build phase script. Anything else will be cleaned.
+  #  You can preserve files from being cleaned, please don't preserve
+  #  non-essential files like tests, examples and documentation.
+  #
+
+  # s.resource  = "icon.png"
+  # s.resources = "Resources/*.png"
+
+  # s.preserve_paths = "FilesToSave", "MoreFilesToSave"
+
+
+  # ――― Project Linking ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
+  #
+  #  Link your library with frameworks, or libraries. Libraries do not include
+  #  the lib prefix of their name.
+  #
+
+  # s.framework  = "SomeFramework"
+  # s.frameworks = "SomeFramework", "AnotherFramework"
+
+  # s.library   = "iconv"
+  # s.libraries = "iconv", "xml2"
+
+
+  # ――― Project Settings ――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
+  #
+  #  If your library depends on compiler flags you can set them in the xcconfig hash
+  #  where they will only apply to your library. If you depend on other Podspecs
+  #  you can include multiple dependencies to ensure it works.
+
+  # s.requires_arc = true
+
+  # s.xcconfig = { "HEADER_SEARCH_PATHS" => "$(SDKROOT)/usr/include/libxml2" }
+  # s.dependency "JSONKit", "~> 1.4"
+
+end

FLWebView/UIWebView+FLUIWebView.m

@@ -45,20 +45,28 @@ - (NSURL *) URL
 */
 - (void) evaluateJavaScript: (NSString *) javaScriptString completionHandler: (void (^)(id, NSError *)) completionHandler
 {
-    NSString *string = [self stringByEvaluatingJavaScriptFromString: javaScriptString];
-
-    if (completionHandler) {
-        completionHandler(string, nil);
+    // Since with UIWebView we have to call evaluateJavaScript from the main thread
+    // so, this is to make sure we always call this method from the main thread.
+    // Just a note, with WkWebView we can call evaluateJavaScript from any thread.
+    if (![NSThread isMainThread]){
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [self evaluateJavaScript: javaScriptString completionHandler:completionHandler];
+        });
+    }else{
+        NSString *string = [self stringByEvaluatingJavaScriptFromString: javaScriptString];
+        if (completionHandler) {
+            completionHandler(string, nil);
+        }
     }
 }
 
 /*
  * WKWebView has nothing comparable to scalesPagesToFit, so we use this method instead.
  * Here, we just update scalesPagesToFit. In FLWKWebView, nothing happens.
 */
-- (void) setScalesPageToFit: (BOOL) setPages
+- (void) setScalesPagesToFit: (BOOL) setPages
 {
     self.scalesPageToFit = setPages;
 }
 
-@end
+@end

FLWebView/ViewController.m

@@ -43,7 +43,7 @@ - (void) viewDidLoad {
     [[self view]    setAutoresizingMask: UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight];
 
     // Just to show *something* on load, we go to our favorite site.
-    [[self webView] loadRequestFromString:@"http://www.floatlearning.com/"];
+    [[self webView] loadRequestFromString:@"https://www.gowithfloat.com/"];
 }
 
 /*

license.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Float Mobile Learning
+Copyright (c) 2014 Float
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

readme.md

@@ -1,9 +1,7 @@
-[FLWebView](https://github.com/floatlearning/FLWebView/) [![Build Status](https://travis-ci.org/floatlearning/FLWebView.svg?branch=master)](https://travis-ci.org/floatlearning/FLWebView)
+[FLWebView](https://github.com/gowithfloat/FLWebView/) [![Build Status](https://travis-ci.org/gowithfloat/FLWebView.svg?branch=master)](https://travis-ci.org/gowithfloat/FLWebView)
 =========
 
-<p align="center"><a href="http://floatlearning.com/"><img src="https://avatars0.githubusercontent.com/u/590014" alt="Float Mobile Learning"></a></p>
-
-*Note: This repository was written in Objective-C. A Swift version is [available here](https://github.com/floatlearning/FLWebView-Swift).*
+*Note: This repository was written in Objective-C. A Swift version is [available here](https://github.com/gowithfloat/FLWebView-Swift).*
 
 This is an example Xcode project demonstrating how to use [WKWebView](https://developer.apple.com/library/ios/documentation/WebKit/Reference/WKWebView_Ref/index.html) in iOS 8 with a [UIWebView](https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIWebView_Class/index.html#//apple_ref/doc/uid/TP40006950) fallback for earlier versions of iOS. A full discussion of this code is available [here](http://floatlearning.com/2014/12/one-webview-to-rule-them-all/). Basically, we created a [protocol](http://iosdevelopertips.com/objective-c/the-basics-of-protocols-and-delegates.html) that unifies the functionality we'd like to have in a `WebView`, and then created [categories](http://macdevelopertips.com/objective-c/objective-c-categories.html) that ensure we have the proper methods in our `UIWebView` and `WKWebView` classes.
 
@@ -54,4 +52,4 @@ As the goal of this project was not to create an example of good iOS testing, th
 
 # License
 
-&copy; 2014 [Float Mobile Learning](http://floatlearning.com/). Shared under an [MIT license](https://en.wikipedia.org/wiki/MIT_License). See [license.md](./license.md) for details.
+&copy; 2014 [Float](http://gowithfloat.com/). Shared under an [MIT license](https://en.wikipedia.org/wiki/MIT_License). See [license.md](./license.md) for details.