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

Fixed duplicate backbutton hardware event

Browse Source
This commit is contained in:
Max Lynch
2014-01-13 15:47:16 -06:00
parent fc890ea1c5
commit 72c97e8fce
3 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
dist/js/ionic-angular.js vendored
View File

@@ -310,7 +310,7 @@ angular.module('ionic.service.loading', ['ionic.ui.loading'])
angular.module('ionic.service.modal', ['ionic.service.templateLoad', 'ionic.service.platform', 'ngAnimate'])
.factory('$ionicModal', ['$rootScope', '$document', '$compile', '$animate', '$q', '$ionicPlatform', '$ionicTemplateLoader', function($rootScope, $document, $compile, $animate, $q, $ionicPlatform, $ionicTemplateLoader) {
.factory('$ionicModal', ['$rootScope', '$document', '$compile', '$animate', '$q', '$timeout', '$ionicPlatform', '$ionicTemplateLoader', function($rootScope, $document, $compile, $animate, $q, $timeout, $ionicPlatform, $ionicTemplateLoader) {
var ModalView = ionic.views.Modal.inherit({
initialize: function(opts) {
ionic.views.Modal.prototype.initialize.call(this, opts);
@@ -330,16 +330,20 @@ angular.module('ionic.service.modal', ['ionic.service.templateLoad', 'ionic.serv
});
}
var onHardwareBackButton = function() {
_this.hide();
};
if(!this.didInitEvents) {
var onHardwareBackButton = function() {
_this.hide();
};
_this.scope.$on('$destroy', function() {
$ionicPlatform.offHardwareBackButton(onHardwareBackButton);
});
_this.scope.$on('$destroy', function() {
$ionicPlatform.offHardwareBackButton(onHardwareBackButton);
});
// Support Android back button to close
$ionicPlatform.onHardwareBackButton(onHardwareBackButton);
// Support Android back button to close
$ionicPlatform.onHardwareBackButton(onHardwareBackButton);
this.didInitEvents = true;
}
},
// Hide the modal
@@ -1233,12 +1237,7 @@ angular.module('ionic.ui.content', ['ionic.ui.service'])
if(attr.hasSubheader == "true") { element.addClass('has-subheader'); }
if(attr.hasFooter == "true") { element.addClass('has-footer'); }
if(attr.hasTabs == "true") { element.addClass('has-tabs'); }
if(attr.padding == "true") {
var scroll = element.find('.scroll');
if(scroll.length) {
scroll.addClass('padding');
}
}
if(attr.padding == "true") { element.find('.scroll').addClass('padding'); }
return function link($scope, $element, $attr) {
var clone, sc, sv,

2
dist/js/ionic-angular.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@@ -1,7 +1,7 @@
angular.module('ionic.service.modal', ['ionic.service.templateLoad', 'ionic.service.platform', 'ngAnimate'])
.factory('$ionicModal', ['$rootScope', '$document', '$compile', '$animate', '$q', '$ionicPlatform', '$ionicTemplateLoader', function($rootScope, $document, $compile, $animate, $q, $ionicPlatform, $ionicTemplateLoader) {
.factory('$ionicModal', ['$rootScope', '$document', '$compile', '$animate', '$q', '$timeout', '$ionicPlatform', '$ionicTemplateLoader', function($rootScope, $document, $compile, $animate, $q, $timeout, $ionicPlatform, $ionicTemplateLoader) {
var ModalView = ionic.views.Modal.inherit({
initialize: function(opts) {
ionic.views.Modal.prototype.initialize.call(this, opts);
@@ -21,16 +21,20 @@ angular.module('ionic.service.modal', ['ionic.service.templateLoad', 'ionic.serv
});
}
var onHardwareBackButton = function() {
_this.hide();
};
if(!this.didInitEvents) {
var onHardwareBackButton = function() {
_this.hide();
};
_this.scope.$on('$destroy', function() {
$ionicPlatform.offHardwareBackButton(onHardwareBackButton);
});
_this.scope.$on('$destroy', function() {
$ionicPlatform.offHardwareBackButton(onHardwareBackButton);
});
// Support Android back button to close
$ionicPlatform.onHardwareBackButton(onHardwareBackButton);
// Support Android back button to close
$ionicPlatform.onHardwareBackButton(onHardwareBackButton);
this.didInitEvents = true;
}
},
// Hide the modal