Skip to content

C
check
Commit f74b44e8 by Takuya Ogawa
Options

#26929 Chrome動画プレイヤーのダウンロードボタン非表示

parent 4eb6ba68
Showing with 14 additions and 14 deletions
abvw-preview/js/contentview.js
...@@ -2220,13 +2220,13 @@ function handleForContentTypeVideo(resourceUrl){ ...@@ -2220,13 +2220,13 @@ function handleForContentTypeVideo(resourceUrl){
$container.html(''); $container.html('');
if (ClientData.userOpt_musicMode() == "1") { if (ClientData.userOpt_musicMode() == "1") {
$container.html('<video id="content_video" autoplay="true" loop="true" controls="controls" style="position: absolute; width: 100%; height: 100%;">' $container.html('<video id="content_video" autoplay="true" loop="true" controls="controls" controlsList="nodownload" style="position: absolute; width: 100%; height: 100%;">'
+ ' <source src="' + resourceUrl + '" type="video/mp4"> ' + ' <source src="' + resourceUrl + '" type="video/mp4"> '
+ '</video>' + '</video>'
); );
} }
else { else {
$container.html('<video id="content_video" autoplay="true" controls="controls" style="position: absolute; width: 100%; height: 100%;">' $container.html('<video id="content_video" autoplay="true" controls="controls" controlsList="nodownload" style="position: absolute; width: 100%; height: 100%;">'
+ ' <source src="' + resourceUrl + '" type="video/mp4"> ' + ' <source src="' + resourceUrl + '" type="video/mp4"> '
+ '</video>' + '</video>'
); );
...@@ -4656,7 +4656,7 @@ function showVideoObject(x, y, width, height, src, isFullscreen) { ...@@ -4656,7 +4656,7 @@ function showVideoObject(x, y, width, height, src, isFullscreen) {
$('#playvideo').html('<video class="mov" id="videoOnPage" ' + $('#playvideo').html('<video class="mov" id="videoOnPage" ' +
'width="' + (pt2.x - pt1.x) + '" ' + 'width="' + (pt2.x - pt1.x) + '" ' +
'height="' + (pt2.y - pt1.y) + '" ' + 'height="' + (pt2.y - pt1.y) + '" ' +
'autoplay controls loop>' + 'autoplay controls controlsList="nodownload" loop>' +
' <source src="' + src + '&key=' + (new Date()).toIdString() + '" type="video/mp4"> ' + ' <source src="' + src + '&key=' + (new Date()).toIdString() + '" type="video/mp4"> ' +
' <source src="' + src + '&key=' + (new Date()).toIdString() + '" type="video/ogg"> ' + ' <source src="' + src + '&key=' + (new Date()).toIdString() + '" type="video/ogg"> ' +
'</video>' '</video>'
...@@ -4665,7 +4665,7 @@ function showVideoObject(x, y, width, height, src, isFullscreen) { ...@@ -4665,7 +4665,7 @@ function showVideoObject(x, y, width, height, src, isFullscreen) {
$('#playvideo').html('<video class="mov" id="videoOnPage"' + $('#playvideo').html('<video class="mov" id="videoOnPage"' +
'width="' + (pt2.x - pt1.x) + '" ' + 'width="' + (pt2.x - pt1.x) + '" ' +
'height="' + (pt2.y - pt1.y) + '" ' + 'height="' + (pt2.y - pt1.y) + '" ' +
'autoplay controls>' + 'autoplay controls controlsList="nodownload">' +
' <source src="' + src + '&key=' + (new Date()).toIdString() + '" type="video/mp4"> ' + ' <source src="' + src + '&key=' + (new Date()).toIdString() + '" type="video/mp4"> ' +
' <source src="' + src + '&key=' + (new Date()).toIdString() + '" type="video/ogg"> ' + ' <source src="' + src + '&key=' + (new Date()).toIdString() + '" type="video/ogg"> ' +
'</video>' '</video>'
...@@ -4674,7 +4674,7 @@ function showVideoObject(x, y, width, height, src, isFullscreen) { ...@@ -4674,7 +4674,7 @@ function showVideoObject(x, y, width, height, src, isFullscreen) {
} else { } else {
$('#playvideo').attr('z-order', '1000'); $('#playvideo').attr('z-order', '1000');
$('#playvideo').html('<video class="mov" id="videoOnPage" src="' + src + '" ' + $('#playvideo').html('<video class="mov" id="videoOnPage" src="' + src + '" ' +
'autoplay controls></video>'); 'autoplay controls controlsList="nodownload"></video>');
} }
//showControlsVideo($('#videoOnPage')); //showControlsVideo($('#videoOnPage'));
......
abvw-preview/js/contentview_CreateObjects.js
...@@ -1557,7 +1557,7 @@ function createVideoFulScreen(video, id) { ...@@ -1557,7 +1557,7 @@ function createVideoFulScreen(video, id) {
' <img src="img/viewer/x.png" style="margin:3px 3px 0px 21px" id="btnCloseVideo" class="align_right" ></img>' + ' <img src="img/viewer/x.png" style="margin:3px 3px 0px 21px" id="btnCloseVideo" class="align_right" ></img>' +
'</h1>' + '</h1>' +
' <div id="videoMedia' + id + '">' + ' <div id="videoMedia' + id + '">' +
' <video style="height:90%; width:100%;" class="mov" id="videoOnPopUp" autoplay controls loop>' + ' <video style="height:90%; width:100%;" class="mov" id="videoOnPopUp" autoplay controls controlsList="nodownload" loop>' +
' <source src="' + video + '" type="video/mp4"> ' + ' <source src="' + video + '" type="video/mp4"> ' +
' </video>' + ' </video>' +
' </div>' ' </div>'
...@@ -1568,7 +1568,7 @@ function createVideoFulScreen(video, id) { ...@@ -1568,7 +1568,7 @@ function createVideoFulScreen(video, id) {
' <img src="img/viewer/x.png" style="margin:3px 3px 0px 21px" id="btnCloseVideo" class="align_right" width=25px" ></img>' + ' <img src="img/viewer/x.png" style="margin:3px 3px 0px 21px" id="btnCloseVideo" class="align_right" width=25px" ></img>' +
'</h1>' + '</h1>' +
' <div id="videoMedia' + id + '">' + ' <div id="videoMedia' + id + '">' +
' <video style="height:90%; width:100%;" id="videoOnPopUp" class="mov" autoplay controls>' + ' <video style="height:90%; width:100%;" id="videoOnPopUp" class="mov" autoplay controls controlsList="nodownload">' +
' <source src="' + video + '" type="video/mp4"> ' + ' <source src="' + video + '" type="video/mp4"> ' +
' </video>' + ' </video>' +
' </div>' ' </div>'
......
abvw/js/contentview.js
...@@ -2349,13 +2349,13 @@ CONTENTVIEW.handleForContentTypeVideo = function(resourceUrl){ ...@@ -2349,13 +2349,13 @@ CONTENTVIEW.handleForContentTypeVideo = function(resourceUrl){
$container.html(''); $container.html('');
if (ClientData.userOpt_musicMode() == "1") { if (ClientData.userOpt_musicMode() == "1") {
$container.html('<video id="content_video" autoplay="true" loop="true" controls="controls" style="position: absolute; width: 100%; height: 100%;">' $container.html('<video id="content_video" autoplay="true" loop="true" controls="controls" controlsList="nodownload" style="position: absolute; width: 100%; height: 100%;">'
+ ' <source src="' + resourceUrl + '" type="video/mp4"> ' + ' <source src="' + resourceUrl + '" type="video/mp4"> '
+ '</video>' + '</video>'
); );
} }
else { else {
$container.html('<video id="content_video" autoplay="true" controls="controls" style="position: absolute; width: 100%; height: 100%;">' $container.html('<video id="content_video" autoplay="true" controls="controls" controlsList="nodownload" style="position: absolute; width: 100%; height: 100%;">'
+ ' <source src="' + resourceUrl + '" type="video/mp4"> ' + ' <source src="' + resourceUrl + '" type="video/mp4"> '
+ '</video>' + '</video>'
); );
...@@ -4739,7 +4739,7 @@ CONTENTVIEW.showVideoObject = function(x, y, width, height, src, isFullscreen) { ...@@ -4739,7 +4739,7 @@ CONTENTVIEW.showVideoObject = function(x, y, width, height, src, isFullscreen) {
$('#playvideo').html('<video class="mov" id="videoOnPage" ' + $('#playvideo').html('<video class="mov" id="videoOnPage" ' +
'width="' + (pt2.x - pt1.x) + '" ' + 'width="' + (pt2.x - pt1.x) + '" ' +
'height="' + (pt2.y - pt1.y) + '" ' + 'height="' + (pt2.y - pt1.y) + '" ' +
'autoplay controls loop>' + 'autoplay controls controlsList="nodownload" loop>' +
' <source src="' + src + '" type="video/mp4"> ' + ' <source src="' + src + '" type="video/mp4"> ' +
//' <source src="' + src + '&key=' + (new Date()).toIdString() + '" type="video/mp4"> ' + //' <source src="' + src + '&key=' + (new Date()).toIdString() + '" type="video/mp4"> ' +
//' <source src="' + src + '&key=' + (new Date()).toIdString() + '" type="video/ogg"> ' + //' <source src="' + src + '&key=' + (new Date()).toIdString() + '" type="video/ogg"> ' +
...@@ -4750,7 +4750,7 @@ CONTENTVIEW.showVideoObject = function(x, y, width, height, src, isFullscreen) { ...@@ -4750,7 +4750,7 @@ CONTENTVIEW.showVideoObject = function(x, y, width, height, src, isFullscreen) {
$('#playvideo').html('<video class="mov" id="videoOnPage"' + $('#playvideo').html('<video class="mov" id="videoOnPage"' +
'width="' + (pt2.x - pt1.x) + '" ' + 'width="' + (pt2.x - pt1.x) + '" ' +
'height="' + (pt2.y - pt1.y) + '" ' + 'height="' + (pt2.y - pt1.y) + '" ' +
'autoplay controls>' + 'autoplay controls controlsList="nodownload">' +
//' <source src="' + src + '&key=' + (new Date()).toIdString() + '" type="video/mp4"> ' + //' <source src="' + src + '&key=' + (new Date()).toIdString() + '" type="video/mp4"> ' +
' <source src="' + src + '" type="video/mp4"> ' + ' <source src="' + src + '" type="video/mp4"> ' +
'</video>' '</video>'
...@@ -4759,7 +4759,7 @@ CONTENTVIEW.showVideoObject = function(x, y, width, height, src, isFullscreen) { ...@@ -4759,7 +4759,7 @@ CONTENTVIEW.showVideoObject = function(x, y, width, height, src, isFullscreen) {
} else { } else {
$('#playvideo').attr('z-order', '1000'); $('#playvideo').attr('z-order', '1000');
$('#playvideo').html('<video class="mov" id="videoOnPage" src="' + src + '" ' + $('#playvideo').html('<video class="mov" id="videoOnPage" src="' + src + '" ' +
'autoplay controls></video>'); 'autoplay controls controlsList="nodownload"></video>');
} }
//CONTENTVIEW.showControlsVideo($('#videoOnPage')); //CONTENTVIEW.showControlsVideo($('#videoOnPage'));
......
abvw/js/contentview_CreateObjects.js
...@@ -2653,7 +2653,7 @@ CONTENTVIEW_CREATEOBJECT.createVideoFulScreen = function(video, id) { ...@@ -2653,7 +2653,7 @@ CONTENTVIEW_CREATEOBJECT.createVideoFulScreen = function(video, id) {
' <img src="img/viewer/x.png" style="margin:3px 3px 0px 21px" id="btnCloseVideo" class="align_right" ></img>' + ' <img src="img/viewer/x.png" style="margin:3px 3px 0px 21px" id="btnCloseVideo" class="align_right" ></img>' +
'</h1>' + '</h1>' +
' <div id="videoMedia' + id + '">' + ' <div id="videoMedia' + id + '">' +
' <video style="height:90%; width:100%;" class="mov" id="videoOnPopUp" autoplay controls loop>' + ' <video style="height:90%; width:100%;" class="mov" id="videoOnPopUp" autoplay controls controlsList="nodownload" loop>' +
' <source src="' + video + '" type="video/mp4"> ' + ' <source src="' + video + '" type="video/mp4"> ' +
' </video>' + ' </video>' +
' </div>' ' </div>'
...@@ -2664,7 +2664,7 @@ CONTENTVIEW_CREATEOBJECT.createVideoFulScreen = function(video, id) { ...@@ -2664,7 +2664,7 @@ CONTENTVIEW_CREATEOBJECT.createVideoFulScreen = function(video, id) {
' <img src="img/viewer/x.png" style="margin:3px 3px 0px 21px" id="btnCloseVideo" class="align_right" width=25px" ></img>' + ' <img src="img/viewer/x.png" style="margin:3px 3px 0px 21px" id="btnCloseVideo" class="align_right" width=25px" ></img>' +
'</h1>' + '</h1>' +
' <div id="videoMedia' + id + '">' + ' <div id="videoMedia' + id + '">' +
' <video style="height:90%; width:100%;" id="videoOnPopUp" class="mov" autoplay controls>' + ' <video style="height:90%; width:100%;" id="videoOnPopUp" class="mov" autoplay controls controlsList="nodownload">' +
' <source src="' + video + '" type="video/mp4"> ' + ' <source src="' + video + '" type="video/mp4"> ' +
' </video>' + ' </video>' +
' </div>' ' </div>'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment