javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(popover): extend options to modal service

Browse Source 
Closes #2724
This commit is contained in:
Adam Bradley
2014-12-15 09:40:58 -06:00
parent 69c733a7cb
commit 71cb2023dc
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/angular/service/popover.js vendored
View File

@@ -212,8 +212,8 @@ function($ionicModal, $ionicPosition, $document, $window) {
* @returns {promise} A promise that will be resolved with an instance of
* an {@link ionic.controller:ionicPopover} controller (ionicPopover is built on top of $ionicPopover).
*/
fromTemplateUrl: function(url, options, _) {
return $ionicModal.fromTemplateUrl(url, options, ionic.Utils.extend(POPOVER_OPTIONS, options || {}));
fromTemplateUrl: function(url, options) {
return $ionicModal.fromTemplateUrl(url, ionic.Utils.extend(POPOVER_OPTIONS, options || {}));
}
};

2
test/unit/angular/service/popover.unit.js
View File

@@ -36,7 +36,7 @@ describe('Ionic Popover', function() {
var done = false;
var instance = popover.fromTemplateUrl('popover.html', function(instance) {
popover.fromTemplateUrl('popover.html').then(function(instance) {
done = true;
instance.show();
expect(instance.el.classList.contains('popover-backdrop')).toBe(true);