From 7f64bd6d2a4448e7f94b5ce21668f91113a10ef8 Mon Sep 17 00:00:00 2001 From: cutls Date: Sat, 28 Jul 2018 06:25:12 +0900 Subject: [PATCH] TheDesk Akane beta-phase:1 --- app/css/master.css | 17 +- app/css/post.css | 6 +- app/css/sort.css | 35 +- app/css/themes.css | 2 +- app/css/tl.css | 104 +++-- app/index.html | 419 +++++++++--------- app/js/common/keyshortcut.js | 22 +- app/js/common/version.js | 61 +-- app/js/login/login.js | 1 + app/js/login/manager.js | 52 +++ app/js/post/emoji.js | 4 + app/js/post/post.js | 6 + app/js/post/use-txtbox.js | 2 + app/js/tl/filter.js | 4 +- app/js/tl/list.js | 7 +- app/js/tl/notification.js | 33 ++ app/js/tl/parse.js | 19 +- app/js/tl/src.js | 4 +- app/js/tl/tag.js | 10 +- app/js/ui/layout.js | 10 +- app/js/ui/post-box.js | 94 ++-- app/js/ui/sort.js | 7 +- app/js/ui/tips.js | 103 +++++ app/js/userdata/showOnTL.js | 11 +- app/main.js | 14 +- app/new.html | 820 +++++++++++++++++++++++++++++++++++ app/package-lock.json | 2 +- app/setting.html | 2 +- package-lock.json | 269 +----------- 29 files changed, 1449 insertions(+), 691 deletions(-) create mode 100644 app/new.html diff --git a/app/css/master.css b/app/css/master.css index 4cb80ac9..2f6e71aa 100644 --- a/app/css/master.css +++ b/app/css/master.css @@ -1,5 +1,13 @@ /*共通CSS*/ -html,body{overflow:hidden; user-select: none; cursor:default; font-size:13px;height: 100vh; background-color: var(--bg); color: var(--color);} +html,body{ + overflow:hidden; + user-select: none; + cursor:default; + font-size:13px; + height: 100vh; + background-color: var(--bg); + color: var(--color); +} .btn { margin: 5px; text-transform: none; @@ -54,6 +62,10 @@ option { .pointer { cursor: pointer; } +.badge{ + min-width: 0 !important; + margin-left: 5px !important; +} .bbcode-pulse-loadings, .bbcode-pulse-loading, .fa-pulse { display: inline-block; animation-duration: 3s; @@ -212,6 +224,7 @@ blockquote:before, .quote:before { } + /*スクロールバー*/ ::-webkit-scrollbar { width: 5px; @@ -226,6 +239,6 @@ blockquote:before, .quote:before { ::-webkit-scrollbar-thumb { -webkit-border-radius: 5px; border-radius: 5px; - background: #9e9e9e; + background: #607d8b; -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5); } \ No newline at end of file diff --git a/app/css/post.css b/app/css/post.css index e8630073..21fb6e74 100644 --- a/app/css/post.css +++ b/app/css/post.css @@ -1,11 +1,11 @@ /*トゥートボックス向けCSS*/ #post-box { position: fixed; - right: 78px; - bottom: 3px; + left: 78px; + bottom: -500px; background-color: var(--postbox); border: thin solid gray; - z-index: 500; + z-index: 501; width: 300px; min-width:300px; max-width:100%; diff --git a/app/css/sort.css b/app/css/sort.css index 3f8a4281..e95a3491 100644 --- a/app/css/sort.css +++ b/app/css/sort.css @@ -1,13 +1,42 @@ .drag-content{ width:300px; max-width:100%; - height:30px; + height:300px; text-overflow: ellipsis; cursor:move; user-select: none; - background-color:black; + background-color:var(--modalfooter); margin:5px; border-radius:5px; - color:white; + color:var(--color); padding:3px; + font-family:Open Sans; + font-size:20px; + flex-grow:1; + text-align: center; + padding:10px; +} +#sort{ + display:flex; + flex-direction:row; + overflow-x:scroll; + display: flex; + justify-content: center; + width:100vw; + +} +#sort-box{ + position:absolute; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + width:100vw; + height:calc(100vh - 40px); + background-color: rgba(0, 0, 0, 0.8); + z-index:10002; +} +#sort-box button{ + background-color: var(--notfbox); + color:var(--color); } \ No newline at end of file diff --git a/app/css/themes.css b/app/css/themes.css index 0d5f6521..5ab647d9 100644 --- a/app/css/themes.css +++ b/app/css/themes.css @@ -5,7 +5,7 @@ --modal:white; --subcolor:#e0e0e0; --box:white; - --sidebar:#e0e0e0; + --sidebar:#eeeeee; --shared:#cfd8dc; --notfbox:white; --emphasized:#81c784; diff --git a/app/css/tl.css b/app/css/tl.css index 3d35deaf..0cde2ce8 100644 --- a/app/css/tl.css +++ b/app/css/tl.css @@ -7,55 +7,61 @@ overflow-x: scroll; overflow-y: hidden; display: flex; - height: 100vh; + height: calc(100vh - 40px); flex-grow:4; } -#sidebar{ - width:75px; - min-width:75px; - height:100vh; +#bottom{ + position:absolute; + bottom:0; + width:100vw; + height:40px; + padding:3px; + padding-right:40px; background-color:var(--sidebar); display:flex; + flex-direction: row-reverse; + justify-content: space-between; flex-wrap:wrap; + z-index:500; + box-shadow: 10px 0 10px 10px rgba(0, 0, 0, 0.2); } -#sidebar-top{ - height:calc(100vh - 100px); - display:flex; - flex-wrap:wrap; - align-content:flex-start; - overflow-y:scroll; - overflow-x:hidden; +#bottom #dambox{ + width:300px; } -#sidebar-btm{ - height:9em; - display:flex; - flex-wrap:wrap; - align-content:flex-end; +#bottom .trendtag{ + height:40px; } -#sidebar div{ - width:100%; - vertical-align:text-bottom; +#bottom #group{ + margin-right:40px; } -#sidebar a{ +#bottom .leftside{ + display:flex; flex-direction: row-reverse; +} +#bottom #tips img{ + vertical-align: -3px; +} +#bottom a{ color:var(--color); } -#sidebar .big-menu{ - text-align:center; +#bottom i{ + font-size:30px; } -#sidebar .big-menu i.big-icon{ - font-size:5em; +#bottom .btnsgroup{ + border:1px solid; + padding:1px; + padding-left:5px; + padding-right:5px; + margin-right:15px; + border-radius:5px; } -#sidebar .small-menu i{ - font-size:2rem; +.btnsgroup .grouptitle{ + font-family:Open Sans; + font-size:15px; } -#sidebar .small-menu .side-label{ - font-size:12px; - vertical-align: 0.6rem; +@media screen and (max-width: 1344px) { + .btnsgroup .grouptitle{ display: none; } + #tips{ display: none; } } -#sidebar .side-dead{ - height:30px; -} - iframe { max-width:100%; } @@ -112,7 +118,7 @@ iframe { width: 100%; display: grid; grid-template-columns: 43px 2fr 1fr; - grid-template-areas: 'notice notice notice' 'icon display_name display_name' 'icon toot toot' 'vis additional additional' 'actions actions actions'; + grid-template-areas: 'notice notice notice' 'icon display_name display_name' 'icon toot toot' 'vis additional additional' 'actions actions side'; } .area-notice { @@ -145,10 +151,6 @@ justify-content:space-between; overflow:hidden; text-overflow: ellipsis; } -.flex-time{ - -} - .area-toot { cursor:text; @@ -175,7 +177,7 @@ grid-area: toot; top:-20px; display:flex; justify-content:space-around; - width:300px; + width:250px; max-width:100%; grid-area: actions; } @@ -184,7 +186,18 @@ grid-area: toot; font-size:0.5rem !important; grid-area: vis; } - +.area-side { + display:flex; + justify-content:flex-end; + margin:2px; + grid-area: side; +} +.area-side i{ + margin-left:10px; +} +.viabadge{ + margin-top:10px; +} .action i{ font-size:1rem; } @@ -258,9 +271,9 @@ p:not(:last-child){ z-index:500; padding:5px; display: grid; - grid-template-columns: 40px 1fr 1fr 1fr; + grid-template-columns: 40px 48px 1fr 24px; grid-template-rows: 30px 30px; - grid-template-areas: 'notice notice_name notice_name notice_name' 'notice a1 a2 a3' 'notf-box notf-box notf-box notf-box'; + grid-template-areas: 'notice notice_name notice_name a2' 'notice a1 sta a3' 'notf-box notf-box notf-box notf-box'; } .emp{ font-weight: bold; @@ -283,7 +296,10 @@ p:not(:last-child){ text-align: center; grid-area: a1; } - +.area-sta { + text-align: center; + grid-area: sta; +} .area-a2 { text-align: center; grid-area: a2; diff --git a/app/index.html b/app/index.html index f5d91546..72a7227a 100644 --- a/app/index.html +++ b/app/index.html @@ -18,14 +18,13 @@ - diff --git a/app/js/common/keyshortcut.js b/app/js/common/keyshortcut.js index e819d8bf..ba410301 100644 --- a/app/js/common/keyshortcut.js +++ b/app/js/common/keyshortcut.js @@ -52,17 +52,23 @@ $(function($) { //Ctrl+Sift+N:NowPlaying if (event.ctrlKey && event.shiftKey) { if (e.keyCode === 78) { + show(); nowplaying() return false; } } //input/textareaにフォーカスなし時 if (!hasFocus && !hasFocus2) { + //Ctrl+V:いつもの + if (event.ctrlKey) { + if (e.keyCode === 86) { + show(); + } + } //X:開閉 if (e.keyCode === 88) { - if ($("#post-box").hasClass("hidenbox")) { + if (!$("#post-box").hasClass("appear")) { show(); - $('textarea').focus(); } else { hide(); } @@ -70,16 +76,18 @@ $(function($) { } //N:新トゥート if (e.keyCode === 78) { - if ($("#post-box").hasClass("hidenbox")) { + if (!$("#post-box").hasClass("appear")) { show(); } $('textarea').focus(); return false; } - //E:拡張On/Off - if (e.keyCode === 69) { - zoomBox(); - return false; + //Ctrl+E:全ての通知未読を既読にする + if (event.ctrlKey) { + if (e.keyCode === 69) { + allNotfRead(); + return false; + } } //Ctrl+Space:読み込み if (event.ctrlKey) { diff --git a/app/js/common/version.js b/app/js/common/version.js index 70c0f9e1..76397e55 100644 --- a/app/js/common/version.js +++ b/app/js/common/version.js @@ -19,65 +19,6 @@ function verck(ver) { var l = 5; - // 生成する文字列に含める文字セット - var c = "abcdefghijklmnopqrstuvwxyz0123456789"; - var electron = require("electron"); - var remote=electron.remote; - var platform=remote.process.platform; - if(platform=="darwin"){ - var newest=mess.desk_mac; - }else{ - var newest=mess.desk; - } - var cl = c.length; - var r = ""; - for(var i=0; i= 0 && obj.length < 5 && noticetext != memory) { + if (toot.type == "mention") { + $(".notf-reply_" + acct_id).text($(".notf-reply_" + acct_id).text()*1+1); + $(".notf-reply_" + acct_id).removeClass("hide") + }else if (toot.type == "reblog") { + $(".notf-bt_" + acct_id).text($(".notf-bt_" + acct_id).text()*1+1); + $(".notf-bt_" + acct_id).removeClass("hide") + }else if (toot.type == "favourite") { + $(".notf-fav_" + acct_id).text($(".notf-fav_" + acct_id).text()*1+1); + $(".notf-fav_" + acct_id).removeClass("hide") + } var domain = localStorage.getItem("domain_" + acct_id); if(popup>0){ Materialize.toast("["+domain+"より]"+escapeHTML(toot.account.display_name)+what, popup * 1000); @@ -575,12 +585,13 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) { +'
redo
'+trans+ - '
expand_more
' + + 'via ' + + via + + ''+ + '
expand_more
' + '
more_vert
' + - 'via ' + - via + - '
' + + '' + ''; }); if (mix == "mix") { diff --git a/app/js/tl/src.js b/app/js/tl/src.js index 3f883fbe..07806603 100644 --- a/app/js/tl/src.js +++ b/app/js/tl/src.js @@ -6,8 +6,8 @@ function srcToggle() { if($("#src-box").hasClass("show")){ trend(); } - $("#src-box").css("top",$('#src-tgl').offset().top+"px"); - $("#src-box").css("left",$('#src-tgl').offset().left-510+"px"); + $("#src-box").css("bottom","40px"); + $("#src-box").css("left",$('#src-tgl').offset().left-$('#src-box').width()/2+"px"); $('ul.tabs').tabs('select_tab', 'src-sta'); $("#src-contents").html(""); } diff --git a/app/js/tl/tag.js b/app/js/tl/tag.js index 3aa8347b..94a5b550 100644 --- a/app/js/tl/tag.js +++ b/app/js/tl/tag.js @@ -57,7 +57,7 @@ function favTag(){ Object.keys(obj).forEach(function(key) { var tag = obj[key]; tags = tags + '#' + tag + '　TL　Toot　'+ - 'Unpin '; + '実況　削除 '; }); if(obj.length>0){ $("#taglist").append("My Tags:" + tags); @@ -87,9 +87,9 @@ function trendTag(){ var tags=""; json=json.score; Object.keys(json).forEach(function(tag) { - tags = tags + '#' + tag + '　TL　Toot '; + tags = tags + '#' + tag + '　TL　Toot '; }); - $("#taglist").append('
トレンドタグrefresh:' + tags+'
'); + $("#taglist").append('
アイマストドントレンドタグrefresh:' + tags+'
'); trendintervalset() }else{ $("#taglist").html(""); @@ -105,4 +105,8 @@ function trendintervalset(){ function tagTL(a,b,c,d){ var acct_id = $("#post-acct-sel").val(); tl(a,b,acct_id,d); +} +function autoToot(tag){ + localStorage.setItem("stable",tag); + Materialize.toast("次に"+tag+"なしでトゥートするまで全てのトゥートに"+tag+"が付与されます。",3000); } \ No newline at end of file diff --git a/app/js/ui/layout.js b/app/js/ui/layout.js index c28a7761..ec6d0766 100644 --- a/app/js/ui/layout.js +++ b/app/js/ui/layout.js @@ -10,8 +10,8 @@ var websocketNotf = []; function addToggle() { $("#add-box").toggleClass("hide"); addselCk() - $("#add-box").css("top",$('#add-tgl').offset().top+"px"); - $("#add-box").css("left",$('#add-tgl').offset().left-410+"px"); + $("#add-box").css("bottom","40px"); + $("#add-box").css("left",$('#add-tgl').offset().left-$('#add-box').width()/2+"px"); $("#add-box").toggleClass("show"); } //最初、カラム変更時に発火 @@ -108,7 +108,7 @@ function parseColumn() { '
'+ '
notifications
'+ + acct.domain + '">notifications
0000
'+ '
cancel
'+ '
forward'+localStorage.getItem("user_" + acct.domain)+"@"+localStorage.getItem("domain_" + acct.domain)+" "+cap(acct.type, acct.data)+' cancel'; + ')" class="setting nex">forward cancel
'+localStorage.getItem("user_" + acct.domain)+"@"+localStorage.getItem("domain_" + acct.domain)+" "+cap(acct.type, acct.data)+''; $("#sort").append(html); }); drag(); @@ -92,6 +92,7 @@ function sort(){ Materialize.toast("並べ替え完了。", 3000); sortload(); parseColumn(); + sortToggle() } //ソートボタントグル function sortToggle(){ @@ -99,8 +100,6 @@ function sortToggle(){ if ($("#sort-box").hasClass("hide")) { $("#sort-box").removeClass("hide"); $("#sort-box").addClass("show"); - $("#sort-box").css("top",$('#sort-tgl').offset().top+"px"); - $("#sort-box").css("left",$('#sort-tgl').offset().left-410+"px"); //並べ替え sortload(); } else { diff --git a/app/js/ui/tips.js b/app/js/ui/tips.js index 5980ffcb..72d3bf8a 100644 --- a/app/js/ui/tips.js +++ b/app/js/ui/tips.js @@ -6,3 +6,106 @@ function todo(mes){ function todc(){ $('#message').fadeOut(); } +function tips(mode){ + var electron = require("electron"); + var ipc = electron.ipcRenderer; + ipc.send('endmem', ""); + clearInterval(clockint); + if(mode=="ver"){ + tipsToggle() + $("#tips-text").html('TheDesk '+localStorage.getItem("ver")) + localStorage.setItem("tips","ver") + }else if(mode=="clock"){ + tipsToggle() + localStorage.setItem("tips","clock") + clock() + }else if(mode=="memory"){ + tipsToggle() + localStorage.setItem("tips","memory") + startmem(); + }else if(mode=="trend"){ + tipsToggle() + localStorage.setItem("tips","trend") + trendTagonTip() + } +} +//メモリ +function startmem(){ + var electron = require("electron"); + var ipc = electron.ipcRenderer; + ipc.send('startmem', ""); + ipc.on('memory', function (event, arg) { + var use=arg[0]; + var cpu=arg[1]; + var total=arg[2] + $("#tips-text").html(cpu+"
Memory:"+Math.floor(use/1024/1024/102.4)/10+"/"+Math.floor(total/1024/1024/102.4)/10+"GB("+Math.floor(use/total*100)+"%)") + }) +} +//トレンドタグ +function trendTagonTip(){ + $(".trendtag").remove(); + var domain="imastodon.net" + var at = localStorage.getItem("acct_"+ acct_id + "_at"); + var start = "https://" + domain + "/api/v1/trend_tags" + console.log(start) + fetch(start, { + method: 'GET', + headers: { + 'content-type': 'application/json', + 'Authorization': 'Bearer ' + at + }, + }).then(function(response) { + return response.json(); + }).catch(function(error) { + todo(error); + console.error(error); + }).then(function(json) { + if (json) { + var tags=""; + json=json.score; + Object.keys(json).forEach(function(tag) { + tags = tags + '#' + tag + '　TL　Toot
'; + }); + $("#tips-text").html('
トレンドタグrefresh:
' + tags+'
'); + trendTagonTipInterval() + }else{ + $("#tips-text").html(""); + } + }); + +} + +function trendTagonTipInterval(){ + setTimeout(trendTagonTip, 6000000); +} +//時計 +var clockint; +function clock(){ + var now=new Date(); + var last=1000-now.getTime()%1000; + sleep(last); + clockint=setInterval(clockStart, 1000); +} +function clockStart(){ + var nowTime = new Date(); // 現在日時を得る + var nowHour = nowTime.getHours(); // 時を抜き出す + if(nowHour<10){nowHour="0"+nowHour } + var nowMin = nowTime.getMinutes(); // 分を抜き出す + if(nowMin<10){nowMin="0"+nowMin } + var nowSec = nowTime.getSeconds(); // 秒を抜き出す + if(nowSec<10){nowSec="0"+nowSec } + var msg = nowTime.getFullYear()+"年"+(nowTime.getMonth()+1)+"月"+nowTime.getDate()+'日'+nowHour + ":" + nowMin + ":" + nowSec+""; + $("#tips-text").html(msg); +} +function sleep(waitMsec) { + var startMsec = new Date(); + while (new Date() - startMsec < waitMsec); +} +function tipsToggle(){ + $("#tips").toggleClass("hide"); + $("#tips-menu").toggleClass("hide"); +} +if(localStorage.getItem("tips")){ + tips(localStorage.getItem("tips")); +} + \ No newline at end of file diff --git a/app/js/userdata/showOnTL.js b/app/js/userdata/showOnTL.js index 06bdb0fb..0da516df 100644 --- a/app/js/userdata/showOnTL.js +++ b/app/js/userdata/showOnTL.js @@ -150,10 +150,12 @@ function udg(user, acct_id) { showReq('', acct_id); showFrl('', acct_id); $("#his-name-val").val(json.display_name); - $("#his-f1-name").val(json.fields[0].name); $("#his-f1-val").val($.strip_tags(json.fields[0].value)); - $("#his-f2-name").val(json.fields[1].name); $("#his-f2-val").val($.strip_tags(json.fields[1].value)); - $("#his-f3-name").val(json.fields[2].name); $("#his-f3-val").val($.strip_tags(json.fields[2].value)); - $("#his-f4-name").val(json.fields[3].name); $("#his-f4-val").val($.strip_tags(json.fields[3].value)); + if(json.fields.length>0){ + $("#his-f1-name").val(json.fields[0].name); $("#his-f1-val").val($.strip_tags(json.fields[0].value)); + $("#his-f2-name").val(json.fields[1].name); $("#his-f2-val").val($.strip_tags(json.fields[1].value)); + $("#his-f3-name").val(json.fields[2].name); $("#his-f3-val").val($.strip_tags(json.fields[2].value)); + $("#his-f4-name").val(json.fields[3].name); $("#his-f4-val").val($.strip_tags(json.fields[3].value)); + } var des = json.note; des = des.replace(/
/g, "\n") des = $.strip_tags(des); @@ -187,6 +189,7 @@ function profShow(){ var user = localStorage.getItem("user-id_"+acct_id); console.log("user-id_"+acct_id+":"+user); udg(user, acct_id) + hide(); } //FF関係取得 diff --git a/app/main.js b/app/main.js index 99a06c96..3f3fa8a2 100644 --- a/app/main.js +++ b/app/main.js @@ -496,6 +496,18 @@ function adobeWindow(){ }); window.loadURL('file://' + __dirname + '/adobe.html'); } - +var cbTimer1; +ipc.on('startmem', (e, arg) => { + cbTimer1 = setInterval(mems, 1000); +}); +ipc.on('endmem', (e, arg) => { + if(cbTimer1){ + clearInterval(cbTimer1); + } +}); +function mems(){ + var mem=os.totalmem()-os.freemem(); + mainWindow.webContents.send('memory', [mem,os.cpus()[0].model,os.totalmem()]); +} app.setAsDefaultProtocolClient('thedesk') \ No newline at end of file diff --git a/app/new.html b/app/new.html new file mode 100644 index 00000000..2a10d467 --- /dev/null +++ b/app/new.html @@ -0,0 +1,820 @@ + + + + TheDesk + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+
ここにドラッグして添付(ドラッグと同時にアップロードされます) +
+ +
+
+ +
+
アカウント選択 +
+ + +
+
+
+ + +
+
表示するタイムライン + +
+
+ +
+
+ +
+ +
+
+ +
+search + + + +
+
+ + +
+ +
+ +
+
    + + +
    + +
    +
    + + +
    +
    + +
    +

    +
    +
    + + +
    + +
    +
    + + +
    +
    + +
    +
    + +
    + 適用範囲
    + + + + + + + +
    + オプション
    + +
    + 非ラテン系の文字列では「単語マッチ」は推奨されません。
    + +
    + 「除外」時マッチしたトゥートは非可逆的に除外され、削除後も閲覧できません。
    + 有効期限(あと)未指定(または0分)で「無制限」になります。仕様上数値の正確性を保証できません。

    + 日 + 時間 + 分 +
    + Integrated TL/Plus TLは、公開/ホームのフィルターワードが合算されて適応されます。どちらか一方の指定でも非表示になります。 +
    +
    + +
    + まずは右のアカウントボタンからアカウントを追加してください。
    + 右のカラム追加ボタンで認証せずにローカルタイムラインを見ることもできます。 +
    + + +
    +
    +
    + + +
    + +
    + + + +
    +
    + +
    + + cancel + expand_more + + +
    +
    +
    +format_bold +format_italic +format_underlined +strikethrough_s +format_quote +short_text +code +format_list_bulleted +format_list_numbered + + +autorenew +flare +swap_vert +swap_horiz + +Markdownエディタを隠す + +
    +format_size +px +color_lens + +
    +link +  + +
    +image +  + +
    +
    +
    +
    +
    + +Edit + +
    +
    + + + +
    + +Preview + + +Markdownエディタを表示 + + +
    +
    + visibility_off + public + CW + photo_library + format_shapes + tag_faces + music_note + clear +
    +
    +
    + +返信モード: +いいえ/添付: +なし/公開範囲: +public + +
    + +
    +
    + + + + + + +
    +
    + +
    +
    + +
    + インスタンスによって実装が異なります。 + 絵文字更新 + cancel +
    +     + +
    +
    +
    + + / + + +
    +
    + 一覧を表示中
    一部デフォルト絵文字は入力・描画できません。(国旗系など) +
    + + add + + + people + + + local_florist + + + restaurant + + + directions_run + + + directions_car + + + attach_file + + + gesture + + + flag + + + + +
    +
    + + + + + + + + + + + +
    + chevron_right　 + expand_less　 + close +
    +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/package-lock.json b/app/package-lock.json index 57b70172..7f37123d 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1,6 +1,6 @@ { "name": "TheDesk", - "version": "15.9.0", + "version": "15.10.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/app/setting.html b/app/setting.html index f27636f8..04e15981 100644 --- a/app/setting.html +++ b/app/setting.html @@ -290,7 +290,7 @@
    - +Beta Index
    undo戻る

    キーボードショートカット一覧 diff --git a/package-lock.json b/package-lock.json index 8d09c697..48e341a0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,270 +1,3 @@ { - "requires": true, - "lockfileVersion": 1, - "dependencies": { - "ansi-escapes": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz", - "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==" - }, - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "requires": { - "color-convert": "1.9.1" - } - }, - "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.4.0" - } - }, - "chardet": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz", - "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=" - }, - "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", - "requires": { - "restore-cursor": "2.0.0" - } - }, - "cli-width": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", - "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=" - }, - "color-convert": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", - "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" - }, - "external-editor": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz", - "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==", - "requires": { - "chardet": "0.4.2", - "iconv-lite": "0.4.23", - "tmp": "0.0.33" - } - }, - "figures": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", - "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", - "requires": { - "escape-string-regexp": "1.0.5" - } - }, - "growly": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz", - "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=" - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" - }, - "iconv-lite": { - "version": "0.4.23", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz", - "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", - "requires": { - "safer-buffer": "2.1.2" - } - }, - "inquirer": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-5.2.0.tgz", - "integrity": "sha512-E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==", - "requires": { - "ansi-escapes": "3.1.0", - "chalk": "2.4.1", - "cli-cursor": "2.1.0", - "cli-width": "2.2.0", - "external-editor": "2.2.0", - "figures": "2.0.0", - "lodash": "4.17.10", - "mute-stream": "0.0.7", - "run-async": "2.3.0", - "rxjs": "5.5.11", - "string-width": "2.1.1", - "strip-ansi": "4.0.0", - "through": "2.3.8" - } - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" - }, - "is-promise": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", - "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=" - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" - }, - "lodash": { - "version": "4.17.10", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", - "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==" - }, - "mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==" - }, - "mute-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", - "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=" - }, - "node-fetch": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz", - "integrity": "sha1-q4hOjn5X44qUR1POxwb3iNF2i7U=" - }, - "onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", - "requires": { - "mimic-fn": "1.2.0" - } - }, - "os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" - }, - "restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", - "requires": { - "onetime": "2.0.1", - "signal-exit": "3.0.2" - } - }, - "run-async": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", - "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", - "requires": { - "is-promise": "2.1.0" - } - }, - "rxjs": { - "version": "5.5.11", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.11.tgz", - "integrity": "sha512-3bjO7UwWfA2CV7lmwYMBzj4fQ6Cq+ftHc2MvUe+WMS7wcdJ1LosDWmdjPQanYp2dBRj572p7PeU81JUxHKOcBA==", - "requires": { - "symbol-observable": "1.0.1" - } - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" - }, - "semver": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", - "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==" - }, - "shellwords": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz", - "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==" - }, - "signal-exit": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "requires": { - "ansi-regex": "3.0.0" - } - }, - "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", - "requires": { - "has-flag": "3.0.0" - } - }, - "symbol-observable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz", - "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=" - }, - "through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" - }, - "tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "requires": { - "os-tmpdir": "1.0.2" - } - }, - "which": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", - "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", - "requires": { - "isexe": "2.0.0" - } - } - } + "lockfileVersion": 1 }