From f172aa8f89e1ab4ae00f63ea961e04a8125ba419 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Mon, 28 Feb 2011 21:19:54 -0800 Subject: Separate out CyteKit/WebScriptObject-Cyte.*. --- CyteKit/CyteWebView.mm | 39 ++++++++++++++++++++++++++++ CyteKit/CyteWebViewController.h | 5 ---- CyteKit/CyteWebViewController.mm | 16 ------------ CyteKit/WebScriptObject-Cyte.h | 50 +++++++++++++++++++++++++++++++++++ CyteKit/WebScriptObject-Cyte.mm | 56 ++++++++++++++++++++++++++++++++++++++++ MobileCydia.mm | 1 + 6 files changed, 146 insertions(+), 21 deletions(-) create mode 100644 CyteKit/WebScriptObject-Cyte.h create mode 100644 CyteKit/WebScriptObject-Cyte.mm diff --git a/CyteKit/CyteWebView.mm b/CyteKit/CyteWebView.mm index 3d2d36f..720bb72 100644 --- a/CyteKit/CyteWebView.mm +++ b/CyteKit/CyteWebView.mm @@ -1,3 +1,42 @@ +/* Cydia - iPhone UIKit Front-End for Debian APT + * Copyright (C) 2008-2011 Jay Freeman (saurik) +*/ + +/* Modified BSD License {{{ */ +/* + * Redistribution and use in source and binary + * forms, with or without modification, are permitted + * provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the + * above copyright notice, this list of conditions + * and the following disclaimer. + * 2. Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the + * distribution. + * 3. The name of the author may not be used to endorse + * or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ +/* }}} */ + #include "CyteKit/CyteWebView.h" #include diff --git a/CyteKit/CyteWebViewController.h b/CyteKit/CyteWebViewController.h index df86958..05024e3 100644 --- a/CyteKit/CyteWebViewController.h +++ b/CyteKit/CyteWebViewController.h @@ -49,11 +49,6 @@ @class IndirectDelegate; -@interface WebScriptObject (UICaboodle) -- (NSUInteger) count; -- (id) objectAtIndex:(unsigned)index; -@end - @protocol BrowserControllerDelegate - (void) retainNetworkActivityIndicator; - (void) releaseNetworkActivityIndicator; diff --git a/CyteKit/CyteWebViewController.mm b/CyteKit/CyteWebViewController.mm index 65a7351..9db2c8a 100644 --- a/CyteKit/CyteWebViewController.mm +++ b/CyteKit/CyteWebViewController.mm @@ -128,22 +128,6 @@ float CYScrollViewDecelerationRateNormal; @end /* }}} */ -@implementation WebScriptObject (UICaboodle) - -- (NSUInteger) count { - id length([self valueForKey:@"length"]); - if ([length respondsToSelector:@selector(intValue)]) - return [length intValue]; - else - return 0; -} - -- (id) objectAtIndex:(unsigned)index { - return [self webScriptValueAtIndex:index]; -} - -@end - @implementation BrowserController #if ShowInternals diff --git a/CyteKit/WebScriptObject-Cyte.h b/CyteKit/WebScriptObject-Cyte.h new file mode 100644 index 0000000..6da0d8c --- /dev/null +++ b/CyteKit/WebScriptObject-Cyte.h @@ -0,0 +1,50 @@ +/* Cydia - iPhone UIKit Front-End for Debian APT + * Copyright (C) 2008-2011 Jay Freeman (saurik) +*/ + +/* Modified BSD License {{{ */ +/* + * Redistribution and use in source and binary + * forms, with or without modification, are permitted + * provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the + * above copyright notice, this list of conditions + * and the following disclaimer. + * 2. Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the + * distribution. + * 3. The name of the author may not be used to endorse + * or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ +/* }}} */ + +#ifndef CyteKit_WebScriptObject_Cyte_H +#define CyteKit_WebScriptObject_Cyte_H + +#include + +@interface WebScriptObject (Cyte) +- (NSUInteger) count; +- (id) objectAtIndex:(unsigned)index; +@end + +#endif//CyteKit_WebScriptObject_Cyte_H diff --git a/CyteKit/WebScriptObject-Cyte.mm b/CyteKit/WebScriptObject-Cyte.mm new file mode 100644 index 0000000..9df6f85 --- /dev/null +++ b/CyteKit/WebScriptObject-Cyte.mm @@ -0,0 +1,56 @@ +/* Cydia - iPhone UIKit Front-End for Debian APT + * Copyright (C) 2008-2011 Jay Freeman (saurik) +*/ + +/* Modified BSD License {{{ */ +/* + * Redistribution and use in source and binary + * forms, with or without modification, are permitted + * provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the + * above copyright notice, this list of conditions + * and the following disclaimer. + * 2. Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the + * distribution. + * 3. The name of the author may not be used to endorse + * or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ +/* }}} */ + +#include "CyteKit/WebScriptObject-Cyte.h" + +@implementation WebScriptObject (Cyte) + +- (NSUInteger) count { + id length([self valueForKey:@"length"]); + if ([length respondsToSelector:@selector(intValue)]) + return [length intValue]; + else + return 0; +} + +- (id) objectAtIndex:(unsigned)index { + return [self webScriptValueAtIndex:index]; +} + +@end diff --git a/MobileCydia.mm b/MobileCydia.mm index 9dbe50e..1507541 100644 --- a/MobileCydia.mm +++ b/MobileCydia.mm @@ -123,6 +123,7 @@ extern "C" { #include "CyteKit/CyteWebViewController.h" #include "CyteKit/NSString-Cyte.h" #include "CyteKit/PerlCompatibleRegEx.hpp" +#include "CyteKit/WebScriptObject-Cyte.h" #include "SDURLCache/SDURLCache.h" -- cgit v1.2.3