Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Explicit segment draw on drag resize #120

Merged
merged 4 commits into from
Jul 2, 2015
Merged

Explicit segment draw on drag resize #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ac43dee
Valid SPDX license value for LGPL v3
thom4parisot Jun 24, 2015
2aaac04
Explicitly render segments on drag.
thom4parisot Jun 24, 2015
36b200a
Introduce Node 0.12 and allow it to fail.
thom4parisot Jun 24, 2015
6f36b45
Container mode testing.
thom4parisot Jun 24, 2015
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
10 changes: 9 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
language: node_js
node_js: '0.10'
node_js:
- '0.10'
- '0.12'
sudo: false
cache:
directories:
- node_modules
- bower_components
env:
global:
- secure: Bg08bmtZxlt18xVd7IT3Ft8rC8Cd3iT2txSqoFKaUERu2FzlaPvi+DS5K0SeOqAB9LfyRST/Msdg+jmPEvQ/0VXa2lfhqf31YSrXStnd9h1Owxr53KPV3O6FX1mfH8RlmHVDosKUR6mJeiush4MSEFPCmB1VBTwpyRcbBt3sbJ0=
Expand All @@ -25,3 +29,7 @@ script:
- npm start & sleep 2
- npm run test-pre
- ./node_modules/karma/bin/karma start --browsers Firefox --single-run

matrix:
allow_failures:
- node_js: '0.12'
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"type": "git",
"url": "git://github.com/bbcrd/peaks.js.git"
},
"license": "LGPL 3",
"license": "LGPL-3.0",
"scripts": {
"build": "browserify -d ./src/main.js -p [minifyify --map peaks.min.map --output peaks.min.map] -s peaks -o peaks.min.js",
"test": "npm run test-pre && ./node_modules/karma/bin/karma start --single-run",
Expand Down
7 changes: 2 additions & 5 deletions src/main/markers/waveform.segments.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ define([
// segment.overview.label.setX(overviewStartOffset);

SegmentShape.update.call(segment.overview.waveformShape, peaks.waveform.waveformOverview, segment.id);
segment.overview.view.segmentLayer.draw();

// Zoom
var zoomStartOffset = peaks.waveform.waveformZoomView.data.at_time(segment.startTime);
Expand Down Expand Up @@ -136,9 +135,6 @@ define([
}

SegmentShape.update.call(segment.zoom.waveformShape, peaks.waveform.waveformZoomView, segment.id);

segment.zoom.view.segmentLayer.draw();

} else {
segment.zoom.hide();
}
Expand All @@ -156,7 +152,8 @@ define([
}

updateSegmentWaveform(segment);
};
this.render();
}.bind(this);

var getSegmentColor = function () {
var c;
Expand Down