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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Leo Le Bouter
erp5
Commits
fd432738
Commit
fd432738
authored
May 31, 2016
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update to renderJS 0.8.0
parent
8cbb0b1a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
36 additions
and
18 deletions
+36
-18
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_renderjs_js.js
...js_ui/PathTemplateItem/web_page_module/rjs_renderjs_js.js
+16
-7
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_renderjs_js.xml
...s_ui/PathTemplateItem/web_page_module/rjs_renderjs_js.xml
+2
-2
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/renderjs.js.js
...TemplateItem/portal_skins/erp5_xhtml_style/renderjs.js.js
+16
-7
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/renderjs.js.xml
...emplateItem/portal_skins/erp5_xhtml_style/renderjs.js.xml
+2
-2
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_renderjs_js.js
View file @
fd432738
...
@@ -736,6 +736,7 @@ if (typeof document.contains !== 'function') {
...
@@ -736,6 +736,7 @@ if (typeof document.contains !== 'function') {
loading_klass_promise
,
loading_klass_promise
,
renderJS
,
renderJS
,
Monitor
,
Monitor
,
scope_increment
=
0
,
isAbsoluteOrDataURL
=
new
RegExp
(
'
^(?:[a-z]+:)?//|data:
'
,
'
i
'
);
isAbsoluteOrDataURL
=
new
RegExp
(
'
^(?:[a-z]+:)?//|data:
'
,
'
i
'
);
/////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////
...
@@ -923,7 +924,7 @@ if (typeof document.contains !== 'function') {
...
@@ -923,7 +924,7 @@ if (typeof document.contains !== 'function') {
}
}
function
loadSubGadgetDOMDeclaration
(
g
)
{
function
loadSubGadgetDOMDeclaration
(
g
)
{
var
element_list
=
g
.
__element
.
querySelectorAll
(
'
[data-gadget-
scope
]
'
),
var
element_list
=
g
.
__element
.
querySelectorAll
(
'
[data-gadget-
url
]
'
),
element
,
element
,
promise_list
=
[],
promise_list
=
[],
scope
,
scope
,
...
@@ -936,7 +937,7 @@ if (typeof document.contains !== 'function') {
...
@@ -936,7 +937,7 @@ if (typeof document.contains !== 'function') {
scope
=
element
.
getAttribute
(
"
data-gadget-scope
"
);
scope
=
element
.
getAttribute
(
"
data-gadget-scope
"
);
url
=
element
.
getAttribute
(
"
data-gadget-url
"
);
url
=
element
.
getAttribute
(
"
data-gadget-url
"
);
sandbox
=
element
.
getAttribute
(
"
data-gadget-sandbox
"
);
sandbox
=
element
.
getAttribute
(
"
data-gadget-sandbox
"
);
if
(
(
scope
!==
null
)
&&
(
url
!==
null
)
)
{
if
(
url
!==
null
)
{
promise_list
.
push
(
g
.
declareGadget
(
url
,
{
promise_list
.
push
(
g
.
declareGadget
(
url
,
{
element
:
element
,
element
:
element
,
scope
:
scope
||
undefined
,
scope
:
scope
||
undefined
,
...
@@ -1366,7 +1367,8 @@ if (typeof document.contains !== 'function') {
...
@@ -1366,7 +1367,8 @@ if (typeof document.contains !== 'function') {
})
})
// Set the HTML context
// Set the HTML context
.
push
(
function
(
gadget_instance
)
{
.
push
(
function
(
gadget_instance
)
{
var
i
;
var
i
,
scope
;
// Trigger calling of all ready callback
// Trigger calling of all ready callback
function
ready_wrapper
()
{
function
ready_wrapper
()
{
return
gadget_instance
;
return
gadget_instance
;
...
@@ -1380,11 +1382,18 @@ if (typeof document.contains !== 'function') {
...
@@ -1380,11 +1382,18 @@ if (typeof document.contains !== 'function') {
}
}
// Store local reference to the gadget instance
// Store local reference to the gadget instance
if
(
options
.
scope
!==
undefined
)
{
scope
=
options
.
scope
;
parent_gadget
.
__sub_gadget_dict
[
options
.
scope
]
=
gadget_instance
;
if
(
scope
===
undefined
)
{
gadget_instance
.
__element
.
setAttribute
(
"
data-gadget-scope
"
,
scope
=
'
RJS_
'
+
scope_increment
;
options
.
scope
);
scope_increment
+=
1
;
while
(
parent_gadget
.
__sub_gadget_dict
.
hasOwnProperty
(
scope
))
{
scope
=
'
RJS_
'
+
scope_increment
;
scope_increment
+=
1
;
}
}
}
parent_gadget
.
__sub_gadget_dict
[
scope
]
=
gadget_instance
;
gadget_instance
.
__element
.
setAttribute
(
"
data-gadget-scope
"
,
scope
);
// Put some attribute to ease page layout comprehension
// Put some attribute to ease page layout comprehension
gadget_instance
.
__element
.
setAttribute
(
"
data-gadget-url
"
,
url
);
gadget_instance
.
__element
.
setAttribute
(
"
data-gadget-url
"
,
url
);
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_renderjs_js.xml
View file @
fd432738
...
@@ -230,7 +230,7 @@
...
@@ -230,7 +230,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
47.5311.8557.33604
</string>
</value>
<value>
<string>
9
51.36791.31778.27426
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -248,7 +248,7 @@
...
@@ -248,7 +248,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
14
56332463.9
</float>
<float>
14
64706675.31
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/renderjs.js.js
View file @
fd432738
...
@@ -736,6 +736,7 @@ if (typeof document.contains !== 'function') {
...
@@ -736,6 +736,7 @@ if (typeof document.contains !== 'function') {
loading_klass_promise
,
loading_klass_promise
,
renderJS
,
renderJS
,
Monitor
,
Monitor
,
scope_increment
=
0
,
isAbsoluteOrDataURL
=
new
RegExp
(
'
^(?:[a-z]+:)?//|data:
'
,
'
i
'
);
isAbsoluteOrDataURL
=
new
RegExp
(
'
^(?:[a-z]+:)?//|data:
'
,
'
i
'
);
/////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////
...
@@ -923,7 +924,7 @@ if (typeof document.contains !== 'function') {
...
@@ -923,7 +924,7 @@ if (typeof document.contains !== 'function') {
}
}
function
loadSubGadgetDOMDeclaration
(
g
)
{
function
loadSubGadgetDOMDeclaration
(
g
)
{
var
element_list
=
g
.
__element
.
querySelectorAll
(
'
[data-gadget-
scope
]
'
),
var
element_list
=
g
.
__element
.
querySelectorAll
(
'
[data-gadget-
url
]
'
),
element
,
element
,
promise_list
=
[],
promise_list
=
[],
scope
,
scope
,
...
@@ -936,7 +937,7 @@ if (typeof document.contains !== 'function') {
...
@@ -936,7 +937,7 @@ if (typeof document.contains !== 'function') {
scope
=
element
.
getAttribute
(
"
data-gadget-scope
"
);
scope
=
element
.
getAttribute
(
"
data-gadget-scope
"
);
url
=
element
.
getAttribute
(
"
data-gadget-url
"
);
url
=
element
.
getAttribute
(
"
data-gadget-url
"
);
sandbox
=
element
.
getAttribute
(
"
data-gadget-sandbox
"
);
sandbox
=
element
.
getAttribute
(
"
data-gadget-sandbox
"
);
if
(
(
scope
!==
null
)
&&
(
url
!==
null
)
)
{
if
(
url
!==
null
)
{
promise_list
.
push
(
g
.
declareGadget
(
url
,
{
promise_list
.
push
(
g
.
declareGadget
(
url
,
{
element
:
element
,
element
:
element
,
scope
:
scope
||
undefined
,
scope
:
scope
||
undefined
,
...
@@ -1366,7 +1367,8 @@ if (typeof document.contains !== 'function') {
...
@@ -1366,7 +1367,8 @@ if (typeof document.contains !== 'function') {
})
})
// Set the HTML context
// Set the HTML context
.
push
(
function
(
gadget_instance
)
{
.
push
(
function
(
gadget_instance
)
{
var
i
;
var
i
,
scope
;
// Trigger calling of all ready callback
// Trigger calling of all ready callback
function
ready_wrapper
()
{
function
ready_wrapper
()
{
return
gadget_instance
;
return
gadget_instance
;
...
@@ -1380,11 +1382,18 @@ if (typeof document.contains !== 'function') {
...
@@ -1380,11 +1382,18 @@ if (typeof document.contains !== 'function') {
}
}
// Store local reference to the gadget instance
// Store local reference to the gadget instance
if
(
options
.
scope
!==
undefined
)
{
scope
=
options
.
scope
;
parent_gadget
.
__sub_gadget_dict
[
options
.
scope
]
=
gadget_instance
;
if
(
scope
===
undefined
)
{
gadget_instance
.
__element
.
setAttribute
(
"
data-gadget-scope
"
,
scope
=
'
RJS_
'
+
scope_increment
;
options
.
scope
);
scope_increment
+=
1
;
while
(
parent_gadget
.
__sub_gadget_dict
.
hasOwnProperty
(
scope
))
{
scope
=
'
RJS_
'
+
scope_increment
;
scope_increment
+=
1
;
}
}
}
parent_gadget
.
__sub_gadget_dict
[
scope
]
=
gadget_instance
;
gadget_instance
.
__element
.
setAttribute
(
"
data-gadget-scope
"
,
scope
);
// Put some attribute to ease page layout comprehension
// Put some attribute to ease page layout comprehension
gadget_instance
.
__element
.
setAttribute
(
"
data-gadget-url
"
,
url
);
gadget_instance
.
__element
.
setAttribute
(
"
data-gadget-url
"
,
url
);
...
...
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/renderjs.js.xml
View file @
fd432738
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
_EtagSupport__etag
</string>
</key>
<key>
<string>
_EtagSupport__etag
</string>
</key>
<value>
<string>
ts
57002898.12
</string>
</value>
<value>
<string>
ts
64706750.51
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
__name__
</string>
</key>
<key>
<string>
__name__
</string>
</key>
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
size
</string>
</key>
<key>
<string>
size
</string>
</key>
<value>
<int>
7
6968
</int>
</value>
<value>
<int>
7
7245
</int>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
title
</string>
</key>
<key>
<string>
title
</string>
</key>
...
...
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