suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable ZSA ping from bookmarklet in non-IE browsers

Browse Source 
This means that bookmarklet will only save to server.
This commit is contained in:
Aurimas Vinckevicius 2014-12-09 13:12:05 -06:00
parent e3d7101923
commit 9ee67ca291
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:") {