Skip to content

Commit

Permalink
removed or clause
Browse files Browse the repository at this point in the history
  • Loading branch information
edsilv committed Jun 22, 2018
1 parent 7a9de05 commit 4e846a5
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 25 deletions.
7 changes: 1 addition & 6 deletions dist/client/manifesto.bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -1671,12 +1671,7 @@ var Manifesto;
Range.prototype.spansTime = function (time) {
var duration = this.getDuration();
if (duration) {
// if the end is before the start, it means it spans multiple canvases.
// therefore just check to see if the time is after the start.
if (duration.end < duration.start && time >= duration.start || time <= duration.end) {
return true;
}
else if (time >= duration.start && time <= duration.end) {
if (time >= duration.start && time <= duration.end) {
return true;
}
}
Expand Down
7 changes: 1 addition & 6 deletions dist/client/manifesto.js
Original file line number Diff line number Diff line change
Expand Up @@ -1599,12 +1599,7 @@ var Manifesto;
Range.prototype.spansTime = function (time) {
var duration = this.getDuration();
if (duration) {
// if the end is before the start, it means it spans multiple canvases.
// therefore just check to see if the time is after the start.
if (duration.end < duration.start && time >= duration.start || time <= duration.end) {
return true;
}
else if (time >= duration.start && time <= duration.end) {
if (time >= duration.start && time <= duration.end) {
return true;
}
}
Expand Down
7 changes: 1 addition & 6 deletions dist/server/manifesto.js
Original file line number Diff line number Diff line change
Expand Up @@ -1670,12 +1670,7 @@ var Manifesto;
Range.prototype.spansTime = function (time) {
var duration = this.getDuration();
if (duration) {
// if the end is before the start, it means it spans multiple canvases.
// therefore just check to see if the time is after the start.
if (duration.end < duration.start && time >= duration.start || time <= duration.end) {
return true;
}
else if (time >= duration.start && time <= duration.end) {
if (time >= duration.start && time <= duration.end) {
return true;
}
}
Expand Down
8 changes: 1 addition & 7 deletions src/Range.ts
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,7 @@ namespace Manifesto {
const duration: Duration | undefined = this.getDuration();

if (duration) {

// if the end is before the start, it means it spans multiple canvases.
// therefore just check to see if the time is after the start.

if (duration.end < duration.start && time >= duration.start || time <= duration.end) {
return true;
} else if (time >= duration.start && time <= duration.end) {
if (time >= duration.start && time <= duration.end) {
return true;
}
}
Expand Down

0 comments on commit 4e846a5

Please sign in to comment.