Skip to content
This repository was archived by the owner on May 4, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion circle.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
machine:
node:
version: 4.1.0
version: 6.9.4
ruby:
version: 2.1.2
checkout:
Expand Down
1 change: 0 additions & 1 deletion config/build.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',

Expand Down
2 changes: 1 addition & 1 deletion js/utils/tap.js
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ function tapIgnoreEvent(e) {
return true;
}

if(e.target.tagName == 'SELECT') {
if(e.target && e.target.tagName == 'SELECT') {
return true;
}

Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions test/unit/angular/controller/sideMenuController.unit.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
});
Expand Down Expand Up @@ -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() {
Expand Down
10 changes: 5 additions & 5 deletions test/unit/angular/directive/toggle.unit.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -45,15 +45,15 @@ 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
rootScope.data.isDisabled = false;
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');
});
Expand All @@ -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);
});

Expand Down
4 changes: 2 additions & 2 deletions test/unit/utils/tap.unit.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down Expand Up @@ -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 = {
Expand Down