From 60766ef31dc3b574f4c262cde8d07d3a97f2f785 Mon Sep 17 00:00:00 2001 From: tsukumijima Date: Sun, 18 Oct 2020 05:09:47 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=E3=82=B9=E3=82=BF=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E3=81=AE=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/files/settings.css | 4 ++-- htdocs/files/style.css | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/files/settings.css b/htdocs/files/settings.css index 44d479ce..fdf422e1 100644 --- a/htdocs/files/settings.css +++ b/htdocs/files/settings.css @@ -189,11 +189,11 @@ select { } #setting-user .select-wrap { - width: 150px; + max-width: 150px; } #setting-user .text-box { - width: 150px; + max-width: 150px; } .download, .download:link, .download:visited { diff --git a/htdocs/files/style.css b/htdocs/files/style.css index 1272674c..aecd5969 100644 --- a/htdocs/files/style.css +++ b/htdocs/files/style.css @@ -921,7 +921,7 @@ google-cast-launcher:hover + #cast-toggle:before, google-cast-launcher:hover + # bottom: auto !important; z-index: 400 !important; border-radius: 6px; - box-shadow: 0 1px 10px 0 rgba(32, 33, 36, 0.5); + box-shadow: 0 1px 8px 0 rgba(32, 33, 36, 0.35); opacity: 1; transition: opacity 0.2s ease-in-out; } From dbbe1bbb8837c18bc3371c24c5a1e92f044f3e46 Mon Sep 17 00:00:00 2001 From: tsukumijima Date: Sun, 18 Oct 2020 05:31:16 +0900 Subject: [PATCH 2/6] =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E5=86=8D=E7=94=9F=E3=81=A7=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E4=B8=80=E8=A6=A7=E3=81=AB=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=81=8C=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84?= =?UTF-8?q?=E3=81=93=E3=81=A8=E3=81=8C=E3=81=82=E3=82=8B=E4=B8=8D=E5=85=B7?= =?UTF-8?q?=E5=90=88=E3=82=92=E4=BF=AE=E6=AD=A3=20=E7=99=BA=E7=81=AB?= =?UTF-8?q?=E3=82=A4=E3=83=99=E3=83=B3=E3=83=88=E3=82=92=20load=20?= =?UTF-8?q?=E3=81=8B=E3=82=89=20DOMContentLoaded=20=E3=81=AB=E5=A4=89?= =?UTF-8?q?=E3=81=88=E3=81=9F=E3=82=89=E7=9B=B4=E3=81=A3=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/files/file.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/files/file.js b/htdocs/files/file.js index 7fa480d0..62e6ddbe 100644 --- a/htdocs/files/file.js +++ b/htdocs/files/file.js @@ -1,6 +1,6 @@ // ロード時 & リサイズ時に発火 - $(window).on('load resize', function(event){ + $(window).on('DOMContentLoaded resize', function(event){ // コメントを取得してコメント一覧画面にコメントを流し込む // スマホ以外のみ発動（スマホだと動作が遅くなるため） From bf414bb72571fc71feb3ca23fa90ea2b6272b3a5 Mon Sep 17 00:00:00 2001 From: tsukumijima Date: Sun, 18 Oct 2020 05:54:03 +0900 Subject: [PATCH 3/6] =?UTF-8?q?=E7=B4=B0=E3=81=8B=E3=81=AA=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/files/common.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/htdocs/files/common.js b/htdocs/files/common.js index 1d0211e8..c1a5f281 100644 --- a/htdocs/files/common.js +++ b/htdocs/files/common.js @@ -107,9 +107,14 @@ $('#tweet-account-box').css('opacity', 0); $('#tweet-account-box').css('visibility', 'hidden'); + // スクロール位置を取得 - const position_current = $(this).scrollTop() + 54; // 54 はヘッダー分 - const position_target = $('#epg-box').offset().top; // 計算めんどいのであえて jQuery + let position_current = $(this).scrollTop() + 54; // 54 はヘッダー分 + let position_target = 450; + + if ($('#epg-box').offset() !== undefined) { + position_target = $('#epg-box').offset().top; // 計算めんどいのであえて jQuery + } // 表示・非表示 // ターゲット座標以上 From 60e978d2190d06aa7770b058ce72a5f1999b8ce5 Mon Sep 17 00:00:00 2001 From: tsukumijima Date: Sun, 18 Oct 2020 06:07:07 +0900 Subject: [PATCH 4/6] =?UTF-8?q?Twitter=20=E3=81=AB=E3=83=AD=E3=82=B0?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=81=97=E3=81=9F=E6=99=82=E3=81=AE=E3=82=B3?= =?UTF-8?q?=E3=83=BC=E3=83=AB=E3=83=90=E3=83=83=E3=82=AF=E5=85=88=E3=81=AE?= =?UTF-8?q?=20URL=20=E3=81=AB=E3=82=B9=E3=83=88=E3=83=AA=E3=83=BC=E3=83=A0?= =?UTF-8?q?=E7=95=AA=E5=8F=B7=E3=82=92=E5=8F=8D=E6=98=A0=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F=20=E3=81=9F?= =?UTF-8?q?=E3=81=A8=E3=81=88=E3=81=B0=20Stream=202=20=E3=81=8B=E3=82=89?= =?UTF-8?q?=20Twitter=20=E3=81=AB=E3=83=AD=E3=82=B0=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E3=81=97=E3=81=9F=E3=81=AA=E3=82=89=E3=80=81Twitter=20?= =?UTF-8?q?=E3=81=AE=E3=83=9A=E3=83=BC=E3=82=B8=E3=81=8B=E3=82=89=20TVRemo?= =?UTF-8?q?tePlus=20=E3=81=AB=E8=BF=94=E3=81=A3=E3=81=A6=E3=81=8F=E3=82=8B?= =?UTF-8?q?=E9=9A=9B=E3=81=AB=20Stream=201=EF=BC=88=E3=83=88=E3=83=83?= =?UTF-8?q?=E3=83=97=E3=83=9A=E3=83=BC=E3=82=B8=EF=BC=89=E3=81=A7=E3=81=AF?= =?UTF-8?q?=E3=81=AA=E3=81=8F=20Stream=202=20=E3=81=AB=E8=BF=94=E3=81=A3?= =?UTF-8?q?=E3=81=A6=E3=81=8F=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=AA?= =?UTF-8?q?=E3=82=8A=E3=81=BE=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/tweet/auth.php | 6 +++++- htdocs/tweet/callback.php | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/htdocs/tweet/auth.php b/htdocs/tweet/auth.php index ab44c7e5..1804069d 100644 --- a/htdocs/tweet/auth.php +++ b/htdocs/tweet/auth.php @@ -2,6 +2,7 @@ // モジュール読み込み require_once ('../../modules/require.php'); + require_once ('../../modules/module.php'); // セッション保存ディレクトリ session_save_path($base_dir.'data/twitter_session'); @@ -41,13 +42,16 @@ exit(1); } + // リファラからストリーム番号を取得 + $stream = getStreamNumber($_SERVER['HTTP_REFERER']); + // config.phpで入力した値を用いてTwitterに接続 $connection = new TwitterOAuth($CONSUMER_KEY, $CONSUMER_SECRET); // エラー捕捉 try { // 認証URLを取得するためのリクエストトークンの生成 - $request_token = $connection->oauth('oauth/request_token', array('oauth_callback' => $OAUTH_CALLBACK)); + $request_token = $connection->oauth('oauth/request_token', array('oauth_callback' => $OAUTH_CALLBACK.'?stream='.$stream)); } catch(Exception $e) { echo ''; diff --git a/htdocs/tweet/callback.php b/htdocs/tweet/callback.php index 6a822613..c6758910 100644 --- a/htdocs/tweet/callback.php +++ b/htdocs/tweet/callback.php @@ -48,7 +48,12 @@ setcookie('twitter', $cookie, time() + 7776000, '/'); // トップページにリダイレクト - header('Location: '.$site_url); + if (isset($_GET['stream']) and !empty($_GET['stream'])) { // ストリーム番号があるか + header('Location: '.$site_url.$_GET['stream'].'/'); + } else { + header('Location: '.$site_url); + } + exit; } else { From 49333f1679b53727e20ec9131d5e542c863ff148 Mon Sep 17 00:00:00 2001 From: tsukumijima Date: Sun, 18 Oct 2020 06:23:58 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=E3=82=B9=E3=82=BF=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E3=81=AE=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/files/settings.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/htdocs/files/settings.css b/htdocs/files/settings.css index fdf422e1..bc826250 100644 --- a/htdocs/files/settings.css +++ b/htdocs/files/settings.css @@ -288,6 +288,9 @@ select { #setting-user .toggle-switch { margin-left: 20px; } + #setting-env .toggle-switch { + margin-left: auto; + } input[type="text"], input[type="number"], input[type="url"], input[type="email"], input[type="password"] { width: 100%; margin-left: 0px; @@ -322,9 +325,11 @@ select { @media screen and (max-width: 500px){ #setting-user .select-wrap { width: 100%; + max-width: 100%; } #setting-user .text-box { width: 100%; + max-width: 100%; } .setting-select { flex-direction: column; From 462d95da297498b5330bcf8006fb8d43eedce3b7 Mon Sep 17 00:00:00 2001 From: tsukumijima Date: Tue, 20 Oct 2020 01:03:12 +0900 Subject: [PATCH 6/6] =?UTF-8?q?Shift=20=E3=82=AD=E3=83=BC=E3=82=92?= =?UTF-8?q?=E6=8A=BC=E3=81=97=E3=81=AA=E3=81=8C=E3=82=89=E3=82=AD=E3=83=A3?= =?UTF-8?q?=E3=83=97=E3=83=81=E3=83=A3=E3=81=99=E3=82=8B=E3=81=A8=E5=AD=97?= =?UTF-8?q?=E5=B9=95=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=97=E3=81=A6=E3=81=84?= =?UTF-8?q?=E3=82=8B=E3=81=A8=E3=81=8D=E3=81=A7=E3=82=82=E5=AD=97=E5=B9=95?= =?UTF-8?q?=E3=82=92=E5=85=A5=E3=82=8C=E3=81=9A=E3=81=AB=E3=82=AD=E3=83=A3?= =?UTF-8?q?=E3=83=97=E3=83=81=E3=83=A3=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F=20=E3=82=AD=E3=83=BC?= =?UTF-8?q?=E3=83=9C=E3=83=BC=E3=83=89=E3=82=B7=E3=83=A7=E3=83=BC=E3=83=88?= =?UTF-8?q?=E3=82=AB=E3=83=83=E3=83=88=E3=81=8B=E3=82=89=E3=82=82=E5=90=8C?= =?UTF-8?q?=E6=A7=98=E3=81=AB=E5=88=A9=E7=94=A8=E3=81=A7=E3=81=8D=E3=81=BE?= =?UTF-8?q?=E3=81=99=EF=BC=88Alt=20+=20Shift=20+=201=E3=83=BBAlt=20+=20Shi?= =?UTF-8?q?ft=20+=202=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/files/script.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/htdocs/files/script.js b/htdocs/files/script.js index 5f6ae87d..8400a7f8 100644 --- a/htdocs/files/script.js +++ b/htdocs/files/script.js @@ -589,6 +589,12 @@ } }); + // Shift キー + window.isShiftKey = false; + $(document).on('keydown keyup', function(event) { + window.isShiftKey = event.shiftKey; + }); + // 現在変換中か window.isComposing = false; $('#tweet').on('compositionstart', function() { @@ -1409,8 +1415,8 @@ var video = document.getElementsByClassName('dplayer-video-current')[0]; var subtitles = video.textTracks[1].activeCues; - // 字幕オンなら - if (video.textTracks[1].mode == 'showing' && video.textTracks[1].cues.length){ + // 字幕オン & Shift キーが押されていないなら + if (video.textTracks[1].mode == 'showing' && video.textTracks[1].cues.length && (!event.shiftKey || !window.isShiftKey)){ var subtitle_html = '
\n'; for(var i = (subtitles.length - 1); i >= 0; i--){ @@ -1477,8 +1483,8 @@ html = html.replace(/transform: translateX\(.*?\)\;/, 'left: ' + position + 'px;'); } - // 字幕オンなら - if (video.textTracks[1].mode == 'showing' && video.textTracks[1].cues.length){ + // 字幕オン & Shift キーが押されていないなら + if (video.textTracks[1].mode == 'showing' && video.textTracks[1].cues.length && !event.shiftKey){ var subtitle_html = '
\n'; for(var i = (subtitles.length - 1); i >= 0; i--){