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
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
62aecfd0
Commit
62aecfd0
authored
Oct 01, 2020
by
Romain Courteaud
🐙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WIP erp5_web_renderjs_ui: race condition on maximize
parent
9ea8c4e1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
17 deletions
+18
-17
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.js
...mplateItem/web_page_module/rjs_gadget_erp5_launcher_js.js
+16
-15
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.xml
...plateItem/web_page_module/rjs_gadget_erp5_launcher_js.xml
+2
-2
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.js
View file @
62aecfd0
...
...
@@ -249,24 +249,22 @@
}
hideDesktopPanel
(
gadget
,
maximize
);
if
(
maximize
)
{
return
route
(
gadget
,
'
header
'
,
'
setButtonTitle
'
,
[
{
gadget
.
deferSetButtonTitle
(
{
icon
:
"
compress
"
,
action
:
"
maximize
"
}])
.
push
(
function
()
{
gadget
.
props
.
deferred_minimize
=
new
RSVP
.
Promise
(
function
()
{
return
;
},
function
()
{
// Wait for cancellation
// return triggerMaximize(gadget, false);
hideDesktopPanel
(
gadget
,
false
);
return
route
(
gadget
,
'
header
'
,
'
setButtonTitle
'
,
[{}]);
}
);
return
gadget
.
props
.
deferred_minimize
;
});
});
gadget
.
props
.
deferred_minimize
=
new
RSVP
.
Promise
(
function
()
{
return
;
},
function
()
{
// Wait for cancellation
// return triggerMaximize(gadget, false);
hideDesktopPanel
(
gadget
,
false
);
gadget
.
deferSetButtonTitle
({});
}
);
return
gadget
.
props
.
deferred_minimize
;
}
return
route
(
gadget
,
'
header
'
,
'
setButtonTitle
'
,
[{}]
);
gadget
.
deferSetButtonTitle
({}
);
}
//////////////////////////////////////////
...
...
@@ -338,6 +336,9 @@
}
rJS
(
window
)
.
declareJob
(
'
deferSetButtonTitle
'
,
function
(
options
)
{
return
route
(
this
,
'
header
'
,
'
setButtonTitle
'
,
[
options
]);
})
// Add mutex protected defered gadget loader.
// Multiple mutex are needed, to not prevent concurrent loading on
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.xml
View file @
62aecfd0
...
...
@@ -234,7 +234,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
98
2.26879.4100.14950
</string>
</value>
<value>
<string>
98
6.32404.49746.11571
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -252,7 +252,7 @@
</tuple>
<state>
<tuple>
<float>
1
585300343.5
5
</float>
<float>
1
601565748.0
5
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
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