Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5-Boxiang
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
Hamza
erp5-Boxiang
Commits
7774b4de
Commit
7774b4de
authored
Nov 24, 2016
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_xhtml_style/erp5_web_renderjs_ui: update to renderJS 0.12.1
parent
bc39681b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
24 deletions
+32
-24
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_renderjs_js.js
...js_ui/PathTemplateItem/web_page_module/rjs_renderjs_js.js
+15
-11
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
+15
-11
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_renderjs_js.js
View file @
7774b4de
...
@@ -1120,7 +1120,6 @@ if (typeof document.contains !== 'function') {
...
@@ -1120,7 +1120,6 @@ if (typeof document.contains !== 'function') {
};
};
RenderJSGadget
.
setState
=
function
(
state_dict
)
{
RenderJSGadget
.
setState
=
function
(
state_dict
)
{
var
json_state
=
JSON
.
stringify
(
state_dict
);
var
json_state
=
JSON
.
stringify
(
state_dict
);
this
.
prototype
.
__json_state
=
json_state
;
return
this
.
ready
(
function
()
{
return
this
.
ready
(
function
()
{
this
.
state
=
JSON
.
parse
(
json_state
);
this
.
state
=
JSON
.
parse
(
json_state
);
});
});
...
@@ -1251,10 +1250,19 @@ if (typeof document.contains !== 'function') {
...
@@ -1251,10 +1250,19 @@ if (typeof document.contains !== 'function') {
.
declareMethod
(
'
changeState
'
,
function
(
state_dict
)
{
.
declareMethod
(
'
changeState
'
,
function
(
state_dict
)
{
var
key
,
var
key
,
modified
=
false
,
modified
=
false
,
modification_dict
=
{},
previous_cancelled
=
this
.
hasOwnProperty
(
'
__modification_dict
'
),
modification_dict
,
context
=
this
;
context
=
this
;
if
(
previous_cancelled
)
{
modification_dict
=
this
.
__modification_dict
;
modified
=
true
;
}
else
{
modification_dict
=
{};
this
.
__modification_dict
=
modification_dict
;
}
for
(
key
in
state_dict
)
{
for
(
key
in
state_dict
)
{
if
(
state_dict
[
key
]
!==
this
.
state
[
key
])
{
if
(
state_dict
.
hasOwnProperty
(
key
)
&&
(
state_dict
[
key
]
!==
this
.
state
[
key
]))
{
this
.
state
[
key
]
=
state_dict
[
key
];
this
.
state
[
key
]
=
state_dict
[
key
];
modification_dict
[
key
]
=
state_dict
[
key
];
modification_dict
[
key
]
=
state_dict
[
key
];
modified
=
true
;
modified
=
true
;
...
@@ -1265,13 +1273,9 @@ if (typeof document.contains !== 'function') {
...
@@ -1265,13 +1273,9 @@ if (typeof document.contains !== 'function') {
.
push
(
function
()
{
.
push
(
function
()
{
return
context
.
__state_change_callback
(
modification_dict
);
return
context
.
__state_change_callback
(
modification_dict
);
})
})
.
push
(
undefined
,
function
(
error
)
{
.
push
(
function
(
result
)
{
if
(
context
.
__json_state
!==
undefined
)
{
delete
context
.
__modification_dict
;
context
.
state
=
JSON
.
parse
(
context
.
__json_state
);
return
result
;
}
else
{
context
.
state
=
{};
}
throw
error
;
});
});
}
}
});
});
...
@@ -2345,4 +2349,4 @@ if (typeof document.contains !== 'function') {
...
@@ -2345,4 +2349,4 @@ if (typeof document.contains !== 'function') {
bootstrap
();
bootstrap
();
}(
document
,
window
,
RSVP
,
DOMParser
,
Channel
,
MutationObserver
,
Node
,
}(
document
,
window
,
RSVP
,
DOMParser
,
Channel
,
MutationObserver
,
Node
,
FileReader
,
Blob
,
navigator
,
Event
));
FileReader
,
Blob
,
navigator
,
Event
));
\ No newline at end of file
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_renderjs_js.xml
View file @
7774b4de
...
@@ -230,7 +230,7 @@
...
@@ -230,7 +230,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
955.
29626.47611.2481
4
</string>
</value>
<value>
<string>
955.
32062.5607.259
4
</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>
1479
897063.0
5
</float>
<float>
1479
983103.5
5
</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 @
7774b4de
...
@@ -1120,7 +1120,6 @@ if (typeof document.contains !== 'function') {
...
@@ -1120,7 +1120,6 @@ if (typeof document.contains !== 'function') {
};
};
RenderJSGadget
.
setState
=
function
(
state_dict
)
{
RenderJSGadget
.
setState
=
function
(
state_dict
)
{
var
json_state
=
JSON
.
stringify
(
state_dict
);
var
json_state
=
JSON
.
stringify
(
state_dict
);
this
.
prototype
.
__json_state
=
json_state
;
return
this
.
ready
(
function
()
{
return
this
.
ready
(
function
()
{
this
.
state
=
JSON
.
parse
(
json_state
);
this
.
state
=
JSON
.
parse
(
json_state
);
});
});
...
@@ -1251,10 +1250,19 @@ if (typeof document.contains !== 'function') {
...
@@ -1251,10 +1250,19 @@ if (typeof document.contains !== 'function') {
.
declareMethod
(
'
changeState
'
,
function
(
state_dict
)
{
.
declareMethod
(
'
changeState
'
,
function
(
state_dict
)
{
var
key
,
var
key
,
modified
=
false
,
modified
=
false
,
modification_dict
=
{},
previous_cancelled
=
this
.
hasOwnProperty
(
'
__modification_dict
'
),
modification_dict
,
context
=
this
;
context
=
this
;
if
(
previous_cancelled
)
{
modification_dict
=
this
.
__modification_dict
;
modified
=
true
;
}
else
{
modification_dict
=
{};
this
.
__modification_dict
=
modification_dict
;
}
for
(
key
in
state_dict
)
{
for
(
key
in
state_dict
)
{
if
(
state_dict
[
key
]
!==
this
.
state
[
key
])
{
if
(
state_dict
.
hasOwnProperty
(
key
)
&&
(
state_dict
[
key
]
!==
this
.
state
[
key
]))
{
this
.
state
[
key
]
=
state_dict
[
key
];
this
.
state
[
key
]
=
state_dict
[
key
];
modification_dict
[
key
]
=
state_dict
[
key
];
modification_dict
[
key
]
=
state_dict
[
key
];
modified
=
true
;
modified
=
true
;
...
@@ -1265,13 +1273,9 @@ if (typeof document.contains !== 'function') {
...
@@ -1265,13 +1273,9 @@ if (typeof document.contains !== 'function') {
.
push
(
function
()
{
.
push
(
function
()
{
return
context
.
__state_change_callback
(
modification_dict
);
return
context
.
__state_change_callback
(
modification_dict
);
})
})
.
push
(
undefined
,
function
(
error
)
{
.
push
(
function
(
result
)
{
if
(
context
.
__json_state
!==
undefined
)
{
delete
context
.
__modification_dict
;
context
.
state
=
JSON
.
parse
(
context
.
__json_state
);
return
result
;
}
else
{
context
.
state
=
{};
}
throw
error
;
});
});
}
}
});
});
...
@@ -2345,4 +2349,4 @@ if (typeof document.contains !== 'function') {
...
@@ -2345,4 +2349,4 @@ if (typeof document.contains !== 'function') {
bootstrap
();
bootstrap
();
}(
document
,
window
,
RSVP
,
DOMParser
,
Channel
,
MutationObserver
,
Node
,
}(
document
,
window
,
RSVP
,
DOMParser
,
Channel
,
MutationObserver
,
Node
,
FileReader
,
Blob
,
navigator
,
Event
));
FileReader
,
Blob
,
navigator
,
Event
));
\ No newline at end of file
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