diff --git a/lib/ProMotion/web/web_screen_module.rb b/lib/ProMotion/web/web_screen_module.rb index c8d2fdbb..9fbf1674 100644 --- a/lib/ProMotion/web/web_screen_module.rb +++ b/lib/ProMotion/web/web_screen_module.rb @@ -104,32 +104,34 @@ def refresh; web.reload; end def stop; web.stopLoading; end alias :reload :refresh - def open_in_chrome(inRequest) + def open_in_chrome(in_request) # Add pod 'OpenInChrome' to your Rakefile if you want links to open in Google Chrome for users. # This will fall back to Safari if the user doesn't have Chrome installed. chrome_controller = OpenInChromeController.sharedInstance - return open_in_safari(inRequest) unless chrome_controller.isChromeInstalled - chrome_controller.openInChrome(inRequest.URL) + return open_in_safari(in_request) unless chrome_controller.isChromeInstalled + chrome_controller.openInChrome(in_request.URL) end - def open_in_safari(inRequest) + def open_in_safari(in_request) # Open UIWebView delegate links in Safari. - UIApplication.sharedApplication.openURL(inRequest.URL) + UIApplication.sharedApplication.openURL(in_request.URL) end # UIWebViewDelegate Methods - Camelcase - def webView(inWeb, shouldStartLoadWithRequest:inRequest, navigationType:inType) - if self.external_links == true && inType == UIWebViewNavigationTypeLinkClicked - if defined?(OpenInChromeController) - open_in_chrome inRequest - else - open_in_safari inRequest + def webView(in_web, shouldStartLoadWithRequest:in_request, navigationType:in_type) + if %w(http https).include?(in_request.URL.scheme) + if self.external_links == true && in_type == UIWebViewNavigationTypeLinkClicked + if defined?(OpenInChromeController) + open_in_chrome in_request + else + open_in_safari in_request + end + return false # don't allow the web view to load the link. end - return false #don't allow the web view to load the link. end load_request_enable = true #return true on default for local file loading. - load_request_enable = !!on_request(inRequest, inType) if self.respond_to?(:on_request) + load_request_enable = !!on_request(in_request, in_type) if self.respond_to?(:on_request) load_request_enable end