From adbbc3350e411fa947495310887a3524c8db01e1 Mon Sep 17 00:00:00 2001 From: Chris Li Date: Mon, 21 Nov 2016 10:26:27 -0500 Subject: [PATCH] prevent default long press --- Kiwix-iOS/Controller/Main/JSInjection.swift | 7 +++---- Kiwix-iOS/Controller/Main/MainController.swift | 3 +-- Kiwix-iOS/Controller/Main/MainDelegates.swift | 1 + .../Main/{NavigationStack.swift => NavigationList.swift} | 2 +- Kiwix-iOS/Info.plist | 2 +- Kiwix-iOSWidgets/Bookmarks/Info.plist | 2 +- Kiwix.xcodeproj/project.pbxproj | 8 ++++---- 7 files changed, 12 insertions(+), 13 deletions(-) rename Kiwix-iOS/Controller/Main/{NavigationStack.swift => NavigationList.swift} (95%) diff --git a/Kiwix-iOS/Controller/Main/JSInjection.swift b/Kiwix-iOS/Controller/Main/JSInjection.swift index b4399df7..295cba9c 100644 --- a/Kiwix-iOS/Controller/Main/JSInjection.swift +++ b/Kiwix-iOS/Controller/Main/JSInjection.swift @@ -11,10 +11,9 @@ import JavaScriptCore class JS { - class func inject(_ webView: UIWebView) { - let path = Bundle.main.path(forResource: "injection", ofType: "js") - let jString = try? String(contentsOfFile: path!) - webView.context.evaluateScript(jString!) + class func preventDefaultLongTap(webView: UIWebView) { + let jString = "document.body.style.webkitTouchCallout='none';" + webView.context.evaluateScript(jString) } class func adjustFontSizeIfNeeded(_ webView: UIWebView) { diff --git a/Kiwix-iOS/Controller/Main/MainController.swift b/Kiwix-iOS/Controller/Main/MainController.swift index 7ad18c50..fb050180 100644 --- a/Kiwix-iOS/Controller/Main/MainController.swift +++ b/Kiwix-iOS/Controller/Main/MainController.swift @@ -14,7 +14,7 @@ class MainController: UIViewController { let searchBar = SearchBar() lazy var controllers = Controllers() lazy var buttons = Buttons() - let navigationStack = NavigationStack() + let navigationList = NavigationList() override func viewDidLoad() { super.viewDidLoad() @@ -55,5 +55,4 @@ class MainController: UIViewController { return } } - } diff --git a/Kiwix-iOS/Controller/Main/MainDelegates.swift b/Kiwix-iOS/Controller/Main/MainDelegates.swift index 11c05977..a830777e 100644 --- a/Kiwix-iOS/Controller/Main/MainDelegates.swift +++ b/Kiwix-iOS/Controller/Main/MainDelegates.swift @@ -103,6 +103,7 @@ extension MainController: UIWebViewDelegate, SFSafariViewControllerDelegate { } func webViewDidFinishLoad(_ webView: UIWebView) { + JS.preventDefaultLongTap(webView: webView) guard let title = JS.getTitle(from: webView) else {return} searchBar.title = title diff --git a/Kiwix-iOS/Controller/Main/NavigationStack.swift b/Kiwix-iOS/Controller/Main/NavigationList.swift similarity index 95% rename from Kiwix-iOS/Controller/Main/NavigationStack.swift rename to Kiwix-iOS/Controller/Main/NavigationList.swift index adfbd4ad..770397a5 100644 --- a/Kiwix-iOS/Controller/Main/NavigationStack.swift +++ b/Kiwix-iOS/Controller/Main/NavigationList.swift @@ -8,7 +8,7 @@ import UIKit -class NavigationStack { +class NavigationList { var backList = [URL]() var forwardList = [URL]() var currentURL: URL? diff --git a/Kiwix-iOS/Info.plist b/Kiwix-iOS/Info.plist index 72bbce61..b5054fe7 100644 --- a/Kiwix-iOS/Info.plist +++ b/Kiwix-iOS/Info.plist @@ -49,7 +49,7 @@ CFBundleVersion - 1.8.2998 + 1.8.3001 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/Kiwix-iOSWidgets/Bookmarks/Info.plist b/Kiwix-iOSWidgets/Bookmarks/Info.plist index f909b816..cb485a69 100644 --- a/Kiwix-iOSWidgets/Bookmarks/Info.plist +++ b/Kiwix-iOSWidgets/Bookmarks/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 1.8.2998 + 1.8.3001 NSExtension NSExtensionMainStoryboard diff --git a/Kiwix.xcodeproj/project.pbxproj b/Kiwix.xcodeproj/project.pbxproj index 32628c77..fac189e3 100644 --- a/Kiwix.xcodeproj/project.pbxproj +++ b/Kiwix.xcodeproj/project.pbxproj @@ -44,7 +44,7 @@ 973208271DD2238B00EDD3DC /* GlobalQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D6811C1D6F70AC00E5FA99 /* GlobalQueue.swift */; }; 973208291DD223DB00EDD3DC /* RefreshLibrary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973208281DD223DB00EDD3DC /* RefreshLibrary.swift */; }; 9734E54E1D289D060061C39B /* Welcome.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9734E54D1D289D060061C39B /* Welcome.storyboard */; }; - 97362EE91DE1EADB004205B5 /* NavigationStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97362EE81DE1EADB004205B5 /* NavigationStack.swift */; }; + 97362EE91DE1EADB004205B5 /* NavigationList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97362EE81DE1EADB004205B5 /* NavigationList.swift */; }; 973BCD1A1CEB402900F10B44 /* KiwixTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973BCD181CEB402900F10B44 /* KiwixTests.swift */; }; 973DD40F1D343F2F009D45DB /* libicudata.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 973DD4041D343F2F009D45DB /* libicudata.a */; }; 973DD4101D343F2F009D45DB /* libicui18n.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 973DD4051D343F2F009D45DB /* libicui18n.a */; }; @@ -193,7 +193,7 @@ 973208251DD21E9C00EDD3DC /* CoreDataContainer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoreDataContainer.swift; sourceTree = ""; }; 973208281DD223DB00EDD3DC /* RefreshLibrary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RefreshLibrary.swift; sourceTree = ""; }; 9734E54D1D289D060061C39B /* Welcome.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Welcome.storyboard; path = "Kiwix-iOS/Storyboard/Welcome.storyboard"; sourceTree = SOURCE_ROOT; }; - 97362EE81DE1EADB004205B5 /* NavigationStack.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationStack.swift; sourceTree = ""; }; + 97362EE81DE1EADB004205B5 /* NavigationList.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationList.swift; sourceTree = ""; }; 973BCD001CEB3FA500F10B44 /* Kiwix_OSXTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Kiwix_OSXTests.swift; sourceTree = ""; }; 973BCD021CEB3FA500F10B44 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 973BCD0B1CEB3FA500F10B44 /* Kiwix_OSXUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Kiwix_OSXUITests.swift; sourceTree = ""; }; @@ -485,7 +485,7 @@ 97D0E98E1DDA12B30029530E /* MainDelegates.swift */, 97BC0FC11DD92B62004BBAD1 /* Buttons.swift */, 97BC0FBD1DD90A65004BBAD1 /* JSInjection.swift */, - 97362EE81DE1EADB004205B5 /* NavigationStack.swift */, + 97362EE81DE1EADB004205B5 /* NavigationList.swift */, 972F81581DDC1B71008D7289 /* Controllers.swift */, ); path = Main; @@ -1164,7 +1164,7 @@ 973207A01DD1983D00EDD3DC /* DownloadTasksController.swift in Sources */, 97D0E9931DDA487E0029530E /* SearchBaseController.swift in Sources */, 97A1FD321D6F723D00A80EE2 /* resourceTools.cpp in Sources */, - 97362EE91DE1EADB004205B5 /* NavigationStack.swift in Sources */, + 97362EE91DE1EADB004205B5 /* NavigationList.swift in Sources */, 97A1FD451D6F728200A80EE2 /* StringTools.swift in Sources */, 97D681411D6F712800E5FA99 /* DownloadTask+CoreDataProperties.swift in Sources */, 97D681391D6F711A00E5FA99 /* DownloadTask.swift in Sources */,