From 300f99004eab168eedfeaf6d65a1418537e9cafb Mon Sep 17 00:00:00 2001 From: Robby Walker Date: Tue, 15 Jan 2013 22:25:53 -0800 Subject: [PATCH] Add checkpoints to demo, fix checkpoint styling in viewer --- HookshotDemo/HookshotDemo/ViewController.h | 2 +- HookshotDemo/HookshotDemo/ViewController.m | 12 +++++++++++ bin/static/style.css | 23 ++++++++++++++++++---- 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/HookshotDemo/HookshotDemo/ViewController.h b/HookshotDemo/HookshotDemo/ViewController.h index ebe98bd..cc8a160 100644 --- a/HookshotDemo/HookshotDemo/ViewController.h +++ b/HookshotDemo/HookshotDemo/ViewController.h @@ -11,7 +11,7 @@ /** * View controller for the demo. */ -@interface ViewController : UIViewController { +@interface ViewController : UIViewController { UIWebView *_webView; } diff --git a/HookshotDemo/HookshotDemo/ViewController.m b/HookshotDemo/HookshotDemo/ViewController.m index 46e759e..c7e70ea 100644 --- a/HookshotDemo/HookshotDemo/ViewController.m +++ b/HookshotDemo/HookshotDemo/ViewController.m @@ -7,6 +7,7 @@ // #import "ViewController.h" +#import "hookshot.h" @implementation ViewController @@ -15,6 +16,7 @@ @implementation ViewController - (void)viewDidLoad; { [super viewDidLoad]; + _webView.delegate = self; [_webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"http://www.cueup.com"]]]; } @@ -24,4 +26,14 @@ - (void)dealloc; [_webView release]; } +- (void)webViewDidStartLoad:(UIWebView *)webView; +{ + CHECKPOINT(@"didStartLoad"); +} + +- (void)webViewDidFinishLoad:(UIWebView *)webView; +{ + CHECKPOINT(@"didFinishLoad"); +} + @end diff --git a/bin/static/style.css b/bin/static/style.css index 314d36d..2bb35fc 100644 --- a/bin/static/style.css +++ b/bin/static/style.css @@ -35,13 +35,23 @@ body { } .checkpoint { + position: absolute; + top: 0; + margin-left: 300px; padding-left: 5px; border-left: 1px solid red; - z-index: -1; + z-index: 1; + color: red; + height: 100%; + padding-top: 32px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } .checkpoint div { font-size: 13px; + background: white; } .event.tag0 { @@ -86,14 +96,18 @@ body { width: 100%; background: #ccc; border-bottom: 1px solid #333; - z-index: 1; + z-index: 3; text-align: center; } #root { overflow: visible; - padding-top: 30px; + padding-top: 45px; width: 100%; + min-height: 100%; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } #controls { @@ -102,7 +116,8 @@ body { height: 100%; background: white; border-right: 1px solid black; - padding-top: 30px; + padding-top: 45px; + z-index: 2; } div {