Improve compatibility with conflict manager storage

It returns now an object containing the new revision instead of the new revision only

OfficeJS/js/officejs.js

@@ -559,8 +559,8 @@
                 current_content,{
                     previous_revision: priv.data_object.currentRevision || '0',
                     success: function (result) {
-                        if (result) {
-                            priv.data_object.currentRevision = result;
+                        if (result && result.revision) {
+                            priv.data_object.currentRevision = result.revision;
                         }
                         priv.loading_object.end_save();
                         that.getList();
@@ -595,7 +595,7 @@
                 basename+'.'+current_editor.ext,{
                     max_retry:3,
                     success: function (result) {
-                        if (result.revision) {
+                        if (result && result.revision) {
                             priv.data_object.currentRevision = result.revision;
                             if (result.conflict_object) {
                                 priv.onConflict(result.conflict_object);
@@ -705,8 +705,8 @@
             conflict_object.solveConflict(
                 data,{
                     success: function (result) {
-                        if (result) {
-                            priv.data_object.currentRevision = result;
+                        if (result && result.revision) {
+                            priv.data_object.currentRevision = result.revision;
                         }
                         priv.loading_object.end_save();
                         that.getList();

OfficeJS/lib/jio/jio.storage.js

-/*! JIO Storage - v0.1.0 - 2012-08-02
+/*! JIO Storage - v0.1.0 - 2012-08-03
 * Copyright (c) 2012 Nexedi; Licensed  */
 
 (function(LocalOrCookieStorage, $, Base64, sjcl, hex_sha256, Jio) {
@@ -1441,7 +1441,7 @@ var newConflictManagerStorage = function ( spec, my ) {
         o.success = function (){
             am.neverCall(o,'error');
             am.neverCall(o,'success');
-            if (option.success) {option.success(current_revision);}
+            if (option.success) {option.success({revision:current_revision});}
         };
         o.error = function (error){
             var gooderror = error || failerror || {};
@@ -1651,7 +1651,7 @@ var newConflictManagerStorage = function ( spec, my ) {
         o.success = function (){
             am.neverCall(o,'error');
             am.neverCall(o,'success');
-            that.success(current_revision);
+            that.success({revision:current_revision});
         };
         o.error = function (error){
             var gooderror = error || failerror ||
@@ -1976,7 +1976,7 @@ var newConflictManagerStorage = function ( spec, my ) {
         o.success = function (){
             am.neverCall(o,'error');
             am.neverCall(o,'success');
-            that.success(current_revision);
+            that.success({revision:current_revision});
         };
         o.error = function (error){
             var gooderror = error || failerror ||

OfficeJS/src/jio.storage/conflictmanagerstorage.js

@@ -208,7 +208,7 @@ var newConflictManagerStorage = function ( spec, my ) {
         o.success = function (){
             am.neverCall(o,'error');
             am.neverCall(o,'success');
-            if (option.success) {option.success(current_revision);}
+            if (option.success) {option.success({revision:current_revision});}
         };
         o.error = function (error){
             var gooderror = error || failerror || {};
@@ -418,7 +418,7 @@ var newConflictManagerStorage = function ( spec, my ) {
         o.success = function (){
             am.neverCall(o,'error');
             am.neverCall(o,'success');
-            that.success(current_revision);
+            that.success({revision:current_revision});
         };
         o.error = function (error){
             var gooderror = error || failerror ||
@@ -743,7 +743,7 @@ var newConflictManagerStorage = function ( spec, my ) {
         o.success = function (){
             am.neverCall(o,'error');
             am.neverCall(o,'success');
-            that.success(current_revision);
+            that.success({revision:current_revision});
         };
         o.error = function (error){
             var gooderror = error || failerror ||

OfficeJS/test/jiotests.js

@@ -1321,9 +1321,9 @@ test ('Simple methods', function () {
     o.spy('status','done','saving "file.doc".');
     o.jio.saveDocument('file.doc','content1',{
         previous_revision: '0',
-        success:function (revision) {
-            o.new_rev = revision;
-            o.f (revision);
+        success:function (result) {
+            o.new_rev = result.revision;
+            o.f (result);
         },
         error:o.f
     });
@@ -1452,7 +1452,7 @@ test ('Revision Conflict', function() {
             previous_revision:'0',
             error:o.f,
             success:function(value){
-                o.rev.first = value;
+                o.rev.first = value.revision;
                 o.f(value);
             }
         });
@@ -1467,7 +1467,7 @@ test ('Revision Conflict', function() {
             error:o.f,
             success:function(v) {
                 o.f(v);
-                o.rev.second = v;
+                o.rev.second = v.revision;
             }
         });
     o.tick();
@@ -1512,7 +1512,7 @@ test ('Revision Conflict', function() {
             error:o.f,
             success:function (r) {
                 o.f(r);
-                o.rev.forth = r;
+                o.rev.forth = r.revision;
             }
         });
     o.tick();
@@ -1575,7 +1575,7 @@ test ('Conflict in a conflict solving', function () {
             previous_revision:'0',
             error:o.f,
             success:function(value){
-                o.rev.first = value;
+                o.rev.first = value.revision;
                 o.f(value);
             }
         });
@@ -1632,7 +1632,7 @@ test ('Conflict in a conflict solving', function () {
         error:o.f,
         success:function (v) {
             o.f(v);
-            o.rev.fith = v;
+            o.rev.fith = v.revision;
         }
     });
     o.tick();
@@ -1694,7 +1694,7 @@ test ('Remove revision conflict', function () {
             previous_revision:'0',
             error:o.f,
             success:function(value){
-                o.rev.first = value;
+                o.rev.first = value.revision;
                 o.f(value);
             }
         });
@@ -1748,7 +1748,7 @@ test ('Remove revision conflict', function () {
         error:o.f,
         success:function (v) {
             o.f(v);
-            o.rev.forth = v;
+            o.rev.forth = v.revision;
         }
     });
     o.tick();