diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-01-26 10:08:44 -0600 |
|---|---|---|
| committer | Jonathan Nieder <jrnieder@gmail.com> | 2010-01-26 10:08:44 -0600 |
| commit | 225f78c817755bebff91629cc525a258cf60eaea (patch) | |
| tree | fc8146efeb2e2165d5427854f7f36d78fa59e168 /gitweb/gitweb.js | |
| parent | 3e6577b45e755b53c9cccb24d75916fa3f2e1916 (diff) | |
| parent | e3f67d30b20e49d8fc3eefe819808cba7998b060 (diff) | |
| download | git-225f78c817755bebff91629cc525a258cf60eaea.tar.gz git-225f78c817755bebff91629cc525a258cf60eaea.tar.xz | |
Merge branch 'master' of git://repo.or.cz/alt-git into jn/autodep
* 'master' of git://repo.or.cz/alt-git: (384 commits)
am: fix patch format detection for Thunderbird "Save As" emails
t0022: replace non-portable literal CR
tests: consolidate CR removal/addition functions
commit-tree: remove unused #define
t5541-http-push: make grep expression check for one line only
rebase: replace antiquated sed invocation
Add test-run-command to .gitignore
git_connect: use use_shell instead of explicit "sh", "-c"
gitweb.js: Workaround for IE8 bug
Make test numbers unique
Windows: Remove dependency on pthreadGC2.dll
Documentation: move away misplaced 'push --upstream' description
Documentation: add missing :: in config.txt
pull: re-fix command line generation
Documentation: merge: use MERGE_HEAD to refer to the remote branch
Documentation: simplify How Merge Works
Documentation: merge: add a section about fast-forward
Documentation: emphasize when git merge terminates early
Documentation: merge: add an overview
Documentation: merge: move merge strategy list to end
...
Conflicts:
Makefile
Diffstat (limited to 'gitweb/gitweb.js')
| -rw-r--r-- | gitweb/gitweb.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gitweb/gitweb.js b/gitweb/gitweb.js index 2a25b7cc4..9c66928c4 100644 --- a/gitweb/gitweb.js +++ b/gitweb/gitweb.js @@ -779,7 +779,12 @@ function handleResponse() { } // the server returned error - if (xhr.readyState === 3 && xhr.status !== 200) { + // try ... catch block is to work around bug in IE8 + try { + if (xhr.readyState === 3 && xhr.status !== 200) { + return; + } + } catch (e) { return; } if (xhr.readyState === 4 && xhr.status !== 200) { |