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

- Fix failure to save snapshots, caused by failure to add and remove our request from loadGroup

Browse source 
- Fix a few other issues in ConnectorChannel
This commit is contained in:
Simon Kornblith 2011-08-12 18:10:53 +00:00
parent 18f7bf1112
commit bbbc8991f2
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
chrome/content/zotero/xpcom/server_connector.js
View file

@ -353,7 +353,8 @@ Zotero.Server.Connector.SaveSnapshot.prototype = {
var pageShowCalled = false;
var cookieSandbox = new Zotero.CookieSandbox(browser, data["url"], data["cookie"]);
browser.addEventListener("pageshow", function() {
if(browser.contentDocument.location.href == "about:blank") return;
if(browser.contentDocument.location.href == "about:blank"
|| browser.contentDocument.readyState !== "complete") return;
if(pageShowCalled) return;
pageShowCalled = true;
delete Zotero.Server.Connector.Data[data["url"]];

12
components/zotero-protocol-handler.js
View file

@ -967,7 +967,7 @@ function ChromeExtensionHandler() {
ConnectorChannel.prototype.contentCharset = "UTF-8";
ConnectorChannel.prototype.contentType = "text/html";
ConnectorChannel.prototype.notificationCallbacks = {};
ConnectorChannel.prototype.notificationCallbacks = null;
ConnectorChannel.prototype.securityInfo = null;
ConnectorChannel.prototype.status = 0;
ConnectorChannel.prototype.loadGroup = null;
@ -978,10 +978,12 @@ function ChromeExtensionHandler() {
ConnectorChannel.prototype.__defineSetter__("originalURI", function() { });
ConnectorChannel.prototype.asyncOpen = function(streamListener, context) {
if(this.loadGroup) this.loadGroup.addRequest(this, null);
streamListener.onStartRequest(this, context);
streamListener.onDataAvailable(this, context, this._stream, 0, this.contentLength);
streamListener.onStopRequest(this, context, this.status);
this._isPending = false;
if(this.loadGroup) this.loadGroup.removeRequest(this, null, 0);
}
ConnectorChannel.prototype.isPending = function() {
@ -994,13 +996,9 @@ function ChromeExtensionHandler() {
if(this._stream) this._stream.close();
}
ConnectorChannel.prototype.suspend = function(status) {
this.status = status;
}
ConnectorChannel.prototype.suspend = function() {}
ConnectorChannel.prototype.resume = function(status) {
this.status = status;
}
ConnectorChannel.prototype.resume = function() {}
ConnectorChannel.prototype.open = function() {
return this._stream;