Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
2c51448e
Commit
2c51448e
authored
Jun 28, 2019
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_core/erp5_web_renderjs_ui] Update jio 3.38.0
parent
f766e714
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
98 additions
and
54 deletions
+98
-54
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_jio_js.js
...enderjs_ui/PathTemplateItem/web_page_module/rjs_jio_js.js
+48
-26
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_jio_js.xml
...nderjs_ui/PathTemplateItem/web_page_module/rjs_jio_js.xml
+2
-2
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/jio.js.js
...p5_core/SkinTemplateItem/portal_skins/erp5_core/jio.js.js
+48
-26
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_jio_js.js
View file @
2c51448e
...
@@ -6105,6 +6105,8 @@ var arrayExtend = function () {
...
@@ -6105,6 +6105,8 @@ var arrayExtend = function () {
return
true
;
return
true
;
}
}
return
false
;
return
false
;
},
parseQuotedString
=
function
(
string
)
{
return
string
.
replace
(
/
(?:\\(
"
)
|
(\\[^
"
]))
/g
,
'
$1$2
'
);
},
},
error_offsets
=
[],
error_offsets
=
[],
error_lookaheads
=
[],
error_lookaheads
=
[],
...
@@ -6226,7 +6228,7 @@ case 17:
...
@@ -6226,7 +6228,7 @@ case 17:
this
.
$
=
mkSimpleQuery
(
''
,
$$
[
$0
]);
this
.
$
=
mkSimpleQuery
(
''
,
$$
[
$0
]);
break
;
break
;
case
18
:
case
18
:
this
.
$
=
mkSimpleQuery
(
''
,
$$
[
$0
-
1
]
);
this
.
$
=
mkSimpleQuery
(
''
,
parseQuotedString
(
$$
[
$0
-
1
])
);
break
;
break
;
}
}
},
},
...
@@ -6930,6 +6932,9 @@ return new Parser;
...
@@ -6930,6 +6932,9 @@ return new Parser;
throw
new
TypeError
(
"
jioquery.sortOn():
"
+
throw
new
TypeError
(
"
jioquery.sortOn():
"
+
"
Argument 1 is not of type 'array'
"
);
"
Argument 1 is not of type 'array'
"
);
}
}
if
(
sort_on_option
.
length
===
0
)
{
return
list
;
}
list
.
sort
(
generateSortFunction
(
list
.
sort
(
generateSortFunction
(
key_schema
,
key_schema
,
sort_on_option
sort_on_option
...
@@ -7445,6 +7450,16 @@ return new Parser;
...
@@ -7445,6 +7450,16 @@ return new Parser;
"
Argument 1 is not a search text or a parsable object
"
);
"
Argument 1 is not a search text or a parsable object
"
);
};
};
function
ensureString
(
value
)
{
if
(
value
===
undefined
)
{
return
"
undefined
"
;
}
if
(
value
===
null
)
{
return
"
null
"
;
}
return
value
.
toString
();
}
function
renderSearchTextValue
(
value
)
{
return
'
"
'
+
ensureString
(
value
).
replace
(
/"/g
,
'
\\
"
'
)
+
'
"
'
;
}
function
objectToSearchText
(
query
)
{
function
objectToSearchText
(
query
)
{
var
i
=
0
,
var
i
=
0
,
query_list
=
null
,
query_list
=
null
,
...
@@ -7453,7 +7468,8 @@ return new Parser;
...
@@ -7453,7 +7468,8 @@ return new Parser;
common_key
=
""
;
common_key
=
""
;
if
(
query
.
type
===
"
simple
"
)
{
if
(
query
.
type
===
"
simple
"
)
{
return
(
query
.
key
?
query
.
key
+
"
:
"
:
""
)
+
return
(
query
.
key
?
query
.
key
+
"
:
"
:
""
)
+
(
query
.
operator
||
""
)
+
'
"
'
+
query
.
value
+
'
"
'
;
(
query
.
operator
||
""
)
+
'
'
+
renderSearchTextValue
(
query
.
value
);
}
}
if
(
query
.
type
===
"
complex
"
)
{
if
(
query
.
type
===
"
complex
"
)
{
query_list
=
query
.
query_list
;
query_list
=
query
.
query_list
;
...
@@ -7484,7 +7500,7 @@ return new Parser;
...
@@ -7484,7 +7500,7 @@ return new Parser;
for
(
i
=
0
;
i
<
query_list
.
length
;
i
+=
1
)
{
for
(
i
=
0
;
i
<
query_list
.
length
;
i
+=
1
)
{
string_list
.
push
(
string_list
.
push
(
(
query_list
[
i
].
operator
||
""
)
+
(
query_list
[
i
].
operator
||
""
)
+
'
"
'
+
query_list
[
i
].
value
+
'
"
'
'
'
+
renderSearchTextValue
(
query_list
[
i
].
value
)
);
);
}
}
}
else
{
}
else
{
...
@@ -10357,7 +10373,8 @@ return new Parser;
...
@@ -10357,7 +10373,8 @@ 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
))
{
...
@@ -14916,13 +14933,19 @@ return new Parser;
...
@@ -14916,13 +14933,19 @@ return new Parser;
}
}
function
waitForOpenIndexedDB
(
db_name
,
callback
)
{
function
waitForOpenIndexedDB
(
db_name
,
callback
)
{
var
request
;
function
canceller
()
{
if
((
request
!==
undefined
)
&&
(
request
.
result
!==
undefined
))
{
request
.
result
.
close
();
}
}
function
resolver
(
resolve
,
reject
)
{
function
resolver
(
resolve
,
reject
)
{
// Open DB //
// Open DB //
var
request
=
indexedDB
.
open
(
db_name
);
request
=
indexedDB
.
open
(
db_name
);
request
.
onerror
=
function
(
error
)
{
request
.
onerror
=
function
(
error
)
{
if
(
request
.
result
)
{
canceller
();
request
.
result
.
close
();
}
if
((
error
!==
undefined
)
&&
if
((
error
!==
undefined
)
&&
(
error
.
target
instanceof
IDBOpenDBRequest
)
&&
(
error
.
target
instanceof
IDBOpenDBRequest
)
&&
(
error
.
target
.
error
instanceof
DOMError
))
{
(
error
.
target
.
error
instanceof
DOMError
))
{
...
@@ -14934,17 +14957,16 @@ return new Parser;
...
@@ -14934,17 +14957,16 @@ return new Parser;
};
};
request
.
onabort
=
function
()
{
request
.
onabort
=
function
()
{
request
.
result
.
close
();
canceller
();
reject
(
"
Aborting connection to:
"
+
db_name
);
reject
(
"
Aborting connection to:
"
+
db_name
);
};
};
request
.
ontimeout
=
function
()
{
request
.
ontimeout
=
function
()
{
request
.
result
.
close
();
reject
(
"
Connection to:
"
+
db_name
+
"
timeout
"
);
reject
(
"
Connection to:
"
+
db_name
+
"
timeout
"
);
};
};
request
.
onblocked
=
function
()
{
request
.
onblocked
=
function
()
{
request
.
result
.
close
();
canceller
();
reject
(
"
Connection to:
"
+
db_name
+
"
was blocked
"
);
reject
(
"
Connection to:
"
+
db_name
+
"
was blocked
"
);
};
};
...
@@ -14952,26 +14974,32 @@ return new Parser;
...
@@ -14952,26 +14974,32 @@ return new Parser;
request
.
onupgradeneeded
=
handleUpgradeNeeded
;
request
.
onupgradeneeded
=
handleUpgradeNeeded
;
request
.
onversionchange
=
function
()
{
request
.
onversionchange
=
function
()
{
request
.
result
.
close
();
canceller
();
reject
(
db_name
+
"
was upgraded
"
);
reject
(
db_name
+
"
was upgraded
"
);
};
};
request
.
onsuccess
=
function
()
{
request
.
onsuccess
=
function
()
{
var
result
;
try
{
result
=
callback
(
request
.
result
);
}
catch
(
error
)
{
reject
(
error
);
}
return
new
RSVP
.
Queue
()
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
.
push
(
function
()
{
return
callback
(
request
.
result
)
;
return
result
;
})
})
.
push
(
function
(
result
)
{
.
push
(
function
(
final_
result
)
{
request
.
result
.
close
();
canceller
();
resolve
(
result
);
resolve
(
final_
result
);
},
function
(
error
)
{
},
function
(
error
)
{
request
.
result
.
close
();
canceller
();
reject
(
error
);
reject
(
error
);
});
});
};
};
}
}
return
new
RSVP
.
Promise
(
resolver
);
return
new
RSVP
.
Promise
(
resolver
,
canceller
);
}
}
function
waitForTransaction
(
db
,
stores
,
flag
,
callback
)
{
function
waitForTransaction
(
db
,
stores
,
flag
,
callback
)
{
...
@@ -15001,14 +15029,8 @@ return new Parser;
...
@@ -15001,14 +15029,8 @@ return new Parser;
reject
(
error
);
reject
(
error
);
});
});
};
};
tx
.
onerror
=
function
(
error
)
{
tx
.
onerror
=
reject
;
canceller
();
tx
.
onabort
=
reject
;
reject
(
error
);
};
tx
.
onabort
=
function
(
evt
)
{
reject
(
evt
.
target
);
};
return
tx
;
}
}
return
new
RSVP
.
Promise
(
resolver
,
canceller
);
return
new
RSVP
.
Promise
(
resolver
,
canceller
);
}
}
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_jio_js.xml
View file @
2c51448e
...
@@ -234,7 +234,7 @@
...
@@ -234,7 +234,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
97
4.4070.21826.50261
</string>
</value>
<value>
<string>
97
6.45837.16266.40243
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -252,7 +252,7 @@
...
@@ -252,7 +252,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15
51694892.25
</float>
<float>
15
61969491.3
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/jio.js.js
View file @
2c51448e
...
@@ -6105,6 +6105,8 @@ var arrayExtend = function () {
...
@@ -6105,6 +6105,8 @@ var arrayExtend = function () {
return
true
;
return
true
;
}
}
return
false
;
return
false
;
},
parseQuotedString
=
function
(
string
)
{
return
string
.
replace
(
/
(?:\\(
"
)
|
(\\[^
"
]))
/g
,
'
$1$2
'
);
},
},
error_offsets
=
[],
error_offsets
=
[],
error_lookaheads
=
[],
error_lookaheads
=
[],
...
@@ -6226,7 +6228,7 @@ case 17:
...
@@ -6226,7 +6228,7 @@ case 17:
this
.
$
=
mkSimpleQuery
(
''
,
$$
[
$0
]);
this
.
$
=
mkSimpleQuery
(
''
,
$$
[
$0
]);
break
;
break
;
case
18
:
case
18
:
this
.
$
=
mkSimpleQuery
(
''
,
$$
[
$0
-
1
]
);
this
.
$
=
mkSimpleQuery
(
''
,
parseQuotedString
(
$$
[
$0
-
1
])
);
break
;
break
;
}
}
},
},
...
@@ -6930,6 +6932,9 @@ return new Parser;
...
@@ -6930,6 +6932,9 @@ return new Parser;
throw
new
TypeError
(
"
jioquery.sortOn():
"
+
throw
new
TypeError
(
"
jioquery.sortOn():
"
+
"
Argument 1 is not of type 'array'
"
);
"
Argument 1 is not of type 'array'
"
);
}
}
if
(
sort_on_option
.
length
===
0
)
{
return
list
;
}
list
.
sort
(
generateSortFunction
(
list
.
sort
(
generateSortFunction
(
key_schema
,
key_schema
,
sort_on_option
sort_on_option
...
@@ -7445,6 +7450,16 @@ return new Parser;
...
@@ -7445,6 +7450,16 @@ return new Parser;
"
Argument 1 is not a search text or a parsable object
"
);
"
Argument 1 is not a search text or a parsable object
"
);
};
};
function
ensureString
(
value
)
{
if
(
value
===
undefined
)
{
return
"
undefined
"
;
}
if
(
value
===
null
)
{
return
"
null
"
;
}
return
value
.
toString
();
}
function
renderSearchTextValue
(
value
)
{
return
'
"
'
+
ensureString
(
value
).
replace
(
/"/g
,
'
\\
"
'
)
+
'
"
'
;
}
function
objectToSearchText
(
query
)
{
function
objectToSearchText
(
query
)
{
var
i
=
0
,
var
i
=
0
,
query_list
=
null
,
query_list
=
null
,
...
@@ -7453,7 +7468,8 @@ return new Parser;
...
@@ -7453,7 +7468,8 @@ return new Parser;
common_key
=
""
;
common_key
=
""
;
if
(
query
.
type
===
"
simple
"
)
{
if
(
query
.
type
===
"
simple
"
)
{
return
(
query
.
key
?
query
.
key
+
"
:
"
:
""
)
+
return
(
query
.
key
?
query
.
key
+
"
:
"
:
""
)
+
(
query
.
operator
||
""
)
+
'
"
'
+
query
.
value
+
'
"
'
;
(
query
.
operator
||
""
)
+
'
'
+
renderSearchTextValue
(
query
.
value
);
}
}
if
(
query
.
type
===
"
complex
"
)
{
if
(
query
.
type
===
"
complex
"
)
{
query_list
=
query
.
query_list
;
query_list
=
query
.
query_list
;
...
@@ -7484,7 +7500,7 @@ return new Parser;
...
@@ -7484,7 +7500,7 @@ return new Parser;
for
(
i
=
0
;
i
<
query_list
.
length
;
i
+=
1
)
{
for
(
i
=
0
;
i
<
query_list
.
length
;
i
+=
1
)
{
string_list
.
push
(
string_list
.
push
(
(
query_list
[
i
].
operator
||
""
)
+
(
query_list
[
i
].
operator
||
""
)
+
'
"
'
+
query_list
[
i
].
value
+
'
"
'
'
'
+
renderSearchTextValue
(
query_list
[
i
].
value
)
);
);
}
}
}
else
{
}
else
{
...
@@ -10357,7 +10373,8 @@ return new Parser;
...
@@ -10357,7 +10373,8 @@ 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
))
{
...
@@ -14916,13 +14933,19 @@ return new Parser;
...
@@ -14916,13 +14933,19 @@ return new Parser;
}
}
function
waitForOpenIndexedDB
(
db_name
,
callback
)
{
function
waitForOpenIndexedDB
(
db_name
,
callback
)
{
var
request
;
function
canceller
()
{
if
((
request
!==
undefined
)
&&
(
request
.
result
!==
undefined
))
{
request
.
result
.
close
();
}
}
function
resolver
(
resolve
,
reject
)
{
function
resolver
(
resolve
,
reject
)
{
// Open DB //
// Open DB //
var
request
=
indexedDB
.
open
(
db_name
);
request
=
indexedDB
.
open
(
db_name
);
request
.
onerror
=
function
(
error
)
{
request
.
onerror
=
function
(
error
)
{
if
(
request
.
result
)
{
canceller
();
request
.
result
.
close
();
}
if
((
error
!==
undefined
)
&&
if
((
error
!==
undefined
)
&&
(
error
.
target
instanceof
IDBOpenDBRequest
)
&&
(
error
.
target
instanceof
IDBOpenDBRequest
)
&&
(
error
.
target
.
error
instanceof
DOMError
))
{
(
error
.
target
.
error
instanceof
DOMError
))
{
...
@@ -14934,17 +14957,16 @@ return new Parser;
...
@@ -14934,17 +14957,16 @@ return new Parser;
};
};
request
.
onabort
=
function
()
{
request
.
onabort
=
function
()
{
request
.
result
.
close
();
canceller
();
reject
(
"
Aborting connection to:
"
+
db_name
);
reject
(
"
Aborting connection to:
"
+
db_name
);
};
};
request
.
ontimeout
=
function
()
{
request
.
ontimeout
=
function
()
{
request
.
result
.
close
();
reject
(
"
Connection to:
"
+
db_name
+
"
timeout
"
);
reject
(
"
Connection to:
"
+
db_name
+
"
timeout
"
);
};
};
request
.
onblocked
=
function
()
{
request
.
onblocked
=
function
()
{
request
.
result
.
close
();
canceller
();
reject
(
"
Connection to:
"
+
db_name
+
"
was blocked
"
);
reject
(
"
Connection to:
"
+
db_name
+
"
was blocked
"
);
};
};
...
@@ -14952,26 +14974,32 @@ return new Parser;
...
@@ -14952,26 +14974,32 @@ return new Parser;
request
.
onupgradeneeded
=
handleUpgradeNeeded
;
request
.
onupgradeneeded
=
handleUpgradeNeeded
;
request
.
onversionchange
=
function
()
{
request
.
onversionchange
=
function
()
{
request
.
result
.
close
();
canceller
();
reject
(
db_name
+
"
was upgraded
"
);
reject
(
db_name
+
"
was upgraded
"
);
};
};
request
.
onsuccess
=
function
()
{
request
.
onsuccess
=
function
()
{
var
result
;
try
{
result
=
callback
(
request
.
result
);
}
catch
(
error
)
{
reject
(
error
);
}
return
new
RSVP
.
Queue
()
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
.
push
(
function
()
{
return
callback
(
request
.
result
)
;
return
result
;
})
})
.
push
(
function
(
result
)
{
.
push
(
function
(
final_
result
)
{
request
.
result
.
close
();
canceller
();
resolve
(
result
);
resolve
(
final_
result
);
},
function
(
error
)
{
},
function
(
error
)
{
request
.
result
.
close
();
canceller
();
reject
(
error
);
reject
(
error
);
});
});
};
};
}
}
return
new
RSVP
.
Promise
(
resolver
);
return
new
RSVP
.
Promise
(
resolver
,
canceller
);
}
}
function
waitForTransaction
(
db
,
stores
,
flag
,
callback
)
{
function
waitForTransaction
(
db
,
stores
,
flag
,
callback
)
{
...
@@ -15001,14 +15029,8 @@ return new Parser;
...
@@ -15001,14 +15029,8 @@ return new Parser;
reject
(
error
);
reject
(
error
);
});
});
};
};
tx
.
onerror
=
function
(
error
)
{
tx
.
onerror
=
reject
;
canceller
();
tx
.
onabort
=
reject
;
reject
(
error
);
};
tx
.
onabort
=
function
(
evt
)
{
reject
(
evt
.
target
);
};
return
tx
;
}
}
return
new
RSVP
.
Promise
(
resolver
,
canceller
);
return
new
RSVP
.
Promise
(
resolver
,
canceller
);
}
}
...
...
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