mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #594 from aurimasv/patch-1

Browse source 
Disable ZSA ping from bookmarklet in non-IE browsers
This commit is contained in:
Simon Kornblith 2014-12-09 14:13:32 -05:00
commit a0c52a8892
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
chrome/content/zotero/xpcom/connector/connector.js
View file

@ -35,8 +35,20 @@ Zotero.Connector = new function() {
* @param {Function} callback * @param {Function} callback
*/ */
this.checkIsOnline = function(callback) { this.checkIsOnline = function(callback) {
// As of Chrome 38 (and corresponding Opera version 24?) pages loaded over
// https (i.e. the zotero bookmarklet iframe) can not send requests over
// http, so pinging Standalone at http://127.0.0.1 fails.
// Disable for all browsers, except IE, which may be used frequently with ZSA
if(Zotero.isBookmarklet && !Zotero.isIE) {
callback(false);
return;
}
// Only check once in bookmarklet // Only check once in bookmarklet
if(Zotero.isBookmarklet && this.isOnline !== null) callback(this.isOnline); if(Zotero.isBookmarklet && this.isOnline !== null) {
callback(this.isOnline);
return;
}
if(Zotero.isIE) { if(Zotero.isIE) {
if(window.location.protocol !== "http:") { if(window.location.protocol !== "http:") {