Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/parloti/jasmine
Browse files Browse the repository at this point in the history
* Merges #1807 from @parloti
* Fixes #1775
* Prevents undesired reloads when karma-jasmine-html-reporter is used
  • Loading branch information
sgravrock committed Apr 11, 2020
2 parents 4129371 + 9a7dfb1 commit 2b318a6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions lib/jasmine-core/jasmine-html.js
Expand Up @@ -350,9 +350,11 @@ jasmineRequire.HtmlReporter = function(j$) {

find('.jasmine-failures-menu').onclick = function() {
setMenuModeTo('jasmine-failure-list');
return false;
};
find('.jasmine-spec-list-menu').onclick = function() {
setMenuModeTo('jasmine-spec-list');
return false;
};

setMenuModeTo('jasmine-failure-list');
Expand Down
2 changes: 2 additions & 0 deletions src/html/HtmlReporter.js
Expand Up @@ -321,9 +321,11 @@ jasmineRequire.HtmlReporter = function(j$) {

find('.jasmine-failures-menu').onclick = function() {
setMenuModeTo('jasmine-failure-list');
return false;
};
find('.jasmine-spec-list-menu').onclick = function() {
setMenuModeTo('jasmine-spec-list');
return false;
};

setMenuModeTo('jasmine-failure-list');
Expand Down

0 comments on commit 2b318a6

Please sign in to comment.