Bug 1035296 - Part 2, Make protocol.js pass error messages for unknownError; r=past

This commit is contained in:
Joe Walker 2014-07-31 17:36:10 +01:00
parent 6cc74f034f
commit 972295ac37
2 changed files with 2 additions and 2 deletions

View File

@ -2072,7 +2072,7 @@ Requisition.prototype.exec = function(options) {
data = (data != null && data.isTypedData) ? data : {
isTypedData: true,
data: data,
data: data.replace(/^Protocol error: /, ''), // Temp for bug 1035296
type: 'error'
};
output.complete(data, true);

View File

@ -1112,7 +1112,7 @@ let Front = Class({
let message = (packet.error == "unknownError" && packet.message) ?
"Protocol error: " + packet.message :
packet.error;
deferred.reject(packet.error);
deferred.reject(message);
} else {
deferred.resolve(packet);
}