Column(Stack/Dock)

This commit is contained in:
Cutls 2019-03-21 04:42:47 +09:00
parent 22d54ab2ab
commit ba074dd1b0
4 changed files with 52 additions and 10 deletions

View File

@ -108,10 +108,15 @@ iframe {
.box { .box {
overflow: hidden; overflow: hidden;
min-width: 300px; min-width: 300px;
height: 100vh;
flex: 1; flex: 1;
border: thin solid gray;
border-top:none; border-top:none;
display:flex;
flex-direction: column;
}
.boxIn{
height:100%;
border: thin solid gray;
overflow: hidden;
} }
.box .pin,#his-data .pin{ .box .pin,#his-data .pin{
display:none; display:none;
@ -131,7 +136,11 @@ iframe {
.faicon_FTL{ .faicon_FTL{
display:none; display:none;
} }
.tl-box{ height:calc(100% - 40px); overflow-y:scroll; overflow-x:hidden } .tl-box{
position:relative;
height:calc(100% - 40px);
overflow-y:scroll;
overflow-x:hidden }
.additional { .additional {
overflow-x: scroll; overflow-x: scroll;
width: 100%; width: 100%;

View File

@ -122,6 +122,8 @@ var lang={
"lang_layout_webviewmode":"Prefer WebView", "lang_layout_webviewmode":"Prefer WebView",
"lang_excluded":"Excluded type of notification", "lang_excluded":"Excluded type of notification",
"lang_layout_excludingbt":"Show BT mode(OFF/Exclude BT/Only BT)", "lang_layout_excludingbt":"Show BT mode(OFF/Exclude BT/Only BT)",
"lang_layout_leftFold":"Stack to the left",
"lang_layout_leftUnfold":"Dock on the right",
//ui/sort.js //ui/sort.js
"lang_sort_gothis":"Go to this column", "lang_sort_gothis":"Go to this column",
"lang_sort_remthis":"Delete this column", "lang_sort_remthis":"Delete this column",

View File

@ -122,6 +122,8 @@ var lang={
"lang_layout_webviewmode":"WebView優先", "lang_layout_webviewmode":"WebView優先",
"lang_excluded":"除外する通知", "lang_excluded":"除外する通知",
"lang_layout_excludingbt":"BT表示(OFF/BT除外/BTのみ)", "lang_layout_excludingbt":"BT表示(OFF/BT除外/BTのみ)",
"lang_layout_leftFold":"左へ重ねる",
"lang_layout_leftUnfold":"右へ出す",
//ui/sort.js //ui/sort.js
"lang_sort_gothis":"このカラムへ", "lang_sort_gothis":"このカラムへ",
"lang_sort_remthis":"このカラムを削除", "lang_sort_remthis":"このカラムを削除",

View File

@ -72,7 +72,9 @@ function parseColumn() {
if ($("#timeline-container").length) { if ($("#timeline-container").length) {
$("#timeline-container").html(""); $("#timeline-container").html("");
} }
Object.keys(obj).forEach(function(key) { var basekey=0;
for(var key=0;key<obj.length;key++){
var next=key+1;
var acct = obj[key]; var acct = obj[key];
if(acct.type=="notf"){ if(acct.type=="notf"){
var notf_attr=' data-notf='+acct.domain; var notf_attr=' data-notf='+acct.domain;
@ -108,7 +110,7 @@ function parseColumn() {
icnsert=' style="color: #'+ichex+'" '; icnsert=' style="color: #'+ichex+'" ';
} }
} }
console.log(acct.domain); console.log(acct);
if(acctlist[acct.domain]){ if(acctlist[acct.domain]){
if(acctlist[acct.domain].background!="def"){ if(acctlist[acct.domain].background!="def"){
insert=insert+" border-bottom:medium solid #"+acctlist[acct.domain].background+";"; insert=insert+" border-bottom:medium solid #"+acctlist[acct.domain].background+";";
@ -152,7 +154,18 @@ function parseColumn() {
}else{ }else{
var exclude=""; var exclude="";
} }
var html = '<div style="'+css+'" class="box '+animecss+'" id="timeline_box_' + key + '_box" tlid="' + key + if(!acct.left_fold){
basekey=key;
var basehtml = '<div style="'+css+'" class="box '+animecss+'" id="timeline_box_' + basekey + '_parentBox"></div>';
$("#timeline-container").append(basehtml);
var left_hold='<a onclick="leftFoldSet(' + key +')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_leftFold+'">view_agenda</i></a>'+lang.lang_layout_leftFold+'</span><br>';
}else{
var left_hold='<a onclick="leftFoldRemove(' + key +')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_leftUnfold+'">view_column</i></a>'+lang.lang_layout_leftUnfold+'</span><br>';
}
if(key===0){
left_hold='';
}
var html='<div class="boxIn" id="timeline_box_' + key + '_box" tlid="' + key +
'" data-acct="'+acct.domain+'"><div class="notice-box z-depth-2" id="menu_'+key+'" style="'+insert+' ">'+ '" data-acct="'+acct.domain+'"><div class="notice-box z-depth-2" id="menu_'+key+'" style="'+insert+' ">'+
'<div class="area-notice"><i class="material-icons waves-effect red-text" id="notice_icon_' + key + '"'+notf_attr+' style="font-size:40px; padding-top:25%;" onclick="goTop(' + key + ')" title="'+lang.lang_layout_gotop +'"></i></div>'+ '<div class="area-notice"><i class="material-icons waves-effect red-text" id="notice_icon_' + key + '"'+notf_attr+' style="font-size:40px; padding-top:25%;" onclick="goTop(' + key + ')" title="'+lang.lang_layout_gotop +'"></i></div>'+
'<div class="area-notice_name"><span id="notice_' + key + '" class="tl-title"></span></div>'+ '<div class="area-notice_name"><span id="notice_' + key + '" class="tl-title"></span></div>'+
@ -166,7 +179,7 @@ function parseColumn() {
'<div class="column-hide notf-indv-box z-depth-4" id="notf-box_' + key + '<div class="column-hide notf-indv-box z-depth-4" id="notf-box_' + key +
'"><div id="notifications_' + key + '"><div id="notifications_' + key +
'" data-notf="' + acct.domain + '" data-type="notf"></div></div><div class="column-hide notf-indv-box" id="util-box_' + key + '" data-notf="' + acct.domain + '" data-type="notf"></div></div><div class="column-hide notf-indv-box" id="util-box_' + key +
'" style="padding:5px;">'+exclude+'<a onclick="mediaToggle(' + key + '" style="padding:5px;">'+exclude+left_hold+'<a onclick="mediaToggle(' + key +
')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_mediafil +'">perm_media</i><span id="sta-media-' + ')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_mediafil +'">perm_media</i><span id="sta-media-' +
key + '">On</span></a>'+lang.lang_layout_mediafil +'<br><a onclick="cardToggle(' + key + key + '">On</span></a>'+lang.lang_layout_mediafil +'<br><a onclick="cardToggle(' + key +
')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_linkanades +'">link</i><span id="sta-card-' + ')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_linkanades +'">link</i><span id="sta-card-' +
@ -174,8 +187,8 @@ function parseColumn() {
')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_tts +'">hearing</i><span id="sta-voice-' + ')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_tts +'">hearing</i><span id="sta-voice-' +
key + '">On</span></a>'+lang.lang_layout_tts +'TL<br><a onclick="reconnector(' + key + key + '">On</span></a>'+lang.lang_layout_tts +'TL<br><a onclick="reconnector(' + key +
',\''+acct.type+'\',\''+acct.domain+'\',\''+acct.data+'\')" class="setting nex '+if_notf+'"><i class="material-icons waves-effect nex '+if_notf+'" title="'+lang.lang_layout_reconnect+'">low_priority</i></a><span class="'+if_notf+'">'+lang.lang_layout_reconnect+'</span><br>'+lang.lang_layout_headercolor +'<br><div id="picker_'+key+'" class="color-picker"></div></div><div class="tl-box" tlid="' + key + '"><div id="timeline_' + key + ',\''+acct.type+'\',\''+acct.domain+'\',\''+acct.data+'\')" class="setting nex '+if_notf+'"><i class="material-icons waves-effect nex '+if_notf+'" title="'+lang.lang_layout_reconnect+'">low_priority</i></a><span class="'+if_notf+'">'+lang.lang_layout_reconnect+'</span><br>'+lang.lang_layout_headercolor +'<br><div id="picker_'+key+'" class="color-picker"></div></div><div class="tl-box" tlid="' + key + '"><div id="timeline_' + key +
'" class="tl '+acct.type+'-timeline " tlid="' + key + '" data-type="' + acct.type + '" data-acct="'+acct.domain+'"><div id="landing_'+key+'" style="text-align:center">'+lang.lang_layout_nodata +'</div></div></div></div>'; '" class="tl '+acct.type+'-timeline " tlid="' + key + '" data-type="' + acct.type + '" data-acct="'+acct.domain+'"><div id="landing_'+key+'" style="text-align:center">'+lang.lang_layout_nodata +'</div></div></div>'
$("#timeline-container").append(html); $('#timeline_box_' + basekey + '_parentBox').append(html);
localStorage.removeItem("pool_" + key); localStorage.removeItem("pool_" + key);
if (acct.data) { if (acct.data) {
var data = acct.data; var data = acct.data;
@ -200,7 +213,7 @@ function parseColumn() {
catchCheck(key); catchCheck(key);
voiceCheck(key); voiceCheck(key);
} }
}); }
var box = localStorage.getItem("box"); var box = localStorage.getItem("box");
if (box == "absolute") { if (box == "absolute") {
setTimeout(show, 1000); setTimeout(show, 1000);
@ -424,4 +437,20 @@ function webview(url,key,insert,icnsert,css){
'" class="tl" tlid="' + key + '" data-type="webview" style="width:100%;height:100%;"><webview src="'+url+'" style="width:100%;height:100%;" id="webview" preload="./js/platform/twitter.js"></webview></div></div></div>'; '" class="tl" tlid="' + key + '" data-type="webview" style="width:100%;height:100%;"><webview src="'+url+'" style="width:100%;height:100%;" id="webview" preload="./js/platform/twitter.js"></webview></div></div></div>';
return html; return html;
}
function leftFoldSet(key){
var multi = localStorage.getItem("column");
var obj = JSON.parse(multi);
obj[key].left_fold=true;
var json = JSON.stringify(obj);
localStorage.setItem("column", json);
parseColumn();
}
function leftFoldRemove(key){
var multi = localStorage.getItem("column");
var obj = JSON.parse(multi);
obj[key].left_fold=false;
var json = JSON.stringify(obj);
localStorage.setItem("column", json);
parseColumn();
} }