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
Léo-Paul Géneau
erp5
Commits
eed166fb
Commit
eed166fb
authored
Dec 17, 2019
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_xhtml_style/web_renderjs_ui] Update RSVP
parent
c219c40a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
259 additions
and
201 deletions
+259
-201
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_RSVP_js.js
...nderjs_ui/PathTemplateItem/web_page_module/rjs_RSVP_js.js
+48
-25
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_RSVP_js.xml
...derjs_ui/PathTemplateItem/web_page_module/rjs_RSVP_js.xml
+163
-151
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/rsvp.js.js
...SkinTemplateItem/portal_skins/erp5_xhtml_style/rsvp.js.js
+48
-25
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_RSVP_js.js
View file @
eed166fb
...
@@ -379,10 +379,10 @@ define("rsvp/events",
...
@@ -379,10 +379,10 @@ define("rsvp/events",
__exports__
.
EventTarget
=
EventTarget
;
__exports__
.
EventTarget
=
EventTarget
;
});
});
define
(
"
rsvp/hash
"
,
define
(
"
rsvp/hash
"
,
[
"
rsvp/
defer
"
,
"
exports
"
],
[
"
rsvp/
promise
"
,
"
exports
"
],
function
(
__dependency1__
,
__exports__
)
{
function
(
__dependency1__
,
__exports__
)
{
"
use strict
"
;
"
use strict
"
;
var
defer
=
__dependency1__
.
defer
;
var
Promise
=
__dependency1__
.
Promise
;
function
size
(
object
)
{
function
size
(
object
)
{
var
s
=
0
;
var
s
=
0
;
...
@@ -395,38 +395,61 @@ define("rsvp/hash",
...
@@ -395,38 +395,61 @@ define("rsvp/hash",
}
}
function
hash
(
promises
)
{
function
hash
(
promises
)
{
var
results
=
{},
deferred
=
defer
(),
remaining
=
size
(
promises
);
function
canceller
()
{
var
promise
,
key
;
for
(
key
in
promises
)
{
if
(
promises
.
hasOwnProperty
(
key
))
{
promise
=
promises
[
key
];
if
(
promise
&&
typeof
promise
.
then
===
'
function
'
&&
typeof
promise
.
cancel
===
'
function
'
)
{
promise
.
cancel
();
}
}
}
}
return
new
Promise
(
function
(
resolve
,
reject
)
{
var
results
=
{},
remaining
=
size
(
promises
),
promise
;
if
(
remaining
===
0
)
{
if
(
remaining
===
0
)
{
deferred
.
resolve
({}
);
resolve
(
results
);
}
}
var
resolver
=
function
(
prop
)
{
function
resolver
(
key
)
{
return
function
(
value
)
{
return
function
(
value
)
{
resolveAll
(
prop
,
value
);
resolveAll
(
key
,
value
);
};
};
};
}
var
resolveAll
=
function
(
prop
,
value
)
{
function
resolveAll
(
key
,
value
)
{
results
[
prop
]
=
value
;
results
[
key
]
=
value
;
if
(
--
remaining
===
0
)
{
if
(
--
remaining
===
0
)
{
deferred
.
resolve
(
results
);
resolve
(
results
);
}
}
}
};
var
rejectAll
=
function
(
error
)
{
function
cancelAll
(
rejectionValue
)
{
deferred
.
reject
(
error
);
reject
(
rejectionValue
);
};
canceller
();
}
for
(
var
prop
in
promises
)
{
for
(
var
prop
in
promises
)
{
if
(
promises
[
prop
]
&&
typeof
promises
[
prop
].
then
===
'
function
'
)
{
promise
=
promises
[
prop
];
promises
[
prop
].
then
(
resolver
(
prop
),
rejectAll
);
if
(
promise
&&
typeof
promise
.
then
===
'
function
'
)
{
promise
.
then
(
resolver
(
prop
),
cancelAll
);
}
else
{
}
else
{
resolveAll
(
prop
,
promises
[
prop
]
);
resolveAll
(
prop
,
promise
);
}
}
}
}
return
deferred
.
promise
;
},
canceller
);
}
}
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_RSVP_js.xml
View file @
eed166fb
...
@@ -148,11 +148,13 @@
...
@@ -148,11 +148,13 @@
</record>
</record>
<record
id=
"3"
aka=
"AAAAAAAAAAM="
>
<record
id=
"3"
aka=
"AAAAAAAAAAM="
>
<pickle>
<pickle>
<global
name=
"WorkflowHistoryList"
module=
"Products.ERP5Type.
patches.WorkflowTool
"
/>
<global
name=
"WorkflowHistoryList"
module=
"Products.ERP5Type.
Workflow
"
/>
</pickle>
</pickle>
<pickle>
<pickle>
<tuple>
<dictionary>
<none/>
<item>
<key>
<string>
_log
</string>
</key>
<value>
<list>
<list>
<dictionary>
<dictionary>
<item>
<item>
...
@@ -196,16 +198,20 @@
...
@@ -196,16 +198,20 @@
</item>
</item>
</dictionary>
</dictionary>
</list>
</list>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</pickle>
</record>
</record>
<record
id=
"4"
aka=
"AAAAAAAAAAQ="
>
<record
id=
"4"
aka=
"AAAAAAAAAAQ="
>
<pickle>
<pickle>
<global
name=
"WorkflowHistoryList"
module=
"Products.ERP5Type.
patches.WorkflowTool
"
/>
<global
name=
"WorkflowHistoryList"
module=
"Products.ERP5Type.
Workflow
"
/>
</pickle>
</pickle>
<pickle>
<pickle>
<tuple>
<dictionary>
<none/>
<item>
<key>
<string>
_log
</string>
</key>
<value>
<list>
<list>
<dictionary>
<dictionary>
<item>
<item>
...
@@ -228,7 +234,7 @@
...
@@ -228,7 +234,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
967.36619.48069.16759
</string>
</value>
<value>
<string>
977.38881.34981.23125
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -246,7 +252,7 @@
...
@@ -246,7 +252,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1526454424.27
</float>
<float>
1576579789.68
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
@@ -255,16 +261,20 @@
...
@@ -255,16 +261,20 @@
</item>
</item>
</dictionary>
</dictionary>
</list>
</list>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</pickle>
</record>
</record>
<record
id=
"5"
aka=
"AAAAAAAAAAU="
>
<record
id=
"5"
aka=
"AAAAAAAAAAU="
>
<pickle>
<pickle>
<global
name=
"WorkflowHistoryList"
module=
"Products.ERP5Type.
patches.WorkflowTool
"
/>
<global
name=
"WorkflowHistoryList"
module=
"Products.ERP5Type.
Workflow
"
/>
</pickle>
</pickle>
<pickle>
<pickle>
<tuple>
<dictionary>
<none/>
<item>
<key>
<string>
_log
</string>
</key>
<value>
<list>
<list>
<dictionary>
<dictionary>
<item>
<item>
...
@@ -312,7 +322,9 @@
...
@@ -312,7 +322,9 @@
</item>
</item>
</dictionary>
</dictionary>
</list>
</list>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</pickle>
</record>
</record>
</ZopeData>
</ZopeData>
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/rsvp.js.js
View file @
eed166fb
...
@@ -379,10 +379,10 @@ define("rsvp/events",
...
@@ -379,10 +379,10 @@ define("rsvp/events",
__exports__
.
EventTarget
=
EventTarget
;
__exports__
.
EventTarget
=
EventTarget
;
});
});
define
(
"
rsvp/hash
"
,
define
(
"
rsvp/hash
"
,
[
"
rsvp/
defer
"
,
"
exports
"
],
[
"
rsvp/
promise
"
,
"
exports
"
],
function
(
__dependency1__
,
__exports__
)
{
function
(
__dependency1__
,
__exports__
)
{
"
use strict
"
;
"
use strict
"
;
var
defer
=
__dependency1__
.
defer
;
var
Promise
=
__dependency1__
.
Promise
;
function
size
(
object
)
{
function
size
(
object
)
{
var
s
=
0
;
var
s
=
0
;
...
@@ -395,38 +395,61 @@ define("rsvp/hash",
...
@@ -395,38 +395,61 @@ define("rsvp/hash",
}
}
function
hash
(
promises
)
{
function
hash
(
promises
)
{
var
results
=
{},
deferred
=
defer
(),
remaining
=
size
(
promises
);
function
canceller
()
{
var
promise
,
key
;
for
(
key
in
promises
)
{
if
(
promises
.
hasOwnProperty
(
key
))
{
promise
=
promises
[
key
];
if
(
promise
&&
typeof
promise
.
then
===
'
function
'
&&
typeof
promise
.
cancel
===
'
function
'
)
{
promise
.
cancel
();
}
}
}
}
return
new
Promise
(
function
(
resolve
,
reject
)
{
var
results
=
{},
remaining
=
size
(
promises
),
promise
;
if
(
remaining
===
0
)
{
if
(
remaining
===
0
)
{
deferred
.
resolve
({}
);
resolve
(
results
);
}
}
var
resolver
=
function
(
prop
)
{
function
resolver
(
key
)
{
return
function
(
value
)
{
return
function
(
value
)
{
resolveAll
(
prop
,
value
);
resolveAll
(
key
,
value
);
};
};
};
}
var
resolveAll
=
function
(
prop
,
value
)
{
function
resolveAll
(
key
,
value
)
{
results
[
prop
]
=
value
;
results
[
key
]
=
value
;
if
(
--
remaining
===
0
)
{
if
(
--
remaining
===
0
)
{
deferred
.
resolve
(
results
);
resolve
(
results
);
}
}
}
};
var
rejectAll
=
function
(
error
)
{
function
cancelAll
(
rejectionValue
)
{
deferred
.
reject
(
error
);
reject
(
rejectionValue
);
};
canceller
();
}
for
(
var
prop
in
promises
)
{
for
(
var
prop
in
promises
)
{
if
(
promises
[
prop
]
&&
typeof
promises
[
prop
].
then
===
'
function
'
)
{
promise
=
promises
[
prop
];
promises
[
prop
].
then
(
resolver
(
prop
),
rejectAll
);
if
(
promise
&&
typeof
promise
.
then
===
'
function
'
)
{
promise
.
then
(
resolver
(
prop
),
cancelAll
);
}
else
{
}
else
{
resolveAll
(
prop
,
promises
[
prop
]
);
resolveAll
(
prop
,
promise
);
}
}
}
}
return
deferred
.
promise
;
},
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