Merge fixes

Author: Lukas Narusevicius

README.md

@@ -348,7 +348,7 @@ If the Messenger app is not installed, the Send button will be hidden. Be sure t
 
 ### Show Share Dialog Programmatically
 
-**Note** The share dialog will try fallback to browse page sharing if user doesn't have Facebook installed (only for linkContent) 
+**Note** The share dialog will try fallback to browse page sharing if user doesn't have Facebook installed (only for linkContent)
 
 ```TypeScript
 showShareDialog(this.linkContent);

demo-angular/app/pages/home/home.component.ts

@@ -34,6 +34,8 @@ export class HomeComponent {
         }, function (err) {
             alert("Error getting user info: " + err);
         });
+
+        Facebook.initAnalytics();
     }
 
     onLogout(eventData: Facebook.LoginEventData) {

demo-angular/app/pages/login/login.component.ts

@@ -34,6 +34,7 @@ export class LoginComponent {
         this.canShowPhotosShareDialog = Facebook.canShareDialogShow(this.photosContent);
         this.canShowLinksMessageDialog = Facebook.canMessageDialogShow(this.linkContent);
         this.canShowGenericMessageDialog = Facebook.canMessageDialogShow(this.genericContent);
+        Facebook.initAnalytics();
     }
 
     onLogin(eventData: Facebook.LoginEventData) {

src/app-events.android.ts

@@ -1,6 +1,6 @@
-var application = require("tns-core-modules/application");
-var androidApplication;
-var appEventsLogger;
+let application = require("tns-core-modules/application");
+let androidApplication;
+let appEventsLogger;
 export function initAnalytics() {
     androidApplication = application.android;
     appEventsLogger = com.facebook.appevents.AppEventsLogger.newLogger(androidApplication.context.getApplicationContext());
@@ -10,17 +10,16 @@ export function logEvent(name: string, parameters?: any) {
     if (name === undefined) {
         throw ("Argument 'key' is missing");
     }
-    
+
     const bundle = new android.os.Bundle();
 
     if (parameters !== undefined) {
-        for (var p in parameters) {
-            var param = parameters[p];
+        for (let p in parameters) {
+            let param = parameters[p];
             if (param.value !== undefined) {
                 bundle.putString(param.key, param.value);
             }
         }
     }
-    
     appEventsLogger.logEvent(name, bundle);
 }

src/app-events.ios.ts

@@ -1,6 +1,6 @@
-var application = require("tns-core-modules/application");
-var iosApplication;
-var appEventsLogger;
+let application = require("tns-core-modules/application");
+let iosApplication;
+let appEventsLogger;
 export function initAnalytics() {
     iosApplication = application.iosApplication;
     FBSDKAppEvents.activateApp();
@@ -18,7 +18,7 @@ export function logEvent(name: string, parameters?: any) {
             parameters.map(parameter => parameter.value),
             parameters.map(parameter => parameter.key));
         console.log(parametersDictionary);
-    
-        FBSDKAppEvents.logEventParameters(name, parametersDictionary)
+
+        FBSDKAppEvents.logEventParameters(name, parametersDictionary);
     }
 }