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
d4da072a
Commit
d4da072a
authored
Jun 26, 2012
by
Tristan Cavelier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Grunt conflictmanagerstorage.js (jio.storage.js concat, lint, min)
parent
a2d7a860
Changes
5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
366 additions
and
86 deletions
+366
-86
OfficeJS/lib/jio/jio.storage.js
OfficeJS/lib/jio/jio.storage.js
+358
-79
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
+4
-3
OfficeJS/src/jio.storage/intro.js
OfficeJS/src/jio.storage/intro.js
+1
-1
OfficeJS/src/jio.storage/outro.js
OfficeJS/src/jio.storage/outro.js
+1
-1
No files found.
OfficeJS/lib/jio/jio.storage.js
View file @
d4da072a
This diff is collapsed.
Click to expand it.
OfficeJS/lib/jio/jio.storage.min.js
View file @
d4da072a
This diff is collapsed.
Click to expand it.
OfficeJS/src/jio.storage/conflictmanagerstorage.js
View file @
d4da072a
...
...
@@ -6,7 +6,7 @@ var newConflictManagerStorage = function ( spec, my ) {
priv
.
username
=
spec
.
username
||
''
;
var
storage_exists
=
(
spec
.
storage
?
true
:
false
);
priv
.
secondstorage_spec
=
spec
.
storage
||
{
type
:
'
base
'
};
priv
.
secondstorage_string
=
JSON
.
stringify
(
priv
.
secondstorage_spec
)
priv
.
secondstorage_string
=
JSON
.
stringify
(
priv
.
secondstorage_spec
)
;
var
local_namespace
=
'
jio/conflictmanager/
'
+
priv
.
secondstorage_string
+
'
/
'
;
...
...
@@ -462,7 +462,7 @@ var newConflictManagerStorage = function ( spec, my ) {
}
else
{
if
(
result
.
length
===
0
)
{
return
that
.
done
([]);
}
;
}
for
(
i
=
0
;
i
<
command_file_metadata_list
.
length
;
i
+=
1
)
{
LocalOrCookieStorage
.
setItem
(
command_file_metadata_list
[
i
].
name
+
'
.metadata
'
,
...
...
@@ -516,6 +516,7 @@ var newConflictManagerStorage = function ( spec, my ) {
that
.
removeDocument
=
function
(
command
)
{
var
metadata_file_name
=
command
.
getPath
()
+
'
.metadata
'
,
local_metadata_file_name
=
local_namespace
+
metadata_file_name
,
local_file_metadata
=
{},
command_file_metadata
=
{},
// distant file.metadata
run_index
=
0
,
previous_revision
=
0
,
end
=
false
,
is_a_new_file
=
false
,
...
...
@@ -705,4 +706,4 @@ var newConflictManagerStorage = function ( spec, my ) {
return
that
;
};
Jio
.
addStorageType
(
'
replicate
'
,
newReplicate
Storage
);
Jio
.
addStorageType
(
'
conflictmanager
'
,
newConflictManager
Storage
);
OfficeJS/src/jio.storage/intro.js
View file @
d4da072a
...
...
@@ -9,4 +9,4 @@
*
* @module JIOStorages
*/
(
function
(
LocalOrCookieStorage
,
$
,
Base64
,
sjcl
,
MD5
,
Jio
)
{
(
function
(
LocalOrCookieStorage
,
$
,
Base64
,
sjcl
,
hex_sha256
,
Jio
)
{
OfficeJS/src/jio.storage/outro.js
View file @
d4da072a
}(
LocalOrCookieStorage
,
jQuery
,
Base64
,
sjcl
,
MD5
,
jio
));
}(
LocalOrCookieStorage
,
jQuery
,
Base64
,
sjcl
,
hex_sha256
,
jio
));
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