Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
officejs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
officejs
Commits
f6b9189a
Commit
f6b9189a
authored
Jul 24, 2012
by
Tristan Cavelier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bug : loading metadata with conflict manager storage
parent
527e4fe2
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
OfficeJS/lib/jio/jio.storage.js
OfficeJS/lib/jio/jio.storage.js
+2
-1
OfficeJS/lib/jio/jio.storage.min.js
OfficeJS/lib/jio/jio.storage.min.js
+2
-2
OfficeJS/src/jio.storage/conflictmanagerstorage.js
OfficeJS/src/jio.storage/conflictmanagerstorage.js
+1
-0
No files found.
OfficeJS/lib/jio/jio.storage.js
View file @
f6b9189a
/*! JIO Storage - v0.1.0 - 2012-0
6-28
/*! JIO Storage - v0.1.0 - 2012-0
7-24
* Copyright (c) 2012 Nexedi; Licensed */
* Copyright (c) 2012 Nexedi; Licensed */
(
function
(
LocalOrCookieStorage
,
$
,
Base64
,
sjcl
,
hex_sha256
,
Jio
)
{
(
function
(
LocalOrCookieStorage
,
$
,
Base64
,
sjcl
,
hex_sha256
,
Jio
)
{
...
@@ -1199,6 +1199,7 @@ var newConflictManagerStorage = function ( spec, my ) {
...
@@ -1199,6 +1199,7 @@ var newConflictManagerStorage = function ( spec, my ) {
priv
.
loadMetadataFromDistant
=
function
(
command
,
path
,
onDone
,
onFail
)
{
priv
.
loadMetadataFromDistant
=
function
(
command
,
path
,
onDone
,
onFail
)
{
var
cloned_option
=
command
.
cloneOption
();
var
cloned_option
=
command
.
cloneOption
();
cloned_option
.
metadata_only
=
false
;
cloned_option
.
metadata_only
=
false
;
cloned_option
.
max_retry
=
1
;
// FIXME : wrong ! (redesign jio & storage)
cloned_option
.
onResponse
=
function
()
{};
cloned_option
.
onResponse
=
function
()
{};
cloned_option
.
onFail
=
onFail
;
cloned_option
.
onFail
=
onFail
;
cloned_option
.
onDone
=
onDone
;
cloned_option
.
onDone
=
onDone
;
...
...
OfficeJS/lib/jio/jio.storage.min.js
View file @
f6b9189a
This diff is collapsed.
Click to expand it.
OfficeJS/src/jio.storage/conflictmanagerstorage.js
View file @
f6b9189a
...
@@ -57,6 +57,7 @@ var newConflictManagerStorage = function ( spec, my ) {
...
@@ -57,6 +57,7 @@ var newConflictManagerStorage = function ( spec, my ) {
priv
.
loadMetadataFromDistant
=
function
(
command
,
path
,
onDone
,
onFail
)
{
priv
.
loadMetadataFromDistant
=
function
(
command
,
path
,
onDone
,
onFail
)
{
var
cloned_option
=
command
.
cloneOption
();
var
cloned_option
=
command
.
cloneOption
();
cloned_option
.
metadata_only
=
false
;
cloned_option
.
metadata_only
=
false
;
cloned_option
.
max_retry
=
1
;
// FIXME : wrong ! (redesign jio & storage)
cloned_option
.
onResponse
=
function
()
{};
cloned_option
.
onResponse
=
function
()
{};
cloned_option
.
onFail
=
onFail
;
cloned_option
.
onFail
=
onFail
;
cloned_option
.
onDone
=
onDone
;
cloned_option
.
onDone
=
onDone
;
...
...
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