Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jobily
OrchardCore
提交
6d996e18
OrchardCore
项目概览
jobily
/
OrchardCore
上一次同步 12 个月
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
OrchardCore
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
6d996e18
编写于
9月 26, 2023
作者:
M
Mike Alhayek
提交者:
GitHub
9月 26, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add a fallback function to crypto.randomUUID (#14371)
上级
eb5edffa
变更
17
展开全部
隐藏空白更改
内联
并排
Showing
17 changed file
with
52 addition
and
29 deletion
+52
-29
src/OrchardCore.Modules/OrchardCore.Media/Assets.json
src/OrchardCore.Modules/OrchardCore.Media/Assets.json
+6
-1
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/app/MediaApp/app.js
...e.Modules/OrchardCore.Media/Assets/js/app/MediaApp/app.js
+0
-0
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/app/MediaApp/fileupload.js
...es/OrchardCore.Media/Assets/js/app/MediaApp/fileupload.js
+3
-3
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/app/MediaApp/folderComponent.js
...chardCore.Media/Assets/js/app/MediaApp/folderComponent.js
+0
-0
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/app/MediaApp/mediaItemsGridComponent.js
...e.Media/Assets/js/app/MediaApp/mediaItemsGridComponent.js
+0
-0
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/app/MediaApp/mediaItemsTableComponent.js
....Media/Assets/js/app/MediaApp/mediaItemsTableComponent.js
+0
-0
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/app/MediaApp/pagerComponent.js
...rchardCore.Media/Assets/js/app/MediaApp/pagerComponent.js
+0
-0
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/app/MediaApp/sortIndicatorComponent.js
...re.Media/Assets/js/app/MediaApp/sortIndicatorComponent.js
+0
-0
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/app/MediaField/attachedMediaField.js
...Core.Media/Assets/js/app/MediaField/attachedMediaField.js
+16
-16
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/app/MediaField/mediaFieldThumbsContainer.js
...dia/Assets/js/app/MediaField/mediaFieldThumbsContainer.js
+0
-0
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/app/MediaField/mediafield.js
.../OrchardCore.Media/Assets/js/app/MediaField/mediafield.js
+0
-0
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/app/MediaField/mediafieldsAppsArray.js
...re.Media/Assets/js/app/MediaField/mediafieldsAppsArray.js
+0
-0
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/app/Shared/uploadComponent.js
...OrchardCore.Media/Assets/js/app/Shared/uploadComponent.js
+0
-0
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/app/Shared/uploadListComponent.js
...ardCore.Media/Assets/js/app/Shared/uploadListComponent.js
+5
-5
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/helpers.js
...rchardCore.Modules/OrchardCore.Media/Assets/js/helpers.js
+9
-0
src/OrchardCore.Modules/OrchardCore.Media/wwwroot/Scripts/media.js
...rdCore.Modules/OrchardCore.Media/wwwroot/Scripts/media.js
+12
-3
src/OrchardCore.Modules/OrchardCore.Media/wwwroot/Scripts/media.min.js
...re.Modules/OrchardCore.Media/wwwroot/Scripts/media.min.js
+1
-1
未找到文件。
src/OrchardCore.Modules/OrchardCore.Media/Assets.json
浏览文件 @
6d996e18
...
...
@@ -11,7 +11,12 @@
"inputs"
:
[
"./node_modules/blueimp-file-upload/js/jquery.fileupload.js"
,
"./node_modules/blueimp-file-upload/js/jquery.iframe-transport.js"
,
"Assets/js/**/*.js"
"Assets/js/helpers.js"
,
"Assets/js/app/**/*.js"
],
"watch"
:
[
"Assets/js/helpers.js"
,
"Assets/js/app/**/*.js"
],
"output"
:
"wwwroot/Scripts/media.js"
}
...
...
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/MediaApp/app.js
→
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/
app/
MediaApp/app.js
浏览文件 @
6d996e18
文件已移动
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/MediaApp/fileupload.js
→
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/
app/
MediaApp/fileupload.js
浏览文件 @
6d996e18
$
(
document
).
on
(
'
mediaApp:ready
'
,
function
()
{
var
chunkedFileUploadId
=
crypto
.
randomUUID
();
var
chunkedFileUploadId
=
randomUUID
();
$
(
'
#fileupload
'
)
.
fileupload
({
...
...
@@ -54,5 +54,5 @@ $(document).bind('dragover', function (e) {
window
.
dropZoneTimeout
=
null
;
dropZone
.
removeClass
(
'
in
'
);
},
100
);
}
});
\ No newline at end of file
}
});
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/MediaApp/folderComponent.js
→
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/
app/
MediaApp/folderComponent.js
浏览文件 @
6d996e18
文件已移动
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/MediaApp/mediaItemsGridComponent.js
→
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/
app/
MediaApp/mediaItemsGridComponent.js
浏览文件 @
6d996e18
文件已移动
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/MediaApp/mediaItemsTableComponent.js
→
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/
app/
MediaApp/mediaItemsTableComponent.js
浏览文件 @
6d996e18
文件已移动
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/MediaApp/pagerComponent.js
→
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/
app/
MediaApp/pagerComponent.js
浏览文件 @
6d996e18
文件已移动
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/MediaApp/sortIndicatorComponent.js
→
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/
app/
MediaApp/sortIndicatorComponent.js
浏览文件 @
6d996e18
文件已移动
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/MediaField/attachedMediaField.js
→
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/
app/
MediaField/attachedMediaField.js
浏览文件 @
6d996e18
...
...
@@ -129,7 +129,7 @@ function initializeAttachedMediaField(el, idOfUploadButton, uploadAction, mediaI
var
selector
=
'
#
'
+
idOfUploadButton
;
var
editorId
=
mediaFieldEditor
.
attr
(
'
id
'
);
var
chunkedFileUploadId
=
crypto
.
randomUUID
();
var
chunkedFileUploadId
=
randomUUID
();
$
(
selector
)
.
fileupload
({
...
...
@@ -160,7 +160,7 @@ function initializeAttachedMediaField(el, idOfUploadButton, uploadAction, mediaI
done
:
function
(
e
,
data
)
{
var
newMediaItems
=
[];
var
errormsg
=
""
;
if
(
data
.
result
.
files
.
length
>
0
)
{
for
(
var
i
=
0
;
i
<
data
.
result
.
files
.
length
;
i
++
)
{
data
.
result
.
files
[
i
].
isNew
=
true
;
...
...
@@ -173,7 +173,7 @@ function initializeAttachedMediaField(el, idOfUploadButton, uploadAction, mediaI
errormsg
+=
data
.
result
.
files
[
i
].
error
+
"
\n
"
;
}
}
if
(
errormsg
!==
""
)
{
alert
(
errormsg
);
return
;
...
...
@@ -247,29 +247,29 @@ function initializeAttachedMediaField(el, idOfUploadButton, uploadAction, mediaI
cancelMediaTextModal
:
function
(
event
)
{
this
.
mediaTextModal
.
hide
();
this
.
selectedMedia
.
mediaText
=
this
.
backupMediaText
;
},
},
showAnchorModal
:
function
(
event
)
{
this
.
anchoringModal
=
new
bootstrap
.
Modal
(
this
.
$refs
.
anchoringModal
);
this
.
anchoringModal
.
show
();
// Cause a refresh to recalc heights.
this
.
selectedMedia
.
anchor
=
{
x
:
this
.
selectedMedia
.
anchor
.
x
,
y
:
this
.
selectedMedia
.
anchor
.
y
x
:
this
.
selectedMedia
.
anchor
.
x
,
y
:
this
.
selectedMedia
.
anchor
.
y
}
this
.
backupAnchor
=
this
.
selectedMedia
.
anchor
;
},
},
cancelAnchoringModal
:
function
(
event
)
{
this
.
anchoringModal
.
hide
();
this
.
selectedMedia
.
anchor
=
this
.
backupAnchor
;
},
},
resetAnchor
:
function
(
event
)
{
this
.
selectedMedia
.
anchor
=
{
x
:
0.5
,
y
:
0.5
};
},
onAnchorDrop
:
function
(
event
)
{
},
onAnchorDrop
:
function
(
event
)
{
var
image
=
this
.
$refs
.
anchorImage
;
this
.
selectedMedia
.
anchor
=
{
x
:
event
.
offsetX
/
image
.
clientWidth
,
y
:
event
.
offsetY
/
image
.
clientHeight
x
:
event
.
offsetX
/
image
.
clientWidth
,
y
:
event
.
offsetY
/
image
.
clientHeight
}
},
anchorLeft
:
function
()
{
...
...
@@ -286,7 +286,7 @@ function initializeAttachedMediaField(el, idOfUploadButton, uploadAction, mediaI
}
else
{
return
'
0
'
;
}
},
},
anchorTop
:
function
()
{
if
(
this
.
$refs
.
anchorImage
&&
this
.
selectedMedia
)
{
var
position
=
this
.
selectedMedia
.
anchor
.
y
*
this
.
$refs
.
anchorImage
.
clientHeight
;
...
...
@@ -306,7 +306,7 @@ function initializeAttachedMediaField(el, idOfUploadButton, uploadAction, mediaI
x
:
event
.
offsetX
/
image
.
clientWidth
,
y
:
event
.
offsetY
/
image
.
clientHeight
}
},
},
addMediaFiles
:
function
(
files
)
{
if
((
files
.
length
>
1
)
&&
(
allowMultiple
===
false
))
{
alert
(
$
(
'
#onlyOneItemMessage
'
).
val
());
...
...
@@ -330,11 +330,11 @@ function initializeAttachedMediaField(el, idOfUploadButton, uploadAction, mediaI
watch
:
{
mediaItems
:
{
deep
:
true
,
handler
()
{
handler
()
{
// Trigger preview rendering
setTimeout
(
function
()
{
$
(
document
).
trigger
(
'
contentpreview:render
'
);
},
100
);
}
},
},
currentPrefs
:
function
(
newPrefs
)
{
localStorage
.
setItem
(
'
mediaFieldPrefs
'
,
JSON
.
stringify
(
newPrefs
));
}
...
...
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/MediaField/mediaFieldThumbsContainer.js
→
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/
app/
MediaField/mediaFieldThumbsContainer.js
浏览文件 @
6d996e18
文件已移动
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/MediaField/mediafield.js
→
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/
app/
MediaField/mediafield.js
浏览文件 @
6d996e18
文件已移动
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/MediaField/mediafieldsAppsArray.js
→
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/
app/
MediaField/mediafieldsAppsArray.js
浏览文件 @
6d996e18
文件已移动
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/Shared/uploadComponent.js
→
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/
app/
Shared/uploadComponent.js
浏览文件 @
6d996e18
文件已移动
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/Shared/uploadListComponent.js
→
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/
app/
Shared/uploadListComponent.js
浏览文件 @
6d996e18
...
...
@@ -50,10 +50,10 @@ Vue.component('uploadList', {
var
self
=
this
;
var
uploadInput
=
document
.
getElementById
(
self
.
uploadInputId
??
'
fileupload
'
);
$
(
uploadInput
).
bind
(
'
fileuploadadd
'
,
function
(
e
,
data
)
{
if
(
!
data
.
files
)
{
if
(
!
data
.
files
)
{
return
;
}
data
.
files
.
forEach
(
function
(
newFile
)
{
data
.
files
.
forEach
(
function
(
newFile
)
{
var
alreadyInList
=
self
.
files
.
some
(
function
(
f
)
{
return
f
.
name
==
newFile
.
name
;
});
...
...
@@ -62,8 +62,8 @@ Vue.component('uploadList', {
self
.
files
.
push
({
name
:
newFile
.
name
,
percentage
:
0
,
errorMessage
:
''
});
}
else
{
console
.
error
(
'
A file with the same name is already on the queue:
'
+
newFile
.
name
);
}
});
}
});
});
bus
.
$on
(
'
removalRequest
'
,
function
(
fileUpload
)
{
...
...
@@ -88,7 +88,7 @@ Vue.component('uploadList', {
this
.
expanded
=
false
;
}
},
clearErrors
:
function
()
{
clearErrors
:
function
()
{
this
.
files
=
this
.
files
.
filter
(
function
(
item
)
{
return
item
.
errorMessage
==
''
;
});
...
...
src/OrchardCore.Modules/OrchardCore.Media/Assets/js/helpers.js
0 → 100644
浏览文件 @
6d996e18
function
randomUUID
()
{
if
(
typeof
crypto
===
'
object
'
&&
typeof
crypto
.
randomUUID
===
'
function
'
)
{
return
crypto
.
randomUUID
();
}
return
([
1
e7
]
+
-
1
e3
+
-
4
e3
+
-
8
e3
+
-
1
e11
).
replace
(
/
[
018
]
/g
,
c
=>
(
c
^
crypto
.
getRandomValues
(
new
Uint8Array
(
1
))[
0
]
&
15
>>
c
/
4
).
toString
(
16
)
);
}
src/OrchardCore.Modules/OrchardCore.Media/wwwroot/Scripts/media.js
浏览文件 @
6d996e18
此差异已折叠。
点击以展开。
src/OrchardCore.Modules/OrchardCore.Media/wwwroot/Scripts/media.min.js
浏览文件 @
6d996e18
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录