fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-06 10:11:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into pr/color-scheme

Browse source
This commit is contained in:
Kijin Sung 2020-12-13 19:40:20 +09:00
commit bcfb96dda7
14 changed files with 59 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/js/common.js
View file

@ -771,7 +771,11 @@ function doChangeLangType(obj) {
}
}
function setLangType(lang_type) {
XE.cookie.set("lang_type", lang_type, { path: "/", expires: 3650 });
var baseurl = XE.URI(default_url).pathname();
if (baseurl !== '/') {
XE.cookie.remove('lang_type', { path: '/' });
}
XE.cookie.set('lang_type', lang_type, { path: baseurl, expires: 365 });
}
/* 미리보기 */

4
common/js/plugins/jquery.fileupload/js/main.js
View file

@ -159,7 +159,7 @@
}
else if(/\.(mp4|webm|ogv)$/i.test(result.source_filename) && opt.autoinsertTypes.video) {
if(result.original_type === 'image/gif') {
temp_code += '<video src="' + result.download_url + '" autoplay loop muted data-file-srl="' + result.file_srl + '" />';
temp_code += '<video src="' + result.download_url + '" autoplay loop muted playsinline data-file-srl="' + result.file_srl + '" />';
} else {
temp_code += '<video src="' + result.download_url + '" controls data-file-srl="' + result.file_srl + '" />';
}
@ -332,7 +332,7 @@
}
else if(/\.(mp4|webm|ogv)$/i.test(result.source_filename)) {
if(result.original_type === 'image/gif') {
temp_code += '<video src="' + result.download_url + '" autoplay loop muted data-file-srl="' + result.file_srl + '" />';
temp_code += '<video src="' + result.download_url + '" autoplay loop muted playsinline data-file-srl="' + result.file_srl + '" />';
} else {
temp_code += '<video src="' + result.download_url + '" controls data-file-srl="' + result.file_srl + '" />';
}