www

commit c453db744a7801161f9f80636cc077edd540f75d
parent 33e1ed9532bb6945879b7e3934876c7bb5fe25be
Author: Simon Kornblith <simon@simonster.com>
Date:   Thu, 23 Jun 2011 09:13:21 +0000

- Remove null, undefined, and false properties from items before passing to parent translators or handlers
- Fix a bug in Zotero.done()-less operation when a child translator encounters an error


Diffstat:
M
chrome/content/zotero/xpcom/translation/translate.js
 | 
12
++++++++++++

1 file changed, 12 insertions(+), 0 deletions(-)
diff --git a/chrome/content/zotero/xpcom/translation/translate.js b/chrome/content/zotero/xpcom/translation/translate.js
@@ -91,6 +91,11 @@ Zotero.Translate.Sandbox = {
 			// if we're not supposed to save the item or we're in a child translator,
 			// just return the item array
 			if(translate._libraryID === false || translate._parentTranslator) {
+				// remove null, undefined, and false properties
+				for(var i in item) {
+					if(!item[i] && item[i] !== 0) delete item[i];
+				}
+				
 				translate.newItems.push(item);
 				translate._runHandler("itemDone", item, item);
 				return;
@@ -899,7 +904,14 @@ Zotero.Translate.Base.prototype = {
 			return;
 		}
 		var oldState = this._currentState;
+		
+		// reset async processes and propagate them to parent
+		if(this._parentTranslator) {
+			this._parentTranslator._runningAsyncProcesses -= this._runningAsyncProcesses;
+			if(this._parentTranslator._runningAsyncProcesses === 0) this._parentTranslator.complete();
+		}
 		this._runningAsyncProcesses = 0;
+		
 		if(!returnValue && this._returnValue) returnValue = this._returnValue;
 		
 		var errorString = null;