途中でプルリクを処理するためコミット
This commit is contained in:
parent
677f167c8e
commit
fdc6ec906c
|
@ -52,6 +52,7 @@ option {
|
|||
}
|
||||
#imagemodal .modal-content {
|
||||
overflow: hidden;
|
||||
padding:0;
|
||||
}
|
||||
#imagemodal .modal-footer{
|
||||
overflow-x:scroll;
|
||||
|
@ -309,7 +310,7 @@ blockquote:before, .quote:before {
|
|||
position:fixed;
|
||||
z-index:9999;
|
||||
background-color: var(--box);
|
||||
width:520px;
|
||||
width:540px;
|
||||
top:calc(50% - 150px);
|
||||
left:calc(50% - 250px);
|
||||
padding: 5px;
|
||||
|
@ -341,12 +342,41 @@ blockquote:before, .quote:before {
|
|||
background-color: var(--emphasized);
|
||||
}
|
||||
#right-menu{
|
||||
width:350px;
|
||||
max-height:325px;
|
||||
width:380px;
|
||||
max-height:375px;
|
||||
overflow-y:scroll;
|
||||
overflow-x:hidden;
|
||||
padding:5px;
|
||||
}
|
||||
#tltype{
|
||||
display:flex;
|
||||
flex-wrap: wrap;
|
||||
|
||||
}
|
||||
#tltype .type{
|
||||
display:flex;
|
||||
flex-wrap: wrap;
|
||||
align-items:center;
|
||||
width:170px;
|
||||
height:40px;
|
||||
cursor:pointer;
|
||||
}
|
||||
#tltype .type:hover {
|
||||
background-color: var(--beforehover);
|
||||
}
|
||||
#tltype .active{
|
||||
background-color: var(--emphasized);
|
||||
}
|
||||
#tltype i{
|
||||
font-size:30px;
|
||||
}
|
||||
#tltype i.sub-icon{
|
||||
font-size: 20px;
|
||||
position: relative;
|
||||
color: var(--beforehover);
|
||||
left: -15px;
|
||||
|
||||
}
|
||||
.drag-bar{
|
||||
cursor:move;
|
||||
text-align:center;
|
||||
|
|
|
@ -488,6 +488,7 @@ p:not(:last-child){
|
|||
.votebtn:hover{
|
||||
background-color:var(--color);
|
||||
}
|
||||
|
||||
@keyframes fadeInDown {
|
||||
from {
|
||||
opacity: 0;
|
||||
|
@ -523,3 +524,4 @@ p:not(:last-child){
|
|||
animation-duration: 0.1s;
|
||||
animation-name: fadeInDown;
|
||||
}
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
//バージョンチェッカー
|
||||
function verck(ver,winstore) {
|
||||
function verck(ver) {
|
||||
console.log("Welcome")
|
||||
if(localStorage.getItem("ver")!=ver){
|
||||
localStorage.setItem("ver", ver);
|
||||
console.log("Thank you for your update");
|
||||
|
@ -27,7 +28,6 @@ function verck(ver,winstore) {
|
|||
message: lang.lang_version_platform,
|
||||
buttons: [lang.lang_no,lang.lang_yesno]
|
||||
}
|
||||
console.log(localStorage.getItem("winstore"))
|
||||
if(!localStorage.getItem("winstore")){
|
||||
|
||||
dialog.showMessageBox(options, function(arg) {
|
||||
|
@ -42,7 +42,6 @@ function verck(ver,winstore) {
|
|||
if(localStorage.getItem("winstore")=="unix"){
|
||||
localStorage.removeItem("winstore")
|
||||
}
|
||||
console.log(localStorage.getItem("winstore"))
|
||||
if(!localStorage.getItem("winstore")){
|
||||
const options = {
|
||||
type: 'info',
|
||||
|
@ -61,6 +60,11 @@ function verck(ver,winstore) {
|
|||
}else{
|
||||
localStorage.setItem("winstore","unix")
|
||||
}
|
||||
if(localStorage.getItem("winstore")=="snapcraft" || localStorage.getItem("winstore")=="winstore"){
|
||||
var winstore=true;
|
||||
}else{
|
||||
var winstore=false;
|
||||
}
|
||||
var l = 5;
|
||||
// 生成する文字列に含める文字セット
|
||||
var c = "abcdefghijklmnopqrstuvwxyz0123456789";
|
||||
|
@ -90,7 +94,7 @@ function verck(ver,winstore) {
|
|||
}
|
||||
if (newest == ver) {
|
||||
todo(lang.lang_version_usever.replace("{{ver}}" ,mess.desk));
|
||||
//betaかWInstoreならアプデチェックしない
|
||||
//betaかWinstoreならアプデチェックしない
|
||||
} else if (ver.indexOf("beta")!=-1 || winstore) {
|
||||
|
||||
}else{
|
||||
|
@ -100,6 +104,7 @@ function verck(ver,winstore) {
|
|||
var ipc = electron.ipcRenderer;
|
||||
ipc.send('update', "true");
|
||||
}else{
|
||||
console.log(lang.lang_version_skipver);
|
||||
todo(lang.lang_version_skipver);
|
||||
}
|
||||
}else{
|
||||
|
|
|
@ -10,6 +10,7 @@ function imgv(id, key, acct_id) {
|
|||
$("#imagemodal").attr("data-acct",acct_id);
|
||||
$(document).ready(function() {
|
||||
if (type == "image") {
|
||||
$('#imagemodal').modal('open');
|
||||
xhr = new XMLHttpRequest;
|
||||
xhr.open('GET', murl, true);
|
||||
xhr.addEventListener('progress', function (event) {
|
||||
|
@ -29,7 +30,6 @@ function imgv(id, key, acct_id) {
|
|||
xhr.send();
|
||||
$('#imgmodal').attr('src', murl);
|
||||
$('#imagewrap').dragScroll(); // ドラッグスクロール設定
|
||||
$('#imagemodal').modal('open');
|
||||
$('#imgmodal').show();
|
||||
$('#imagemodal').attr('data-key', key);
|
||||
$('#imagemodal').attr('data-id', id);
|
||||
|
@ -45,61 +45,31 @@ function imgv(id, key, acct_id) {
|
|||
var height = element.naturalHeight;
|
||||
var windowH = $(window).height();
|
||||
var windowW = $(window).width();
|
||||
//小さい画像
|
||||
if(width<(windowW - 50) && height<(windowH-1000)){
|
||||
$("#imgmodal").css('height',height+"px");
|
||||
$("#imgmodal").css('width',width+"px");
|
||||
$("#imagewrap").css('height',height+"px");
|
||||
$("#imagemodal").css('height',height+100+"px");
|
||||
$("#imagewrap").css('width',width+"px");
|
||||
$("#imagemodal").css('width',width+"px");
|
||||
$("#imagemodal").css('margin-top',(windowH /2) - (height / 2) +"px");
|
||||
}else{
|
||||
$("#imagemodal").css('margin-top',0);
|
||||
var aspect = width/height;
|
||||
if (aspect < 2.8 && aspect > 0.3){
|
||||
//moderate
|
||||
if(windowW > windowH){
|
||||
//画面が横長(縦幅基準)
|
||||
$("#imgmodal").css('height',windowH/1.2-70+"px");
|
||||
var imgW = (windowH/1.2-70)/height*width;
|
||||
$("#imgmodal").css('width',imgW+"px");
|
||||
$("#imagewrap").css('height',windowH/1.2-60+"px");
|
||||
$("#imagemodal").css('height',windowH/1.2+"px");
|
||||
$("#imagewrap").css('width',imgW+50+"px");
|
||||
$("#imagemodal").css('width',imgW+50+"px");
|
||||
}else{
|
||||
//画面が縦長・正方形(横幅基準)
|
||||
$("#imgmodal").css('width',windowW/1.2-30+"px");
|
||||
var imgH = (windowW/1.2-30)/width*height;
|
||||
$("#imgmodal").css('height',imgH+"px");
|
||||
$("#imagewrap").css('width',windowW/1.2+"px");
|
||||
$("#imagemodal").css('width',windowW/1.2+"px");
|
||||
$("#imagewrap").css('height',imgH+60+"px");
|
||||
$("#imagemodal").css('height',imgH+120+"px");
|
||||
}
|
||||
$("#imagemodal").css("bottom","0")
|
||||
$("#imagemodal img").css("width","auto")
|
||||
if(height<windowH){
|
||||
$("#imagemodal").css("height",height+60+"px")
|
||||
$("#imagemodal img").css("height","100%")
|
||||
if(width>windowW*0.8){
|
||||
$("#imagemodal").css("width","80vw")
|
||||
$("#imagemodal img").css("width","100%")
|
||||
var heightS=windowW*0.8/width*height;
|
||||
$("#imagemodal").css("height",heightS+60+"px")
|
||||
}else{
|
||||
//極端な画像
|
||||
if(height > width){
|
||||
//縦長
|
||||
$("#imgmodal").css('height',windowH-60+"px");
|
||||
var imgW = (windowH-50)/height*width;
|
||||
$("#imgmodal").css('width',imgW+"px");
|
||||
$("#imagewrap").css('height',windowH-50+"px");
|
||||
$("#imagemodal").css('height',windowH+"px");
|
||||
$("#imagewrap").css('width',imgW+50+"px");
|
||||
$("#imagemodal").css('width',imgW+50+"px");
|
||||
}else{
|
||||
//横長・正方形
|
||||
$("#imgmodal").css('width',windowW-30+"px");
|
||||
var imgH = (windowW-50)/width*height;
|
||||
$("#imgmodal").css('height',imgH+"px");
|
||||
$("#imagewrap").css('width',windowW+"px");
|
||||
$("#imagemodal").css('width',windowW+"px");
|
||||
$("#imagewrap").css('height',imgH+60+"px");
|
||||
$("#imagemodal").css('height',imgH+120+"px");
|
||||
}
|
||||
$("#imagemodal").css("width",width+"px")
|
||||
}
|
||||
}else{
|
||||
console.log("long")
|
||||
$("#imagemodal img").css("width","auto")
|
||||
var widthS=windowH/height*width;
|
||||
if(widthS<windowW){
|
||||
$("#imagemodal").css("width",widthS+"px")
|
||||
}else{
|
||||
$("#imagemodal").css("width","100vw")
|
||||
}
|
||||
|
||||
$("#imagemodal").css("height","100vh")
|
||||
$("#imagemodal img").css("height","calc(100vh - 60px)")
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -14,6 +14,13 @@ function addColumnMenu() {
|
|||
$("#add-box").removeClass("hide");
|
||||
addselCk()
|
||||
}
|
||||
$('.type').click(function() {
|
||||
if(this.hasClass("active")){
|
||||
|
||||
}else{
|
||||
|
||||
}
|
||||
})
|
||||
//最初、カラム変更時に発火
|
||||
function parseColumn() {
|
||||
console.log("parse");
|
||||
|
|
|
@ -247,7 +247,7 @@ ipc.on('theme-css-request', function(e, arg) {
|
|||
var css=".customtheme {--bg:"+secondary+";--drag:"+drag+";"+
|
||||
"--color:"+text+";--beforehover:"+beforehover+";--modal:"+secondary+";--subcolor:"+primary+";--box:"+primary+";--sidebar:"+primary+";--shared:"+emphasized+";"+
|
||||
"--notfbox:"+secondary+";--emphasized:"+primary+";--his-data:"+secondary+
|
||||
+"--active:"+primary+";--postbox:"+primary+";--modalfooter:"+primary+";}.blacktheme #imagemodal{background: url(\"../img/pixel.svg\");}";
|
||||
"--active:"+primary+";--postbox:"+primary+";--modalfooter:"+primary+";}.blacktheme #imagemodal{background: url(\"../img/pixel.svg\");}";
|
||||
mainWindow.webContents.send('theme-css-response', css);
|
||||
} catch (e) {
|
||||
var css="";
|
||||
|
|
|
@ -32,15 +32,14 @@
|
|||
<script type="text/javascript" src="../../js/common/modal.js"></script>
|
||||
<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
|
||||
<script>
|
||||
var ver="Miria (17.3.0)";
|
||||
var ver="Usamin (18.0.0)";
|
||||
//betaを入れるとバージョンチェックしない
|
||||
//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
|
||||
//var ver="beta";
|
||||
//WinstoreではバージョンCK・言語・Misskeyトークンの機能が排除
|
||||
var winstore=false;
|
||||
var acct_id=0;
|
||||
var tlid=0;
|
||||
verck(ver,winstore);
|
||||
verck(ver);
|
||||
</script>
|
||||
<textarea id="copy" style="top:-100px; position:fixed;"></textarea>
|
||||
<div id="tl">
|
||||
|
@ -643,6 +642,7 @@ var tlid=0;
|
|||
<div class="waves-effect" onclick="listMenu()" id="listMenu"><i class="material-icons">view_headline</i><span>List</span></div>
|
||||
<div class="waves-effect" onclick="filterMenu()" id="filterMenu"><i class="material-icons">filter_list</i><span>Filter</span></div>
|
||||
<div class="waves-effect" onclick="help()"><i class="material-icons">help_outline</i><span>Help</span></div>
|
||||
<div class="waves-effect" onclick="about()"><i class="material-icons">info</i><span>About TheDesk</span></div>
|
||||
</div>
|
||||
<div id="right-menu">
|
||||
<!--カラム追加-->
|
||||
|
@ -654,18 +654,19 @@ var tlid=0;
|
|||
</div>
|
||||
<div class="input-field">
|
||||
<div id="auth">
|
||||
<select id="type-sel" style="color:black">
|
||||
<option value="local" data-trans="local">Local</option>
|
||||
<option value="local-media" data-trans="local-media">Local(Media)</option>
|
||||
<option value="home" data-trans="home">Home</option>
|
||||
<option value="pub" data-trans="public">Federated</option>
|
||||
<option value="pub-media" data-trans="public-media">Federated(Media)</option>
|
||||
<option value="dm" data-trans="dm">Direct Message</option>
|
||||
<option value="mix" data-trans="integrated">Integrated(Local and Home)</option>
|
||||
<option value="plus" data-trans="plus">Integrated(Local and replies and BT on Home)</option>
|
||||
<option value="notf" data-trans="notification">Notifications</option>
|
||||
</select>
|
||||
<label data-trans="show_tl">Show this TL:</label>
|
||||
<input type="hidden" value="local" id="type-sel">
|
||||
Show this TL:
|
||||
<div id="tltype">
|
||||
<div class="type waves-effect active" data-type="local"><div><i class="material-icons">people_outline</i></div><span>Local</span></div>
|
||||
<div class="type waves-effect" data-type="local-media"><div><i class="material-icons">people_outline</i><i class="material-icons sub-icon">perm_media</i></div><span>Local(Media)</span></div>
|
||||
<div class="type waves-effect" data-type="home"><div><i class="material-icons">home</i></div><span>Home</span></div>
|
||||
<div class="type waves-effect" data-type="public"><div><i class="material-icons">language</i></div><span>Federated</span></div>
|
||||
<div class="type waves-effect" data-type="public-media"><div><i class="material-icons">language</i><i class="material-icons sub-icon">perm_media</i></div><span>Federated(Media)</span></div>
|
||||
<div class="type waves-effect" data-type="dm"><div><i class="material-icons">mail_outline</i></div><span>Direct Message</span></div>
|
||||
<div class="type waves-effect" data-type="mix"><div><i class="material-icons">merge_type</i></div><span>Integrated(Local/Home)</span></div>
|
||||
<div class="type waves-effect" data-type="plus"><div><i class="material-icons">merge_type</i><i class="material-icons sub-icon">reply</i></div><span>LTL+Reply+BT</span></div>
|
||||
<div class="type waves-effect" data-type="notf"><div><i class="material-icons">notifications</i></div><span>Notifications</span></div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="noauth" class="hide">Show this TL:
|
||||
<input id="noauth-url" type="text" class="validate" style="width:calc( 70% - 40px);" placeholder="e.g:mstdn.jp">
|
||||
|
|
|
@ -32,15 +32,14 @@
|
|||
<script type="text/javascript" src="../../js/common/modal.js"></script>
|
||||
<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
|
||||
<script>
|
||||
var ver="Miria (17.3.0)";
|
||||
var ver="Usamin (18.0.0)";
|
||||
//betaを入れるとバージョンチェックしない
|
||||
//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
|
||||
//var ver="beta";
|
||||
//WinstoreではバージョンCK・言語・Misskeyトークンの機能が排除
|
||||
var winstore=false;
|
||||
var acct_id=0;
|
||||
var tlid=0;
|
||||
verck(ver,winstore);
|
||||
verck(ver);
|
||||
</script>
|
||||
<textarea id="copy" style="top:-100px; position:fixed;"></textarea>
|
||||
<div id="tl">
|
||||
|
@ -643,6 +642,7 @@ var tlid=0;
|
|||
<div class="waves-effect" onclick="listMenu()" id="listMenu"><i class="material-icons">view_headline</i><span>リスト</span></div>
|
||||
<div class="waves-effect" onclick="filterMenu()" id="filterMenu"><i class="material-icons">filter_list</i><span>フィルター</span></div>
|
||||
<div class="waves-effect" onclick="help()"><i class="material-icons">help_outline</i><span>ヘルプ</span></div>
|
||||
<div class="waves-effect" onclick="about()"><i class="material-icons">info</i><span>このソフトについて</span></div>
|
||||
</div>
|
||||
<div id="right-menu">
|
||||
<!--カラム追加-->
|
||||
|
@ -654,18 +654,19 @@ var tlid=0;
|
|||
</div>
|
||||
<div class="input-field">
|
||||
<div id="auth">
|
||||
<select id="type-sel" style="color:black">
|
||||
<option value="local" data-trans="local">ローカル</option>
|
||||
<option value="local-media" data-trans="local-media">ローカル(メディア)</option>
|
||||
<option value="home" data-trans="home">ホーム</option>
|
||||
<option value="pub" data-trans="public">連合</option>
|
||||
<option value="pub-media" data-trans="public-media">連合(メディア)</option>
|
||||
<option value="dm" data-trans="dm">ダイレクトメッセージ</option>
|
||||
<option value="mix" data-trans="integrated">統合(ローカルとホーム)</option>
|
||||
<option value="plus" data-trans="plus">統合(ローカルとブースト・リプライ)</option>
|
||||
<option value="notf" data-trans="notification">通知</option>
|
||||
</select>
|
||||
<label data-trans="show_tl">表示するタイムライン</label>
|
||||
<input type="hidden" value="local" id="type-sel">
|
||||
表示するタイムライン
|
||||
<div id="tltype">
|
||||
<div class="type waves-effect active" data-type="local"><div><i class="material-icons">people_outline</i></div><span>ローカル</span></div>
|
||||
<div class="type waves-effect" data-type="local-media"><div><i class="material-icons">people_outline</i><i class="material-icons sub-icon">perm_media</i></div><span>ローカル(メディア)</span></div>
|
||||
<div class="type waves-effect" data-type="home"><div><i class="material-icons">home</i></div><span>ホーム</span></div>
|
||||
<div class="type waves-effect" data-type="public"><div><i class="material-icons">language</i></div><span>連合</span></div>
|
||||
<div class="type waves-effect" data-type="public-media"><div><i class="material-icons">language</i><i class="material-icons sub-icon">perm_media</i></div><span>連合(メディア)</span></div>
|
||||
<div class="type waves-effect" data-type="dm"><div><i class="material-icons">mail_outline</i></div><span>ダイレクトメッセージ</span></div>
|
||||
<div class="type waves-effect" data-type="mix"><div><i class="material-icons">merge_type</i></div><span>統合(ローカルとホーム)</span></div>
|
||||
<div class="type waves-effect" data-type="plus"><div><i class="material-icons">merge_type</i><i class="material-icons sub-icon">reply</i></div><span>統合(LTL+BT+返信)</span></div>
|
||||
<div class="type waves-effect" data-type="notf"><div><i class="material-icons">notifications</i></div><span>通知</span></div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="noauth" class="hide">表示するタイムライン
|
||||
<input id="noauth-url" type="text" class="validate" style="width:calc( 70% - 40px);" placeholder="e.g:mstdn.jp">
|
||||
|
|
|
@ -37,10 +37,9 @@ var ver="{{versionLetter}}";
|
|||
//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
|
||||
//var ver="beta";
|
||||
//WinstoreではバージョンCK・言語・Misskeyトークンの機能が排除
|
||||
var winstore=false;
|
||||
var acct_id=0;
|
||||
var tlid=0;
|
||||
verck(ver,winstore);
|
||||
verck(ver);
|
||||
</script>
|
||||
<textarea id="copy" style="top:-100px; position:fixed;"></textarea>
|
||||
<div id="tl">
|
||||
|
@ -643,6 +642,7 @@ var tlid=0;
|
|||
<div class="waves-effect" onclick="listMenu()" id="listMenu"><i class="material-icons">view_headline</i><span>{{list}}</span></div>
|
||||
<div class="waves-effect" onclick="filterMenu()" id="filterMenu"><i class="material-icons">filter_list</i><span>{{filter}}</span></div>
|
||||
<div class="waves-effect" onclick="help()"><i class="material-icons">help_outline</i><span>{{help}}</span></div>
|
||||
<div class="waves-effect" onclick="about()"><i class="material-icons">info</i><span>{{about}}</span></div>
|
||||
</div>
|
||||
<div id="right-menu">
|
||||
<!--カラム追加-->
|
||||
|
@ -654,18 +654,19 @@ var tlid=0;
|
|||
</div>
|
||||
<div class="input-field">
|
||||
<div id="auth">
|
||||
<select id="type-sel" style="color:black">
|
||||
<option value="local" data-trans="local">{{local}}</option>
|
||||
<option value="local-media" data-trans="local-media">{{localMedia}}</option>
|
||||
<option value="home" data-trans="home">{{home}}</option>
|
||||
<option value="pub" data-trans="public">{{fed}}</option>
|
||||
<option value="pub-media" data-trans="public-media">{{fedMedia}}</option>
|
||||
<option value="dm" data-trans="dm">{{dm}}</option>
|
||||
<option value="mix" data-trans="integrated">{{integratedTLDes}}</option>
|
||||
<option value="plus" data-trans="plus">{{localPlusDes}}</option>
|
||||
<option value="notf" data-trans="notification">{{notf}}</option>
|
||||
</select>
|
||||
<label data-trans="show_tl">{{showThisTL}}</label>
|
||||
<input type="hidden" value="local" id="type-sel">
|
||||
{{showThisTL}}
|
||||
<div id="tltype">
|
||||
<div class="type waves-effect active" data-type="local"><div><i class="material-icons">people_outline</i></div><span>{{local}}</span></div>
|
||||
<div class="type waves-effect" data-type="local-media"><div><i class="material-icons">people_outline</i><i class="material-icons sub-icon">perm_media</i></div><span>{{localMedia}}</span></div>
|
||||
<div class="type waves-effect" data-type="home"><div><i class="material-icons">home</i></div><span>{{home}}</span></div>
|
||||
<div class="type waves-effect" data-type="public"><div><i class="material-icons">language</i></div><span>{{fed}}</span></div>
|
||||
<div class="type waves-effect" data-type="public-media"><div><i class="material-icons">language</i><i class="material-icons sub-icon">perm_media</i></div><span>{{fedMedia}}</span></div>
|
||||
<div class="type waves-effect" data-type="dm"><div><i class="material-icons">mail_outline</i></div><span>{{dm}}</span></div>
|
||||
<div class="type waves-effect" data-type="mix"><div><i class="material-icons">merge_type</i></div><span>{{integratedTLDes}}</span></div>
|
||||
<div class="type waves-effect" data-type="plus"><div><i class="material-icons">merge_type</i><i class="material-icons sub-icon">reply</i></div><span>{{localPlusDes}}</span></div>
|
||||
<div class="type waves-effect" data-type="notf"><div><i class="material-icons">notifications</i></div><span>{{notf}}</span></div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="noauth" class="hide">{{showThisTL}}
|
||||
<input id="noauth-url" type="text" class="validate" style="width:calc( 70% - 40px);" placeholder="e.g:mstdn.jp">
|
||||
|
|
|
@ -115,8 +115,8 @@
|
|||
"fed":"Federated",
|
||||
"fedMedia":"Federated(Media)",
|
||||
"dm":"Direct Message",
|
||||
"integratedTLDes":"Integrated(Local and Home)",
|
||||
"localPlusDes":"Integrated(Local and replies and BT on Home)",
|
||||
"integratedTLDes":"Integrated(Local/Home)",
|
||||
"localPlusDes":"LTL+Reply+BT",
|
||||
"notf":"Notifications",
|
||||
"showThisTL":"Show this TL:",
|
||||
"webviewWarn":"TweetDeck with customed TJDeck(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>). Keyboard shortcuts will irritate you. When you feel so, you check 'Prefer WebView' on top of the column.",
|
||||
|
@ -154,5 +154,6 @@
|
|||
"clockTips":"Clock",
|
||||
"ramTips":"RAM status",
|
||||
"changeTips":"Change Tips",
|
||||
"help":"Help"
|
||||
"help":"Help",
|
||||
"about":"About TheDesk"
|
||||
}
|
|
@ -116,7 +116,7 @@
|
|||
"fedMedia":"連合(メディア)",
|
||||
"dm":"ダイレクトメッセージ",
|
||||
"integratedTLDes":"統合(ローカルとホーム)",
|
||||
"localPlusDes":"統合(ローカルとブースト・リプライ)",
|
||||
"localPlusDes":"統合(LTL+BT+返信)",
|
||||
"notf":"通知",
|
||||
"showThisTL":"表示するタイムライン",
|
||||
"webviewWarn":"TweetDeckを表示します。TJDeckをカスタムしたものが読み込まれます(<a href='https://gist.github.com/cutls/8787a55d2c1c53274e68a427966046a6' target='_blank'>Code</a>/<a href='https://gist.github.com/totoraj930/d1394dadb51d75666a76829f61e7280c' target='_blank'>TJDeck</a>)。キーボードショートカットが邪魔をするので、文字入力時はカラムの「WebView優先」にチェックを入れてください。",
|
||||
|
@ -154,5 +154,6 @@
|
|||
"clockTips":"時計",
|
||||
"ramTips":"システムメモリ容量",
|
||||
"changeTips":"Tips変更",
|
||||
"help":"ヘルプ"
|
||||
"help":"ヘルプ",
|
||||
"about":"このソフトについて"
|
||||
}
|
|
@ -32,15 +32,14 @@
|
|||
<script type="text/javascript" src="../../js/common/modal.js"></script>
|
||||
<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
|
||||
<script>
|
||||
var ver="Miria (17.3.0)";
|
||||
var ver="Usamin (18.0.0)";
|
||||
//betaを入れるとバージョンチェックしない
|
||||
//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
|
||||
//var ver="beta";
|
||||
//WinstoreではバージョンCK・言語・Misskeyトークンの機能が排除
|
||||
var winstore=false;
|
||||
var acct_id=0;
|
||||
var tlid=0;
|
||||
verck(ver,winstore);
|
||||
verck(ver);
|
||||
</script>
|
||||
<textarea id="copy" style="top:-100px; position:fixed;"></textarea>
|
||||
<div id="tl">
|
||||
|
@ -643,6 +642,7 @@ var tlid=0;
|
|||
<div class="waves-effect" onclick="listMenu()" id="listMenu"><i class="material-icons">view_headline</i><span>crwdns444:0crwdne444:0</span></div>
|
||||
<div class="waves-effect" onclick="filterMenu()" id="filterMenu"><i class="material-icons">filter_list</i><span>crwdns515:0crwdne515:0</span></div>
|
||||
<div class="waves-effect" onclick="help()"><i class="material-icons">help_outline</i><span>crwdns1894:0crwdne1894:0</span></div>
|
||||
<div class="waves-effect" onclick="about()"><i class="material-icons">info</i><span>{{about}}</span></div>
|
||||
</div>
|
||||
<div id="right-menu">
|
||||
<!--カラム追加-->
|
||||
|
@ -654,18 +654,19 @@ var tlid=0;
|
|||
</div>
|
||||
<div class="input-field">
|
||||
<div id="auth">
|
||||
<select id="type-sel" style="color:black">
|
||||
<option value="local" data-trans="local">crwdns480:0crwdne480:0</option>
|
||||
<option value="local-media" data-trans="local-media">crwdns481:0crwdne481:0</option>
|
||||
<option value="home" data-trans="home">crwdns482:0crwdne482:0</option>
|
||||
<option value="pub" data-trans="public">crwdns483:0crwdne483:0</option>
|
||||
<option value="pub-media" data-trans="public-media">crwdns484:0crwdne484:0</option>
|
||||
<option value="dm" data-trans="dm">crwdns485:0crwdne485:0</option>
|
||||
<option value="mix" data-trans="integrated">crwdns486:0crwdne486:0</option>
|
||||
<option value="plus" data-trans="plus">crwdns487:0crwdne487:0</option>
|
||||
<option value="notf" data-trans="notification">crwdns488:0crwdne488:0</option>
|
||||
</select>
|
||||
<label data-trans="show_tl">crwdns489:0crwdne489:0</label>
|
||||
<input type="hidden" value="local" id="type-sel">
|
||||
crwdns489:0crwdne489:0
|
||||
<div id="tltype">
|
||||
<div class="type waves-effect active" data-type="local"><div><i class="material-icons">people_outline</i></div><span>crwdns480:0crwdne480:0</span></div>
|
||||
<div class="type waves-effect" data-type="local-media"><div><i class="material-icons">people_outline</i><i class="material-icons sub-icon">perm_media</i></div><span>crwdns481:0crwdne481:0</span></div>
|
||||
<div class="type waves-effect" data-type="home"><div><i class="material-icons">home</i></div><span>crwdns482:0crwdne482:0</span></div>
|
||||
<div class="type waves-effect" data-type="public"><div><i class="material-icons">language</i></div><span>crwdns483:0crwdne483:0</span></div>
|
||||
<div class="type waves-effect" data-type="public-media"><div><i class="material-icons">language</i><i class="material-icons sub-icon">perm_media</i></div><span>crwdns484:0crwdne484:0</span></div>
|
||||
<div class="type waves-effect" data-type="dm"><div><i class="material-icons">mail_outline</i></div><span>crwdns485:0crwdne485:0</span></div>
|
||||
<div class="type waves-effect" data-type="mix"><div><i class="material-icons">merge_type</i></div><span>crwdns486:0crwdne486:0</span></div>
|
||||
<div class="type waves-effect" data-type="plus"><div><i class="material-icons">merge_type</i><i class="material-icons sub-icon">reply</i></div><span>crwdns487:0crwdne487:0</span></div>
|
||||
<div class="type waves-effect" data-type="notf"><div><i class="material-icons">notifications</i></div><span>crwdns488:0crwdne488:0</span></div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="noauth" class="hide">crwdns489:0crwdne489:0
|
||||
<input id="noauth-url" type="text" class="validate" style="width:calc( 70% - 40px);" placeholder="e.g:mstdn.jp">
|
||||
|
|
Loading…
Reference in New Issue
Block a user