amend($ionicModal): if hardwareBackButtonClose false, back button is …

…noop Addresses #1397
ionic-team · Jun 5, 2014 · 9942045 · 9942045
1 parent 53af788
commit 9942045
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/js/angular/service/modal.js b/js/angular/service/modal.js
@@ -128,12 +128,10 @@ function($rootScope, $document, $compile, $timeout, $ionicPlatform, $ionicTempla
              .removeClass('ng-leave ng-leave-active');
 
       self._isShown = true;
-      self._deregisterBackButton = self.hardwareBackButtonClose ?
-        $ionicPlatform.registerBackButtonAction(
-          angular.bind(self, self.hide),
-          PLATFORM_BACK_BUTTON_PRIORITY_MODAL
-        ) :
-        angular.noop;
+      self._deregisterBackButton = $ionicPlatform.registerBackButtonAction(
+        self.hardwareBackButtonClose ? angular.bind(self, self.hide) : angular.noop,
+        PLATFORM_BACK_BUTTON_PRIORITY_MODAL
+      );
 
       self._isOpenPromise = $q.defer();
 

diff --git a/test/unit/angular/directive/gestures.js b/test/unit/angular/directive/gestures.js
diff --git a/test/unit/angular/service/modal.unit.js b/test/unit/angular/service/modal.unit.js
@@ -106,10 +106,14 @@ describe('Ionic Modal', function() {
     var instance = modal.fromTemplate(template, {
       hardwareBackButtonClose: false
     });
-    spyOn($ionicPlatform, 'registerBackButtonAction');
+    spyOn($ionicPlatform, 'registerBackButtonAction').andCallThrough();
     instance.show();
     timeout.flush();
-    expect($ionicPlatform.registerBackButtonAction).not.toHaveBeenCalled();
+    expect($ionicPlatform.registerBackButtonAction).toHaveBeenCalledWith(jasmine.any(Function), PLATFORM_BACK_BUTTON_PRIORITY_MODAL);
+
+    ionicPlatform.hardwareBackButtonClick();
+
+    expect(instance.isShown()).toBe(true);
   }));
 
   it('should call _deregisterBackButton on hide', function() {