Merge in canvas refactorizations

[fnpeditor.git] / src / smartxml / smartxml.js

diff --git a/src/smartxml/smartxml.js b/src/smartxml/smartxml.js
index 663b332..35c5299 100644 (file)
--- a/src/smartxml/smartxml.js
+++ b/src/smartxml/smartxml.js
@@ -583,14 +583,18 @@ $.extend(Document.prototype, Backbone.Events, {
         this._currentTransaction = null;
     },
 
         this._currentTransaction = null;
     },
 

-    transaction: function(callback, context, metadata) {
+    transaction: function(callback, params) {

         var toret;
         var toret;

-        this.startTransaction(metadata);
+        params = params || {};
+        this.startTransaction(params.metadata);

         try {
         try {

-            toret = callback.call(context);
+            toret = callback.call(params.context || this);

         } catch(e) {
         } catch(e) {

+            if(params.error) {
+                params.error(e);
+            }

             this.rollbackTransaction();
             this.rollbackTransaction();

-            throw e;
+            return;

         }
         this.endTransaction();
         return toret;
         }
         this.endTransaction();
         return toret;