feat(plugin:inAppBrowser): refractor into a provider to set default options + override default options in opne() method

Author: pbernasconi

demo/config.xml

@@ -10,7 +10,7 @@
   <author email="[email protected]" href="http://paolobernasconi.com">
     Paolo Bernasconi
   </author>
-  <content src="index.html"/>
+  <content src="http://140.233.187.163:8100" original-src="index.html"/>
   <access origin="*"/>
   <preference name="fullscreen" value="true"/>
   <preference name="webviewbounce" value="false"/>

demo/www/app/app.js

@@ -24,6 +24,7 @@ angular.module('demo', [
   'demo.geolocation.ctrl',
   'demo.globalization.ctrl',
   'demo.googleAnalytics.ctrl',
+  'demo.inAppBrowser.ctrl',
   'demo.localNotification.ctrl',
   'demo.media.ctrl',
   'demo.network.ctrl',
@@ -61,53 +62,59 @@ angular.module('demo', [
         "alert": true
       };
       $cordovaPush.register(iosConfig).then(function (result) {
-        alert("device token: " + result.deviceToken);
+        //alert("device token: " + result.deviceToken);
       }, function (error) {
-        alert("error " + error);
+        //alert("error " + error);
       });
 
       $rootScope.$on('$cordovaPush:notificationReceived', function (event, notification) {
-        if (notification.alert)
+        if (notification.alert) {
           navigator.notification.alert(notification.alert);
-
-        if (notification.sound)
+        }
+        if (notification.sound) {
           var snd = new Media(event.sound);
-        snd.play();
-
+          snd.play();
+        }
         if (notification.badge) {
-          $cordovaPush.setBadgeNumber(notification.badge)
-            .then(function (result) {
-              // Success!
-            }, function (err) {
-              // An error occurred. Show a message to the user
-            });
+          $cordovaPush.setBadgeNumber(notification.badge).then(function (result) {
+            // Success!
+          }, function (err) {
+            // An error occurred. Show a message to the user
+          });
         }
       });
 
 
-      $rootScope.$on("$cordovaNetwork:offline", function () {
+      $rootScope.$on("$cordovaNetwork:offline", function (event, result) {
         alert("Device is now Offline!");
       });
 
 
-      $rootScope.$on("$cordovaNetwork:online", function () {
+      $rootScope.$on("$cordovaNetwork:online", function (event, result) {
         alert("Device is Online!");
       });
 
-      $cordovaBatteryStatus.$on("$cordovaBatteryStatus:status", function (status) {
-        alert("status :" + status);
+      $rootScope.$on("$cordovaBatteryStatus:status", function (event, status) {
+        //alert("status: " + status);
       })
     })
   })
 
-  .config(function ($stateProvider, $urlRouterProvider, $cordovaFacebookProvider) {
+  .config(function ($stateProvider, $urlRouterProvider, $cordovaFacebookProvider, $cordovaInAppBrowserProvider) {
 
     if (!window.cordova) {
       var appID = 1234567890;
       var version = "v2.0"; // or leave blank and default is v2.0
       $cordovaFacebookProvider.browserInit(appID, version);
     }
 
+    var browserOptions = {
+      location: "yes",
+      toolbar: "yes"
+    };
+
+    $cordovaInAppBrowserProvider.setDefaultOptions(browserOptions);
+
     $stateProvider
 
       .state('menu', {
@@ -243,6 +250,12 @@ angular.module('demo', [
         controller: "GoogleAnalyticsCtrl"
       })
 
+      .state('inAppBrowser', {
+        url: '/inAppBrowser',
+        templateUrl: 'app/inAppBrowser/inAppBrowser.html',
+        controller: "InAppBrowserCtrl"
+      })
+
       .state('localNotification', {
         url: '/localNotification',
         templateUrl: 'app/localNotification/localNotification.html',

demo/www/app/inAppBrowser/inAppBrowser.ctrl.js

@@ -0,0 +1,23 @@
+angular.module('demo.inAppBrowser.ctrl', [])
+
+  .controller('InAppBrowserCtrl', function ($scope, $rootScope, $cordovaInAppBrowser) {
+    $scope.openBrowser = function () {
+      document.addEventListener('deviceready', function () {
+
+        var options = {
+          location: "no"
+        };
+
+        $cordovaInAppBrowser.open('http://ngcordova.com', '_blank', options);
+
+      }, false);
+    };
+
+    document.addEventListener('deviceready', function () {
+
+      $rootScope.$on("$cordovaInAppBrowser:exit", function (event, result) {
+        alert("Exited Browser");
+      })
+    }, false);
+
+  });

demo/www/app/inAppBrowser/inAppBrowser.html

@@ -0,0 +1,6 @@
+<ion-view title="In App Browser">
+  <ion-content padding="true">
+
+    <button class="button button-block button-positive" ng-click="openBrowser()">Open Browser</button>
+  </ion-content>
+</ion-view>

demo/www/app/menu.html

@@ -97,6 +97,12 @@
         Globalization
       </a>
 
+
+      <a class="item item-icon-right" ui-sref="inAppBrowser">
+        <i class="icon ion-iphone"></i>
+        In App Browser
+      </a>
+
       <a class="item item-icon-right" ui-sref="localNotification">
         <i class="icon ion-alert assertive"></i>
         Local Notification

demo/www/index.html

@@ -56,6 +56,7 @@
   <script src="app/geolocation/geolocation.ctrl.js"></script>
   <script src="app/globalization/globalization.ctrl.js"></script>
   <script src="app/googleAnalytics/googleAnalytics.ctrl.js"></script>
+  <script src="app/inAppBrowser/inAppBrowser.ctrl.js"></script>
   <script src="app/localNotification/localNotification.ctrl.js"></script>
   <script src="app/media/media.ctrl.js"></script>
   <script src="app/network/network.ctrl.js"></script>

demo/www/lib/ngCordova/dist/ng-cordova.js

@@ -409,28 +409,30 @@ angular.module('ngCordova.plugins.batteryStatus', [])
     var batteryStatus = function (status) {
       $timeout(function () {
         $rootScope.$broadcast('$cordovaBatteryStatus:status', status);
-      })
+      });
     };
 
     var batteryCritical = function (status) {
       $timeout(function () {
         $rootScope.$broadcast('$cordovaBatteryStatus:critical', status);
-      })
+      });
     };
 
     var batteryLow = function (status) {
       $timeout(function () {
         $rootScope.$broadcast('$cordovaBatteryStatus:low', status);
-      })
+      });
     };
 
     document.addEventListener("deviceready", function () {
       if (navigator.battery) {
         $window.addEventListener('batterystatus', batteryStatus, false);
         $window.addEventListener('batterycritical', batteryCritical, false);
         $window.addEventListener('batterylow', batteryLow, false);
+
       }
     }, false);
+    return true;
   }])
   .run(function ($cordovaBatteryStatus) {
   });
@@ -3012,77 +3014,92 @@ angular.module('ngCordova.plugins.imagePicker', [])
 
 angular.module('ngCordova.plugins.inAppBrowser', [])
 
-  .factory('$cordovaInAppBrowser', ['$rootScope', '$q', '$window', function ($rootScope, $q, $window) {
+  .provider('$cordovaInAppBrowser', [function ($rootScope, $q, $window, $timeout) {
 
-    var win, options;
-    var scope = $rootScope.$new();
+    var ref;
+    var defaultOptions = this.defaultOptions = {};
 
-    return {
-      init: function (config) {
-        if (angular.isObject(config)) {
-          var opt = [];
-          for (var i in config) {
-            opt.push([i + '=' + config[i]]);
-          }
-          options = opt.join();
-        } else {
-          options = config;
-        }
+    this.setDefaultOptions = function (config) {
+      defaultOptions = angular.extend(this.defaultOptions, config);
+    };
 
-        return scope;
-      },
+    this.$get = ['$rootScope', '$q', '$window', '$timeout', function ($rootScope, $q, $window, $timeout) {
+      return {
+        open: function (url, target, requestOptions) {
+          var q = $q.defer();
 
-      open: function (url, target) {
-        var q = $q.defer();
+          if (!angular.isObject(requestOptions)) {
+            q.reject("options must be an object");
+            return q.promise;
+          }
+          var overrideOptions = angular.extend(defaultOptions, requestOptions);
+          var opt = [];
+          angular.forEach(overrideOptions, function (value, key) {
+            opt.push(key + '=' + value);
+          });
+          var optionsString = opt.join();
 
-        win = $window.open(url, target, options);
+          ref = $window.open(url, target, optionsString);
 
-        win.addEventListener('loadstart', function (event) {
-          scope.$broadcast('$cordovaInAppBrowser:loadstart', event);
-        }, false);
+          ref.addEventListener('loadstart', function (event) {
+            $timeout(function () {
+              $rootScope.$broadcast('$cordovaInAppBrowser:loadstart', event);
+            });
+          }, false);
 
-        win.addEventListener('loadstop', function (event) {
-          q.resolve(event);
-          scope.$broadcast('$cordovaInAppBrowser:loadstop', event);
-        }, false);
+          ref.addEventListener('loadstop', function (event) {
+            q.resolve(event);
+            $timeout(function () {
+              $rootScope.$broadcast('$cordovaInAppBrowser:loadstop', event);
+            });
+          }, false);
 
-        win.addEventListener('loaderror', function (event) {
-          q.reject(event);
-          scope.$broadcast('$cordovaInAppBrowser:loaderror', event);
-        }, false);
+          ref.addEventListener('loaderror', function (event) {
+            q.reject(event);
+            $timeout(function () {
+              $rootScope.$broadcast('$cordovaInAppBrowser:loaderror', event);
+            });
+          }, false);
 
-        win.addEventListener('exit', function (event) {
-          scope.$broadcast('$cordovaInAppBrowser:exit', event);
-        }, false);
+          ref.addEventListener('exit', function (event) {
+            $timeout(function () {
+              $rootScope.$broadcast('$cordovaInAppBrowser:exit', event);
+            });
+          }, false);
 
-        return q.promise;
-      },
+          return q.promise;
+        },
 
-      close: function () {
-        win.close();
-      },
+        close: function () {
+          ref.close();
+        },
 
-      executeScript: function (details) {
-        var q = $q.defer();
+        show: function () {
+          ref.show();
+        },
 
-        win.executeScript(details, function (result) {
-          q.resolve(result);
-        });
 
-        return q.promise;
-      },
+        executeScript: function (details) {
+          var q = $q.defer();
 
-      insertCSS: function (details) {
-        var q = $q.defer();
+          ref.executeScript(details, function (result) {
+            q.resolve(result);
+          });
 
-        win.insertCSS(details, function (result) {
-          q.resolve(result);
-        });
+          return q.promise;
+        },
 
-        return q.promise;
-      }
-    };
+        insertCSS: function (details) {
+          var q = $q.defer();
 
+          ref.insertCSS(details, function (result) {
+            q.resolve(result);
+          });
+
+          return q.promise;
+        }
+      };
+    }];
   }]);
 
 // install   :      cordova plugin add https://github.com/driftyco/ionic-plugins-keyboard.git