Merge pull request #4622 from ewdl/fix-popover-override

Prevent the popover options to be overwritten (fix #3173)
ionic-team · Dec 6, 2015 · dbd0d24 · dbd0d24
2 parents 4d8069b + 44460d7
commit dbd0d24
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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));
     }
   };