fix(navClear): be sure it runs before ngClick

Closes #1047
ionic-team · Apr 4, 2014 · 4f47bf2 · 4f47bf2
1 parent 3ee5ea7
commit 4f47bf2
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 7 deletions.
diff --git a/js/ext/angular/src/directive/ionicViewState.js b/js/ext/angular/src/directive/ionicViewState.js
@@ -298,16 +298,25 @@ angular.module('ionic.ui.viewState', ['ionic.service.view', 'ionic.service.gestu
  * <a nav-clear menu-close href="#/home" class="item">Home</a>
  * ```
  */
-.directive('navClear', ['$ionicViewService', function($ionicViewService) {
+.directive('navClear', [
+  '$ionicViewService',
+  '$location',
+  '$timeout',
+function($ionicViewService, $location, $timeout) {
   return {
+    priority: Number.MAX_VALUE,
     restrict: 'AC',
-    link: function($scope, $element, $attr) {
-      $element.bind('click', function(){
-        $ionicViewService.nextViewOptions({
-          disableAnimate: true,
-          disableBack: true
+    compile: function($element) {
+      return { pre: prelink };
+
+      function prelink($scope, $element) {
+        $element.on('click', function(e){
+          $ionicViewService.nextViewOptions({
+            disableAnimate: true,
+            disableBack: true
+          });
         });
-      });
+      }
     }
   };
 }]);

diff --git a/js/ext/angular/test/directive/ionicNavClear.unit.js b/js/ext/angular/test/directive/ionicNavClear.unit.js
@@ -0,0 +1,28 @@
+describe('navClear directive', function() {
+  beforeEach(module('ionic'));
+  it('should call nextViewOptions on click', inject(function($rootScope, $compile, $ionicViewService) {
+    spyOn($ionicViewService, 'nextViewOptions');
+    var el = $compile('<div nav-clear>')($rootScope.$new());
+    expect($ionicViewService.nextViewOptions).not.toHaveBeenCalled();
+    el.triggerHandler('click');
+    expect($ionicViewService.nextViewOptions).toHaveBeenCalled();
+    expect($ionicViewService.nextViewOptions.mostRecentCall.args[0]).toEqual({
+      disableAnimate: true,
+      disableBack: true
+    });
+  }));
+
+  it('should run its click action before ngClick', inject(function($rootScope, $compile, $ionicViewService) {
+    spyOn($ionicViewService, 'nextViewOptions');
+    var el = $compile('<div nav-clear ng-click="method()">')($rootScope.$new());
+    var done = false;
+
+    //navClear should've called nextViewOptions by the time the ngClick handler runs
+    el.scope().method = function() {
+      expect($ionicViewService.nextViewOptions).toHaveBeenCalled();
+      done = true;
+    };
+    el.triggerHandler('click');
+    expect(done).toBe(true);
+  }));
+});