Skip to content

Commit

Permalink
0.5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
vicb committed Jul 1, 2015
1 parent 2dde717 commit da5f265
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 10 deletions.
12 changes: 6 additions & 6 deletions dist/jasmine-patch.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,27 +22,27 @@ function apply() {
var originalIt = global.it;
var originalFit = global.fit;

global.it = function zoneResettingIt(description, specFn) {
global.it = function zoneResettingIt(description, specFn, timeOut) {
if (specFn.length) {
originalIt(description, function zoneResettingSpecFn(originalDone) {
specFn(function zoneResettingDone() {
jasmineZone.run(originalDone);
});
});
}, timeOut);
} else {
originalIt(description, specFn);
originalIt(description, specFn, timeOut);
}
};

global.fit = function zoneResettingFit(description, specFn) {
global.fit = function zoneResettingFit(description, specFn, timeOut) {
if (specFn.length) {
originalFit(description, function zoneResettingSpecFn(originalDone) {
specFn(function zoneResettingDone() {
jasmineZone.run(originalDone);
});
});
}, timeOut);
} else {
originalFit(description, specFn);
originalFit(description, specFn, timeOut);
}
};

Expand Down
2 changes: 1 addition & 1 deletion dist/jasmine-patch.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions dist/zone-microtask.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ Zone.prototype = {
},

bind: function (fn, skipEnqueue) {
if (typeof fn !== 'function') {
throw new Error('Expecting function got: ' + fn);
}
skipEnqueue || this.enqueueTask(fn);
var zone = this.isRootZone() ? this : this.fork();
return function zoneBoundFn() {
Expand Down
2 changes: 1 addition & 1 deletion dist/zone-microtask.min.js

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions dist/zone.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ Zone.prototype = {
},

bind: function (fn, skipEnqueue) {
if (typeof fn !== 'function') {
throw new Error('Expecting function got: ' + fn);
}
skipEnqueue || this.enqueueTask(fn);
var zone = this.isRootZone() ? this : this.fork();
return function zoneBoundFn() {
Expand Down
2 changes: 1 addition & 1 deletion dist/zone.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "zone.js",
"version": "0.5.1",
"version": "0.5.2",
"description": "Zones for JavaScript",
"main": "lib/zone.js",
"files": [
Expand Down

0 comments on commit da5f265

Please sign in to comment.