require a selector to load the request

spiltcocoa · May 26, 2015 · 2045114 · 2045114
1 parent 764891a
commit 2045114
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/SCDomElementView/SCDomElementView.swift b/SCDomElementView/SCDomElementView.swift
@@ -34,6 +34,7 @@ public class SCDomElementView: UIView, WKNavigationDelegate, UIScrollViewDelegat
 	}()
 
 	public var delegate: SCDomElementViewDelegate?
+	private var selector: String?
 
 	public override init(frame: CGRect) {
 		super.init(frame: frame)
@@ -73,21 +74,24 @@ public class SCDomElementView: UIView, WKNavigationDelegate, UIScrollViewDelegat
 		}
 	}
 
-	public func loadRequest(request: NSURLRequest) {
+	public func showSelector(selector: String, withRequest request: NSURLRequest) {
+		self.selector = selector
 		delegate?.domElementViewDidStartRequest(self)
 		webView.loadRequest(request)
 	}
 
 	public func webView(webView: WKWebView, didFinishNavigation navigation: WKNavigation!) {
-		self.rectFromId("mobile") { rect in
-			var frame = rect
-			self.webView.scrollView.contentInset = UIEdgeInsets(top: -frame.origin.y, left: -frame.origin.x, bottom: (frame.origin.y + frame.size.height), right: (frame.origin.x + frame.size.width))
+		if let selector = selector {
+			self.rectFromId(selector) { rect in
+				var frame = rect
+				self.webView.scrollView.contentInset = UIEdgeInsets(top: -frame.origin.y, left: -frame.origin.x, bottom: (frame.origin.y + frame.size.height), right: (frame.origin.x + frame.size.width))
 
-			frame.origin = CGPointZero
-			self.frame = frame
-			self.webView.frame = frame
+				frame.origin = CGPointZero
+				self.frame = frame
+				self.webView.frame = frame
 
-			self.delegate?.domElementViewDidFinishRequest(self)
+				self.delegate?.domElementViewDidFinishRequest(self)
+			}
 		}
 	}
 }
diff --git a/iOS Example/iOS Example/ViewController.swift b/iOS Example/iOS Example/ViewController.swift
@@ -22,7 +22,7 @@ class ViewController: UIViewController {
 			let request = NSMutableURLRequest(URL: nsUrl, cachePolicy: .ReturnCacheDataElseLoad, timeoutInterval: 30)
 			request.setValue("f28f3d351d03e881478ef0f3aae47113", forHTTPHeaderField: "OPAL-AUTH-TOKEN")
 
-			elementView.loadRequest(request)
+			elementView.showSelector("mobile", withRequest: request)
 		}
 	}