diff --git a/circle.yml b/circle.yml index e02df9fb7..4ba3e26e4 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,6 @@ machine: node: - version: 4.1.0 + version: 6.9.4 ruby: version: 2.1.2 checkout: diff --git a/config/build.config.js b/config/build.config.js index 405f25f4b..e7250cd2b 100644 --- a/config/build.config.js +++ b/config/build.config.js @@ -48,7 +48,6 @@ module.exports = { 'js/utils/tap.js', 'js/utils/activator.js', 'js/utils/utils.js', - 'js/utils/list.js', 'js/utils/keyboard.js', 'js/utils/viewport.js', diff --git a/js/utils/tap.js b/js/utils/tap.js index cf31d7f2c..c22fee41e 100644 --- a/js/utils/tap.js +++ b/js/utils/tap.js @@ -486,7 +486,7 @@ function tapIgnoreEvent(e) { return true; } - if(e.target.tagName == 'SELECT') { + if(e.target && e.target.tagName == 'SELECT') { return true; } diff --git a/package.json b/package.json index fb0aac886..5cb1f4a2e 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "url": "git://github.com/ionic-team/ionic.git" }, "devDependencies": { + "bower": "^1.8.0", "canonical-path": "0.0.2", "chalk": "^0.4.0", "connect": "^2.13.0", diff --git a/test/unit/angular/controller/sideMenuController.unit.js b/test/unit/angular/controller/sideMenuController.unit.js index 039f5605c..430f57383 100644 --- a/test/unit/angular/controller/sideMenuController.unit.js +++ b/test/unit/angular/controller/sideMenuController.unit.js @@ -38,12 +38,12 @@ describe('$ionicSideMenus controller', function() { }, {})); angular.extend(ctrl, {}); ctrl.left = new ionic.views.SideMenu({ - width: 270, + width: 272, el: document.createElement('div'), isEnabled: true }); ctrl.right = new ionic.views.SideMenu({ - width: 270, + width: 272, el: document.createElement('div'), isEnabled: true }); @@ -71,8 +71,8 @@ describe('$ionicSideMenus controller', function() { // Menu widths it('should init widths', function() { - expect(ctrl.left.width).toEqual(270); - expect(ctrl.right.width).toEqual(270); + expect(ctrl.left.width).toEqual(272); + expect(ctrl.right.width).toEqual(272); }); it('should have amount and percentage correct', function() { diff --git a/test/unit/angular/directive/toggle.unit.js b/test/unit/angular/directive/toggle.unit.js index 44f255273..8d08f5e5a 100644 --- a/test/unit/angular/directive/toggle.unit.js +++ b/test/unit/angular/directive/toggle.unit.js @@ -36,7 +36,7 @@ describe('Ionic Toggle', function() { // Not disabled, we can toggle expect(toggle.val()).toBe(false); - ionic.trigger('click', {target: label}); + label.click(); expect(toggle.val()).toBe(true); // Disable it @@ -45,7 +45,7 @@ describe('Ionic Toggle', function() { expect(input.getAttribute('disabled')).toBe('disabled'); // We shouldn't be able to toggle it now - ionic.trigger('click', {target: label}); + label.click(); expect(toggle.val()).toBe(true); // Re-enable it @@ -53,7 +53,7 @@ describe('Ionic Toggle', function() { rootScope.$apply(); // Should be able to toggle it now - ionic.trigger('click', {target: label}); + label.click(); expect(toggle.val()).toBe(false); expect(input.getAttribute('disabled')).not.toBe('disabled'); }); @@ -62,9 +62,9 @@ describe('Ionic Toggle', function() { var toggle = el.scope().toggle; var label = el[0].querySelector('label'); expect(toggle.val()).toBe(false); - ionic.trigger('click', {target: label}); + label.click(); expect(toggle.val()).toBe(true); - ionic.trigger('click', {target: label}); + label.click(); expect(toggle.val()).toBe(false); }); diff --git a/test/unit/utils/tap.unit.js b/test/unit/utils/tap.unit.js index 56a191d0f..2c53038f5 100644 --- a/test/unit/utils/tap.unit.js +++ b/test/unit/utils/tap.unit.js @@ -446,7 +446,7 @@ describe('Ionic Tap', function() { preventDefault:function(){ this.preventedDefault = true; } }; tapTouchEnd(e); - expect( e.preventedDefault ).toEqual(true); + expect( e.preventedDefault ).toBeUndefined(); e = { target: document.createElement('div'), @@ -526,7 +526,7 @@ describe('Ionic Tap', function() { stopPropagation: function(){ this.stoppedPropagation = true; } }; tapMouseDown(e); - expect( e.stoppedPropagation ).toEqual(true); + expect( e.stoppedPropagation ).toBeUndefined(); expect( e.defaultedPrevented ).toBeUndefined(); e = {