Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
jio
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
18
Merge Requests
18
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
nexedi
jio
Commits
868af9b5
Commit
868af9b5
authored
Jul 23, 2019
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Release 3.39.0
parent
b6b14699
Changes
6
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
31432 additions
and
16 deletions
+31432
-16
Makefile
Makefile
+1
-1
dist/jio-latest-node.js
dist/jio-latest-node.js
+16
-7
dist/jio-latest.js
dist/jio-latest.js
+16
-7
dist/jio-v3.39.0-node.js
dist/jio-v3.39.0-node.js
+15378
-0
dist/jio-v3.39.0.js
dist/jio-v3.39.0.js
+16020
-0
package.json
package.json
+1
-1
No files found.
Makefile
View file @
868af9b5
...
@@ -26,7 +26,7 @@ TESTDIR = test
...
@@ -26,7 +26,7 @@ TESTDIR = test
EXAMPLEDIR
=
examples
EXAMPLEDIR
=
examples
EXTERNALDIR
=
external
EXTERNALDIR
=
external
VERSION
=
3.3
8.1
VERSION
=
3.3
9.0
JIOVERSION
=
${DISTDIR}
/jio-v
${VERSION}
.js
JIOVERSION
=
${DISTDIR}
/jio-v
${VERSION}
.js
JIOLATEST
=
${DISTDIR}
/jio-latest.js
JIOLATEST
=
${DISTDIR}
/jio-latest.js
JIONODEVERSION
=
${DISTDIR}
/jio-v
${VERSION}
-node
.js
JIONODEVERSION
=
${DISTDIR}
/jio-v
${VERSION}
-node
.js
...
...
dist/jio-latest-node.js
View file @
868af9b5
...
@@ -12039,7 +12039,8 @@ var jIO = window.jIO,
...
@@ -12039,7 +12039,8 @@ var jIO = window.jIO,
// ie, replication should prevent losing user data
// ie, replication should prevent losing user data
// Synchronize attachments before, to ensure
// Synchronize attachments before, to ensure
// all of them will be deleted too
// all of them will be deleted too
var
result
;
var
result
,
previous_report_length
;
if
(
context
.
_signature_hash_key
!==
undefined
)
{
if
(
context
.
_signature_hash_key
!==
undefined
)
{
if
(
options
.
conflict
)
{
if
(
options
.
conflict
)
{
report
.
log
(
id
,
options
.
from_local
?
LOG_FORCE_DELETE_REMOTE
:
report
.
log
(
id
,
options
.
from_local
?
LOG_FORCE_DELETE_REMOTE
:
...
@@ -12053,12 +12054,21 @@ var jIO = window.jIO,
...
@@ -12053,12 +12054,21 @@ var jIO = window.jIO,
return
context
.
_signature_sub_storage
.
remove
(
id
);
return
context
.
_signature_sub_storage
.
remove
(
id
);
});
});
}
else
{
}
else
{
previous_report_length
=
report
.
_list
.
length
;
result
=
repairDocumentAttachment
(
context
,
id
,
report
)
result
=
repairDocumentAttachment
(
context
,
id
,
report
)
.
push
(
function
()
{
.
push
(
function
()
{
return
destination
.
allAttachments
(
id
);
var
next_report_length
=
report
.
_list
.
length
,
})
has_error
=
false
,
.
push
(
function
(
attachment_dict
)
{
i
;
if
(
JSON
.
stringify
(
attachment_dict
)
===
"
{}
"
)
{
// Check if there was an error during attachment replication
for
(
i
=
previous_report_length
;
i
<
next_report_length
;
i
+=
1
)
{
if
((
report
.
_list
[
i
][
1
]
===
id
)
&&
(
report
.
_list
[
i
][
0
]
<
100
))
{
has_error
=
true
;
}
}
if
(
!
has_error
)
{
// Attachment repication has been correctly resolved
if
(
options
.
conflict
)
{
if
(
options
.
conflict
)
{
report
.
log
(
id
,
options
.
from_local
?
LOG_FORCE_DELETE_REMOTE
:
report
.
log
(
id
,
options
.
from_local
?
LOG_FORCE_DELETE_REMOTE
:
LOG_FORCE_DELETE_LOCAL
);
LOG_FORCE_DELETE_LOCAL
);
...
@@ -12072,8 +12082,7 @@ var jIO = window.jIO,
...
@@ -12072,8 +12082,7 @@ var jIO = window.jIO,
});
});
}
}
report
.
log
(
id
,
options
.
from_local
?
LOG_UNEXPECTED_REMOTE_ATTACHMENT
:
report
.
log
(
id
,
options
.
from_local
?
LOG_UNEXPECTED_REMOTE_ATTACHMENT
:
LOG_UNEXPECTED_LOCAL_ATTACHMENT
,
LOG_UNEXPECTED_LOCAL_ATTACHMENT
);
JSON
.
stringify
(
attachment_dict
));
},
function
(
error
)
{
},
function
(
error
)
{
if
((
error
instanceof
jIO
.
util
.
jIOError
)
&&
if
((
error
instanceof
jIO
.
util
.
jIOError
)
&&
(
error
.
status_code
===
404
))
{
(
error
.
status_code
===
404
))
{
...
...
dist/jio-latest.js
View file @
868af9b5
...
@@ -10340,7 +10340,8 @@ return new Parser;
...
@@ -10340,7 +10340,8 @@ return new Parser;
// ie, replication should prevent losing user data
// ie, replication should prevent losing user data
// Synchronize attachments before, to ensure
// Synchronize attachments before, to ensure
// all of them will be deleted too
// all of them will be deleted too
var
result
;
var
result
,
previous_report_length
;
if
(
context
.
_signature_hash_key
!==
undefined
)
{
if
(
context
.
_signature_hash_key
!==
undefined
)
{
if
(
options
.
conflict
)
{
if
(
options
.
conflict
)
{
report
.
log
(
id
,
options
.
from_local
?
LOG_FORCE_DELETE_REMOTE
:
report
.
log
(
id
,
options
.
from_local
?
LOG_FORCE_DELETE_REMOTE
:
...
@@ -10354,12 +10355,21 @@ return new Parser;
...
@@ -10354,12 +10355,21 @@ return new Parser;
return
context
.
_signature_sub_storage
.
remove
(
id
);
return
context
.
_signature_sub_storage
.
remove
(
id
);
});
});
}
else
{
}
else
{
previous_report_length
=
report
.
_list
.
length
;
result
=
repairDocumentAttachment
(
context
,
id
,
report
)
result
=
repairDocumentAttachment
(
context
,
id
,
report
)
.
push
(
function
()
{
.
push
(
function
()
{
return
destination
.
allAttachments
(
id
);
var
next_report_length
=
report
.
_list
.
length
,
})
has_error
=
false
,
.
push
(
function
(
attachment_dict
)
{
i
;
if
(
JSON
.
stringify
(
attachment_dict
)
===
"
{}
"
)
{
// Check if there was an error during attachment replication
for
(
i
=
previous_report_length
;
i
<
next_report_length
;
i
+=
1
)
{
if
((
report
.
_list
[
i
][
1
]
===
id
)
&&
(
report
.
_list
[
i
][
0
]
<
100
))
{
has_error
=
true
;
}
}
if
(
!
has_error
)
{
// Attachment repication has been correctly resolved
if
(
options
.
conflict
)
{
if
(
options
.
conflict
)
{
report
.
log
(
id
,
options
.
from_local
?
LOG_FORCE_DELETE_REMOTE
:
report
.
log
(
id
,
options
.
from_local
?
LOG_FORCE_DELETE_REMOTE
:
LOG_FORCE_DELETE_LOCAL
);
LOG_FORCE_DELETE_LOCAL
);
...
@@ -10373,8 +10383,7 @@ return new Parser;
...
@@ -10373,8 +10383,7 @@ return new Parser;
});
});
}
}
report
.
log
(
id
,
options
.
from_local
?
LOG_UNEXPECTED_REMOTE_ATTACHMENT
:
report
.
log
(
id
,
options
.
from_local
?
LOG_UNEXPECTED_REMOTE_ATTACHMENT
:
LOG_UNEXPECTED_LOCAL_ATTACHMENT
,
LOG_UNEXPECTED_LOCAL_ATTACHMENT
);
JSON
.
stringify
(
attachment_dict
));
},
function
(
error
)
{
},
function
(
error
)
{
if
((
error
instanceof
jIO
.
util
.
jIOError
)
&&
if
((
error
instanceof
jIO
.
util
.
jIOError
)
&&
(
error
.
status_code
===
404
))
{
(
error
.
status_code
===
404
))
{
...
...
dist/jio-v3.39.0-node.js
0 → 100644
View file @
868af9b5
This diff is collapsed.
Click to expand it.
dist/jio-v3.39.0.js
0 → 100644
View file @
868af9b5
This diff is collapsed.
Click to expand it.
package.json
View file @
868af9b5
{
{
"name"
:
"jio"
,
"name"
:
"jio"
,
"version"
:
"v3.3
8.1
"
,
"version"
:
"v3.3
9.0
"
,
"license"
:
"GPLv3+"
,
"license"
:
"GPLv3+"
,
"author"
:
"Nexedi SA"
,
"author"
:
"Nexedi SA"
,
"contributors"
:
[
"contributors"
:
[
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment