Skip to content

Commit

Permalink
Merge branch 'gh-pages' into update-video-contenthint-text
Browse files Browse the repository at this point in the history
  • Loading branch information
alvestrand authored Jan 6, 2017
2 parents 570cc42 + 4485650 commit baacb8b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
7 changes: 7 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,10 @@ before_script:

script:
- npm test

notifications:
email:
recipients:
[email protected]
on_success: change
on_failure: always
3 changes: 3 additions & 0 deletions src/content/peerconnection/trickle-ice/js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ function start() {
candidateTBody.removeChild(candidateTBody.firstChild);
}

gatherButton.disabled = true;

// Read the values from the input boxes.
var iceServers = [];
for (var i = 0; i < servers.length; ++i) {
Expand Down Expand Up @@ -218,6 +220,7 @@ function iceCallback(event) {
appendCell(row, getFinalResult(), 7);
pc.close();
pc = null;
gatherButton.disabled = false;
}
candidateTBody.appendChild(row);
}

0 comments on commit baacb8b

Please sign in to comment.