From 9f1da6706fcf9c22172b84528992d8ad824c369c Mon Sep 17 00:00:00 2001 From: Kevin Jantzer Date: Thu, 31 Dec 2015 13:31:44 -0800 Subject: [PATCH 1/2] `shouldHideNavigationOnTap=true` works properly, fixing #12 --- Source/FolioReaderPage.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/FolioReaderPage.swift b/Source/FolioReaderPage.swift index 83e8ef7e0..10bd52aaa 100755 --- a/Source/FolioReaderPage.swift +++ b/Source/FolioReaderPage.swift @@ -206,8 +206,9 @@ class FolioReaderPage: UICollectionViewCell, UIWebViewDelegate, UIGestureRecogni if FolioReader.sharedInstance.readerCenter.navigationController!.navigationBarHidden { let menuIsVisibleRef = menuIsVisible - if let selected = webView.js("getSelectedText()") { - if selected.characters.count == 0 { + let selected = webView.js("getSelectedText()") + + if selected == nil || selected!.characters.count == 0 { let seconds = 0.4 let delay = seconds * Double(NSEC_PER_SEC) // nanoseconds per seconds let dispatchTime = dispatch_time(DISPATCH_TIME_NOW, Int64(delay)) @@ -220,7 +221,6 @@ class FolioReaderPage: UICollectionViewCell, UIWebViewDelegate, UIGestureRecogni self.shouldShowBar = true }) } - } } else if readerConfig.shouldHideNavigationOnTap == true { FolioReader.sharedInstance.readerCenter.hideBars() } From 01ab99fa1316c34ccc950cf74642b714eb437d38 Mon Sep 17 00:00:00 2001 From: Kevin Jantzer Date: Thu, 31 Dec 2015 13:32:18 -0800 Subject: [PATCH 2/2] Adjusting indentation for #12 fix --- Source/FolioReaderPage.swift | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Source/FolioReaderPage.swift b/Source/FolioReaderPage.swift index 10bd52aaa..3348f4995 100755 --- a/Source/FolioReaderPage.swift +++ b/Source/FolioReaderPage.swift @@ -208,19 +208,19 @@ class FolioReaderPage: UICollectionViewCell, UIWebViewDelegate, UIGestureRecogni let selected = webView.js("getSelectedText()") - if selected == nil || selected!.characters.count == 0 { - let seconds = 0.4 - let delay = seconds * Double(NSEC_PER_SEC) // nanoseconds per seconds - let dispatchTime = dispatch_time(DISPATCH_TIME_NOW, Int64(delay)) + if selected == nil || selected!.characters.count == 0 { + let seconds = 0.4 + let delay = seconds * Double(NSEC_PER_SEC) // nanoseconds per seconds + let dispatchTime = dispatch_time(DISPATCH_TIME_NOW, Int64(delay)) + + dispatch_after(dispatchTime, dispatch_get_main_queue(), { - dispatch_after(dispatchTime, dispatch_get_main_queue(), { - - if self.shouldShowBar && !menuIsVisibleRef { - FolioReader.sharedInstance.readerCenter.toggleBars() - } - self.shouldShowBar = true - }) - } + if self.shouldShowBar && !menuIsVisibleRef { + FolioReader.sharedInstance.readerCenter.toggleBars() + } + self.shouldShowBar = true + }) + } } else if readerConfig.shouldHideNavigationOnTap == true { FolioReader.sharedInstance.readerCenter.hideBars() }