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

feat(modal): $broadcast 'modal.shown/hidden/removed' from parent scope

Browse Source 
Closes #243
This commit is contained in:
Andy Joslin
2014-02-13 14:40:54 -05:00
parent 0c52fd2673
commit 110ff9f475
2 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
js/ext/angular/src/service/ionicModal.js vendored
View File

@@ -26,7 +26,7 @@ angular.module('ionic.service.modal', ['ionic.service.templateLoad', 'ionic.serv
_this.hide();
};
_this.scope.$on('$destroy', function() {
self.scope.$on('$destroy', function() {
$ionicPlatform.offHardwareBackButton(onHardwareBackButton);
});
@@ -36,6 +36,8 @@ angular.module('ionic.service.modal', ['ionic.service.templateLoad', 'ionic.serv
this.didInitEvents = true;
}
this.scope.$parent.$broadcast('modal.shown', this);
},
// Hide the modal
hide: function() {
@@ -43,6 +45,8 @@ angular.module('ionic.service.modal', ['ionic.service.templateLoad', 'ionic.serv
$animate.removeClass(element, this.animation);
ionic.views.Modal.prototype.hide.call(this);
this.scope.$parent.$broadcast('modal.hidden', this);
},
// Remove and destroy the modal scope
@@ -50,6 +54,7 @@ angular.module('ionic.service.modal', ['ionic.service.templateLoad', 'ionic.serv
var self = this,
element = angular.element(this.el);
$animate.leave(angular.element(this.el), function() {
self.scope.$parent.$broadcast('modal.removed', self);
self.scope.$destroy();
});
}
@@ -80,7 +85,7 @@ angular.module('ionic.service.modal', ['ionic.service.templateLoad', 'ionic.serv
/**
* Load a modal with the given template string.
*
* A new isolated scope will be created for the
* A new isolated scope will be created for the
* modal and the new element will be appended into the body.
*/
fromTemplate: function(templateString, options) {

31
js/ext/angular/test/service/ionicModal.unit.js
View File

@@ -54,4 +54,35 @@ describe('Ionic Modal', function() {
expect(modalInstance.el.classList.contains('active')).toBe(false);
});
it('should broadcast "modal.shown" on show', function() {
var template = '<div class="modal"></div>';
var m = modal.fromTemplate(template, {});
spyOn(m.scope.$parent, '$broadcast');
m.show();
expect(m.scope.$parent.$broadcast).toHaveBeenCalledWith('modal.shown', m);
});
it('should broadcast "modal.hidden" on hide', function() {
var template = '<div class="modal"></div>';
var m = modal.fromTemplate(template, {});
spyOn(m.scope.$parent, '$broadcast');
m.hide();
expect(m.scope.$parent.$broadcast).toHaveBeenCalledWith('modal.hidden', m);
});
it('should broadcast "modal.removed" on remove', inject(function($animate) {
var template = '<div class="modal"></div>';
var m = modal.fromTemplate(template, {});
var broadcastedModal;
var done = false;
//By the time m.remove() is done, our scope will be destroyed. so we have to save the modal
//it gives us
spyOn(m.scope.$parent, '$broadcast').andCallFake(function(e, modal) {
broadcastedModal = modal;
});
spyOn($animate, 'leave').andCallFake(function(el, cb) { cb(); });
m.remove();
expect(broadcastedModal).toBe(m);
}));
});