Merge branch 'master' of github.com:wizcorp/phonegap-facebook-plugin

Wizcorp · Aug 25, 2014 · 26c2755 · 26c2755
2 parents 88fdab7 + 45f1c78
commit 26c2755
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ PhoneGap Build documentation available [here] (https://build.phonegap.com/plugin
 
 ### Login
 
-`facebookConnectPlugin.login(Function success, Function failure)`
+`facebookConnectPlugin.login(Array strings of permissions, Function success, Function failure)`
 
 **NOTE** : Developers should call `facebookConnectPlugin.browserInit(<appId>)` before login - **Web App ONLY** (see [Web App Guide](platforms/web/README.md))
 

diff --git a/platforms/android/README.md b/platforms/android/README.md
@@ -54,12 +54,9 @@ Follow the steps below:
 
 	cordova -d plugin add https://github.com/phonegap/phonegap-facebook-plugin.git --variable APP_ID="123456789" --variable APP_NAME="myApplication"
 
-	// add FacebookLib
-	echo "android.library.reference.2=FacebookLib" >> platforms/android/project.properties
+	android update project --subprojects --path "platforms/android" --target android-19 --library "CordovaLib"
 
-	cp platforms/android/local.properties platforms/android/FacebookLib
-
-	android update project -p platforms/android/
+	android update project --subprojects --path "platforms/android" --target android-19 --library "FacebookLib"
 
 	cd platforms/android/
 

diff --git a/plugin.xml b/plugin.xml
@@ -2,7 +2,7 @@
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="com.phonegap.plugins.facebookconnect"
-    version="0.7.0">
+    version="0.7.1">
 
     <name>Facebook Connect</name>
 

diff --git a/www/js/facebookConnectPlugin.js b/www/js/facebookConnectPlugin.js
@@ -167,11 +167,13 @@ if (!window.cordova) {
 
     // Bake in the JS SDK
     (function () {
-        console.log("launching FB SDK")
-        var e = document.createElement('script');
-        e.src = document.location.protocol + '//connect.facebook.net/en_US/sdk.js';
-        e.async = true;
-        document.getElementById('fb-root').appendChild(e);
+        if (!window.FB) {
+            console.log("launching FB SDK")
+            var e = document.createElement('script');
+            e.src = document.location.protocol + '//connect.facebook.net/en_US/sdk.js';
+            e.async = true;
+            document.getElementById('fb-root').appendChild(e);
+        }
     }());
 
 }