fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-09 03:52:15 +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

8
common/framework/drivers/push/base.php
View file

@ -2,10 +2,12 @@
namespace Rhymix\Framework\Drivers\Push;
use Rhymix\Framework\Drivers\PushInterface;
/**
* The base class for other Push drivers.
*/
abstract class Base implements \Rhymix\Framework\Drivers\PushInterface
abstract class Base implements PushInterface
{
/**
* The configuration is stored here.
@ -30,9 +32,9 @@ abstract class Base implements \Rhymix\Framework\Drivers\PushInterface
* Create a new instance of the current Push driver, using the given settings.
*
* @param array $config
* @return Base
* @return PushInterface
*/
public static function getInstance(array $config): Base
public static function getInstance(array $config): PushInterface
{
return new static($config);
}

2
common/framework/drivers/pushinterface.php
View file

@ -13,7 +13,7 @@ interface PushInterface
* @param array $config
* @return void
*/
public static function getInstance(array $config): object;
public static function getInstance(array $config): PushInterface;
/**
* Get the human-readable name of this Push driver.

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 + '" />';
}