Merge pull request phonegap#1198 from gailees/master

Updated ClipboardPlugin for use with Cordova 2.0+
FerryT · Sep 2, 2013 · cbde5ad · cbde5ad
2 parents 4bf58f8 + f320168
commit cbde5ad
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 21 deletions.
diff --git a/iPhone/ClipboardPlugin/ClipboardPlugin.h b/iPhone/ClipboardPlugin/ClipboardPlugin.h
@@ -6,13 +6,9 @@
 //
 
 #import <Foundation/Foundation.h>
-#ifdef PHONEGAP_FRAMEWORK
-#import <PhoneGap/PGPlugin.h>
-#else
-#import "PGPlugin.h"
-#endif
+#import <Cordova/CDVPlugin.h>
 
-@interface ClipboardPlugin : PGPlugin{ }
+@interface ClipboardPlugin : CDVPlugin{ }
 
 -(void)setText:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options;
 

diff --git a/iPhone/ClipboardPlugin/ClipboardPlugin.m b/iPhone/ClipboardPlugin/ClipboardPlugin.m
@@ -6,14 +6,10 @@
 //
 
 #import <Foundation/Foundation.h>
-#ifdef PHONEGAP_FRAMEWORK
-#import <PhoneGap/PGPlugin.h>
-#import <PhoneGap/PluginResult.h>
-#else
-#import "PGPlugin.h"
-#import "PluginResult.h"
-#endif
+#import <Cordova/CDVPlugin.h>
+#import <Cordova/CDVPluginResult.h>
 #import "ClipboardPlugin.h"
+#import <Cordova/JSONKit.h>
 
 @implementation ClipboardPlugin
 
@@ -30,8 +26,9 @@ -(void)getText:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options
 
 	NSString *text = [pasteboard valueForPasteboardType:@"public.text"];
 
-    PluginResult* pluginResult = [PluginResult resultWithStatus:PGCommandStatus_OK messageAsString:text];
-
+    CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVPluginCommandStatus_OK messageAsString:text];
+    //PluginResult* pluginResult = [PluginResult resultWithStatus:PluginCommandStatus_OK messageAsString:text];
+
     [self writeJavascript: [pluginResult toSuccessCallbackString:callbackID]];
 }
 

diff --git a/iPhone/ClipboardPlugin/clipboardPlugin.js b/iPhone/ClipboardPlugin/clipboardPlugin.js
@@ -11,7 +11,7 @@ function ClipboardPlugin(){ }
  * @param {String} text The new clipboard content
  */
 ClipboardPlugin.prototype.setText = function(text) {
-	PhoneGap.exec("ClipboardPlugin.setText", text);
+	Cordova.exec("ClipboardPlugin.setText", text);
 }
 
 /**
@@ -20,13 +20,10 @@ ClipboardPlugin.prototype.setText = function(text) {
  * @param {String} text The new clipboard content
  */
 ClipboardPlugin.prototype.getText = function(callback) {
-	PhoneGap.exec(callback, null, "ClipboardPlugin", "getText", []);
+	Cordova.exec(callback, null, "ClipboardPlugin", "getText", []);
 }
 
 /**
  * Register the plugin with PhoneGap
  */
-PhoneGap.addConstructor(function() {
-	if(!window.plugins) window.plugins = {};
-	window.plugins.clipboardPlugin = new ClipboardPlugin();
-});
+window.clipboardPlugin = new ClipboardPlugin();