Skip to content

Commit f2d3f89

Browse files
committed
Fix EZP-26995: eZ Multi-upload is broken over HTTPS (#17)
(cherry picked from commit 2ae76ed)
1 parent 806019b commit f2d3f89

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

design/standard/templates/ezmultiupload/upload.tpl

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
{ezscript_require( array( 'ezjsc::yui3', 'ezjsc::yui3io') )}
22
{ezcss_require( 'ezmultiupload.css' )}
33
<script type="text/javascript">
4-
YUI({ldelim}
5-
modules: {ldelim}
6-
ezmultiupload: {ldelim}
7-
type: 'js',
8-
fullpath: '{"javascript/ezmultiupload.js"|ezdesign( 'no' )}',
9-
requires: ["uploader", "node", "event-base", "json-parse", "anim"],
10-
after: ["uploader"],
11-
skinnable: false
12-
{rdelim}
13-
{rdelim}
14-
{rdelim}).use('ezmultiupload', function (Y) {ldelim}
15-
Y.ez.MultiUpload.cfg = {ldelim}
16-
uploadURL: "{concat( 'ezmultiupload/upload/', $parent_node.node_id )|ezurl( 'no' )}",
17-
uploadVars: {ldelim}
18-
'{$session_name}': '{$session_id}',
19-
//'XDEBUG_SESSION_START': 'XDEBUG_ECLIPSE',
20-
'UploadButton': 'Upload',
21-
'ezxform_token': '@$ezxFormToken@'
4+
(function(config){ldelim}
5+
config['modules']['ezmultiupload'] = {ldelim}
6+
type: 'js',
7+
fullpath: '{"javascript/ezmultiupload.js"|ezdesign( 'no' )}',
8+
requires: ["uploader", "node", "event-base", "json-parse", "anim"],
9+
after: ["uploader"],
10+
skinnable: false
11+
{rdelim};
12+
13+
YUI(config).use('ezmultiupload', function (Y) {ldelim}
14+
Y.ez.MultiUpload.cfg = {ldelim}
15+
uploadURL: "{concat( 'ezmultiupload/upload/', $parent_node.node_id )|ezurl( 'no' )}",
16+
uploadVars: {ldelim}
17+
'{$session_name}': '{$session_id}',
18+
//'XDEBUG_SESSION_START': 'XDEBUG_ECLIPSE',
19+
'UploadButton': 'Upload',
20+
'ezxform_token': '@$ezxFormToken@'
2221
{rdelim},
23-
allFilesRecived: "{'All files received.'|i18n('extension/ezmultiupload')|wash(javascript)}",
24-
uploadCanceled: "{'Upload canceled.'|i18n('extension/ezmultiupload')|wash(javascript)}",
25-
thumbnailCreated: "{'Thumbnail created.'|i18n('extension/ezmultiupload')|wash(javascript)}",
26-
multipleFiles: true
22+
allFilesRecived: "{'All files received.'|i18n('extension/ezmultiupload')|wash(javascript)}",
23+
uploadCanceled: "{'Upload canceled.'|i18n('extension/ezmultiupload')|wash(javascript)}",
24+
thumbnailCreated: "{'Thumbnail created.'|i18n('extension/ezmultiupload')|wash(javascript)}",
25+
multipleFiles: true
2726
{rdelim};
28-
Y.ez.MultiUpload.init();
29-
{rdelim});
27+
Y.ez.MultiUpload.init();
28+
{rdelim});
29+
{rdelim})(YUI3_config);
3030
</script>
3131

3232
<div class="border-box">

0 commit comments

Comments
 (0)