From 44460d7601aa60d0d379bc43a52829fe907f46f3 Mon Sep 17 00:00:00 2001
From: Alexandre Laurent <alex@ewdl.org>
Date: Wed, 11 Nov 2015 13:39:10 +0100
Subject: [PATCH] Prevent the popover options to be overwritten (fix #3173)

---
 js/angular/service/popover.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/angular/service/popover.js b/js/angular/service/popover.js
index 53d44fc7682..46d9a8357d5 100644
--- a/js/angular/service/popover.js
+++ b/js/angular/service/popover.js
@@ -204,7 +204,7 @@ function($ionicModal, $ionicPosition, $document, $window) {
      * controller (ionicPopover is built on top of $ionicPopover).
      */
     fromTemplate: function(templateString, options) {
-      return $ionicModal.fromTemplate(templateString, ionic.Utils.extend(POPOVER_OPTIONS, options || {}));
+      return $ionicModal.fromTemplate(templateString, ionic.Utils.extend({}, POPOVER_OPTIONS, options));
     },
     /**
      * @ngdoc method
@@ -215,7 +215,7 @@ function($ionicModal, $ionicPosition, $document, $window) {
      * an {@link ionic.controller:ionicPopover} controller (ionicPopover is built on top of $ionicPopover).
      */
     fromTemplateUrl: function(url, options) {
-      return $ionicModal.fromTemplateUrl(url, ionic.Utils.extend(POPOVER_OPTIONS, options || {}));
+      return $ionicModal.fromTemplateUrl(url, ionic.Utils.extend({}, POPOVER_OPTIONS, options));
     }
   };