Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
ecommerce-ui
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
ecommerce-ui
Commits
6a62e0bb
Commit
6a62e0bb
authored
Oct 11, 2013
by
Sven Franck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated to latest JIO
parent
f282631d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
4 deletions
+28
-4
js/libs/jio/jio.js
js/libs/jio/jio.js
+28
-4
No files found.
js/libs/jio/jio.js
View file @
6a62e0bb
...
...
@@ -436,6 +436,23 @@ defaults.job_rule_conditions = {};
return
a
.
kwargs
.
_id
===
b
.
kwargs
.
_id
;
}
/**
* Test if the jobs have a document id.
*
* @param {Object} a The first job to test
* @param {Object} b The second job to test
* @return {Boolean} True if ids exist, else false
*/
function
haveDocumentIds
(
a
,
b
)
{
if
(
typeof
a
.
kwargs
.
_id
!==
"
string
"
||
a
.
kwargs
.
_id
===
""
)
{
return
false
;
}
if
(
typeof
b
.
kwargs
.
_id
!==
"
string
"
||
b
.
kwargs
.
_id
===
""
)
{
return
false
;
}
return
true
;
}
/**
* Compare two jobs and test if their kwargs are equal
*
...
...
@@ -467,7 +484,8 @@ defaults.job_rule_conditions = {};
"
sameMethod
"
:
sameMethod
,
"
sameDocumentId
"
:
sameDocumentId
,
"
sameParameters
"
:
sameParameters
,
"
sameOptions
"
:
sameOptions
"
sameOptions
"
:
sameOptions
,
"
haveDocumentIds
"
:
haveDocumentIds
};
}());
...
...
@@ -1595,8 +1613,8 @@ LocalStorageArray.saveArray = function (namespace, list) {
*/
function
Metadata
(
metadata
)
{
if
(
arguments
.
length
>
0
)
{
if
(
typeof
metadata
!==
'
object
'
||
Object
.
getPrototypeOf
(
metadata
||
[])
!==
Object
.
prototype
)
{
if
(
metadata
===
null
||
typeof
metadata
!==
'
object
'
||
Array
.
isArray
(
metadata
)
)
{
throw
new
TypeError
(
"
Metadata(): Optional argument 1 is not an object
"
);
}
this
.
_dict
=
metadata
;
...
...
@@ -2171,6 +2189,10 @@ function restCommandRejecter(param, args) {
if
(
typeof
a
===
'
object
'
&&
!
Array
.
isArray
(
a
))
{
dictUpdate
(
weak
,
a
);
if
(
a
instanceof
Error
)
{
weak
.
reason
=
a
.
message
;
weak
.
error
=
a
.
name
;
}
}
dictUpdate
(
weak
,
strong
);
...
...
@@ -2481,6 +2503,7 @@ function enableJobChecker(jio, shared, options) {
"
sameStorageDescription
"
,
"
areWriters
"
,
"
sameMethod
"
,
"
haveDocumentIds
"
,
"
sameParameters
"
],
"
action
"
:
"
update
"
...
...
@@ -2489,6 +2512,7 @@ function enableJobChecker(jio, shared, options) {
"
conditions
"
:
[
"
sameStorageDescription
"
,
"
areWriters
"
,
"
haveDocumentIds
"
,
"
sameDocumentId
"
],
"
action
"
:
"
wait
"
...
...
@@ -2798,7 +2822,7 @@ function enableJobRecovery(jio, shared, options) {
var
job
;
shared
.
job_queue
.
load
();
job
=
shared
.
job_queue
.
get
(
id
);
if
(
job
.
modified
===
modified
)
{
if
(
job
&&
job
.
modified
===
modified
)
{
// job not modified, no one takes care of it
recoverJob
(
job
);
}
...
...
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