You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2013/03/22 16:49:35 UTC
mac commit: Code cleanup, added registerPlugin override.
Updated Branches:
refs/heads/master 42ebcc902 -> a9794ce49
Code cleanup, added registerPlugin override.
Project: http://git-wip-us.apache.org/repos/asf/cordova-osx/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-osx/commit/a9794ce4
Tree: http://git-wip-us.apache.org/repos/asf/cordova-osx/tree/a9794ce4
Diff: http://git-wip-us.apache.org/repos/asf/cordova-osx/diff/a9794ce4
Branch: refs/heads/master
Commit: a9794ce497df1e21d00d79f20f619d89fb479a81
Parents: 42ebcc9
Author: Shazron Abdullah <sh...@apache.org>
Authored: Fri Mar 22 08:49:29 2013 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Fri Mar 22 08:49:29 2013 -0700
----------------------------------------------------------------------
.../CordovaFramework/Classes/CDVViewController.h | 1 +
.../CordovaFramework/Classes/CDVViewController.m | 18 ++++++++++++++-
2 files changed, 18 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/a9794ce4/CordovaFramework/CordovaFramework/Classes/CDVViewController.h
----------------------------------------------------------------------
diff --git a/CordovaFramework/CordovaFramework/Classes/CDVViewController.h b/CordovaFramework/CordovaFramework/Classes/CDVViewController.h
index 490b1ee..cdd3bfd 100644
--- a/CordovaFramework/CordovaFramework/Classes/CDVViewController.h
+++ b/CordovaFramework/CordovaFramework/Classes/CDVViewController.h
@@ -53,5 +53,6 @@
- (id)getCommandInstance:(NSString*)pluginName;
- (void)registerPlugin:(CDVPlugin*)plugin withClassName:(NSString*)className;
+- (void)registerPlugin:(CDVPlugin*)plugin withPluginName:(NSString*)pluginName;
@end
http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/a9794ce4/CordovaFramework/CordovaFramework/Classes/CDVViewController.m
----------------------------------------------------------------------
diff --git a/CordovaFramework/CordovaFramework/Classes/CDVViewController.m b/CordovaFramework/CordovaFramework/Classes/CDVViewController.m
index 5324871..0321d18 100644
--- a/CordovaFramework/CordovaFramework/Classes/CDVViewController.m
+++ b/CordovaFramework/CordovaFramework/Classes/CDVViewController.m
@@ -112,7 +112,7 @@
NSString* path = [[NSBundle mainBundle] pathForResource:@"config" ofType:@"xml"];
if (![[NSFileManager defaultManager] fileExistsAtPath:path]) {
- NSAssert(NO, @"ERROR: config.xml does not exist. Please run cordova-ios/bin/cordova_plist_to_config_xml path/to/project.");
+ NSAssert(NO, @"ERROR: config.xml does not exist.");
return;
}
@@ -156,6 +156,22 @@
[plugin pluginInitialize];
}
+- (void)registerPlugin:(CDVPlugin*)plugin withPluginName:(NSString*)pluginName
+{
+ if ([plugin respondsToSelector:@selector(setViewController:)]) {
+ [plugin setViewController:self];
+ }
+
+ if ([plugin respondsToSelector:@selector(setCommandDelegate:)]) {
+ [plugin setCommandDelegate:_commandDelegate];
+ }
+
+ NSString* className = NSStringFromClass([plugin class]);
+ [self.pluginObjects setObject:plugin forKey:className];
+ [self.pluginsMap setValue:className forKey:[pluginName lowercaseString]];
+ [plugin pluginInitialize];
+}
+
/**
Returns an instance of a CordovaCommand object, based on its name. If one exists already, it is returned.
*/