diff --git a/app/about.html b/app/about.html index 874deec6..63f25012 100644 --- a/app/about.html +++ b/app/about.html @@ -76,7 +76,7 @@ a,button{
TheDesk
-
バージョン
+
External version
Internal version
diff --git a/app/css/tl.css b/app/css/tl.css index bd809a84..49785705 100644 --- a/app/css/tl.css +++ b/app/css/tl.css @@ -224,7 +224,10 @@ grid-area: toot; cursor:text; user-select: auto; grid-area: additional; - } + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} .area-actions { padding:0; diff --git a/app/js/tl/src.js b/app/js/tl/src.js index 9b1755c9..270a29c9 100644 --- a/app/js/tl/src.js +++ b/app/js/tl/src.js @@ -15,7 +15,7 @@ function src(mode) { var q = $("#src").val(); var acct_id = $("#src-acct-sel").val(); if(acct_id=="tootsearch"){ - tootsearch(q); + tsAdd(q) return false; } localStorage.setItem("last-use", acct_id); @@ -73,9 +73,26 @@ function src(mode) { jQuery("time.timeago").timeago(); }); } -function tootsearch(q){ +function tsAdd(q){ + var add = { + domain: acct_id, + type: "tootsearch", + data: q + }; + var multi = localStorage.getItem("column"); + var obj = JSON.parse(multi); + localStorage.setItem("card_" + obj.length,"true"); + obj.push(add); + console.log(obj); + var json = JSON.stringify(obj); + localStorage.setItem("column", json); + parseColumn(); +} +function tootsearch(tlid,q){ var start = "https://tootsearch.chotto.moe/api/v1/search?from=0&sort=created_at%3Adesc&q=" + q console.log(start) + $("#notice_" + tlid).text("tootsearch("+q+")"); + $("#notice_icon_" + tlid).text("search"); fetch(start, { method: 'GET', headers: { @@ -90,17 +107,25 @@ function tootsearch(q){ var templete=""; var json=raw.hits.hits; console.log(json); - Object.keys(json).forEach(function(key5) { - var toot = json[key5]["_source"]; - console.log(toot); - if(toot && toot.account){ - templete = templete+parse([toot],'noauth'); + var max_id = raw["hits"]["total"]; + for(var i=0;i
'; } - $("#src-contents").html("Tootsearch("+lang.lang_src_ts+")
" + templete); + $("#timeline_" + tlid).html(templete); + jQuery("time.timeago").timeago(); }); } diff --git a/app/js/tl/tl.js b/app/js/tl/tl.js index f4abf172..2f17a834 100644 --- a/app/js/tl/tl.js +++ b/app/js/tl/tl.js @@ -442,8 +442,6 @@ function moreload(type, tlid) { headers: hdr }; } - - fetch(start, i).then(function(response) { return response.json(); }).catch(function(error) { @@ -677,6 +675,8 @@ function cap(type, data, acct_id) { var response= "Local+" }else if (type == "webview") { var response="Twitter" + }else if (type == "tootsearch") { + var response="tootsearch(" + data + ")"; } return response; } @@ -734,7 +734,7 @@ function icon(type) { } else if (type == "pub-media") { var response="language"; } else if (type == "tag") { - var response="search"; + var response="whatshot"; } else if (type == "list") { var response="view_headline"; } else if (type == "notf") { @@ -749,6 +749,8 @@ function icon(type) { var response="merge_type"; }else if (type == "webview") { var response="language"; + }else if (type == "tootsearch") { + var response="search"; } return response; } diff --git a/app/js/ui/layout.js b/app/js/ui/layout.js index 1ca54f61..cce21d47 100644 --- a/app/js/ui/layout.js +++ b/app/js/ui/layout.js @@ -130,6 +130,21 @@ function parseColumn() { } var html =webviewParse("https://tweetdeck.twitter.com",key,insert,icnsert,css); $("#timeline-container").append(html); + }else if(acct.type=="tootsearch"){ + if(!acct.left_fold){ + basekey=key; + } + var width = localStorage.getItem("width"); + if (width) { + var css=" min-width:"+width+"px;" + } + var anime = localStorage.getItem("animation"); + if (anime=="yes" || !anime) { + var animecss="box-anime"; + }else{ + var animecss=""; + } + unstreamingTL(acct.type,key,basekey,insert,icnsert,acct.left_fold,css,animecss,acct.data); }else{ var width = localStorage.getItem("width"); if (width) { @@ -448,6 +463,37 @@ function webviewParse(url,key,insert,icnsert,css){ return html; } +function unstreamingTL(type,key,basekey,insert,icnsert,left_fold,css,animecss,q){ + if(!left_fold){ + var basehtml = '
'; + $("#timeline-container").append(basehtml); + var left_hold='view_agenda'+lang.lang_layout_leftFold+'
'; + }else{ + var left_hold='view_column'+lang.lang_layout_leftUnfold+'
'; + } + var html='
'+ + '
'+left_hold+'perm_mediaOn'+lang.lang_layout_mediafil +'
'+lang.lang_layout_headercolor +'
'+lang.lang_layout_nodata +'
' + $('#timeline_box_' + basekey + '_parentBox').append(html); + tootsearch(key,q); + cardCheck(key); + ebtCheck(key); + mediaCheck(key); + catchCheck(key); + voiceCheck(key); + return true; +} function leftFoldSet(key){ var multi = localStorage.getItem("column"); var obj = JSON.parse(multi); diff --git a/app/js/ui/menu.js b/app/js/ui/menu.js index 1fda04bf..429fba4e 100644 --- a/app/js/ui/menu.js +++ b/app/js/ui/menu.js @@ -19,6 +19,8 @@ function menu(){ $("#menu-bar").html("TheDesk "+localStorage.getItem("ver")); $(".menu-content").addClass("hide"); $("#add-box").removeClass("hide"); + $("#left-menu div").removeClass("active"); + $("#addColumnMenu").addClass("active"); }else{ $('#menu').fadeOut() $("#menu").removeClass("appear") diff --git a/app/js/ui/sort.js b/app/js/ui/sort.js index 157c5e36..8286d16b 100644 --- a/app/js/ui/sort.js +++ b/app/js/ui/sort.js @@ -58,6 +58,8 @@ function Scap(type, data) { return "Integrated" }else if (type == "webview") { return "Twitter" + }else if (type == "tootsearch") { + return "tootsearch(" + data + ")" }else{ console.log(type); } diff --git a/app/view/en/index.html b/app/view/en/index.html index 966c8e5e..1f119708 100644 --- a/app/view/en/index.html +++ b/app/view/en/index.html @@ -259,12 +259,8 @@ var tlid=0;
-
- WIP -
@@ -687,11 +683,10 @@ var tlid=0;
- search - + -

@@ -705,7 +700,7 @@ var tlid=0;
    -
    diff --git a/app/view/ja/index.html b/app/view/ja/index.html index 123c7877..871b705a 100644 --- a/app/view/ja/index.html +++ b/app/view/ja/index.html @@ -259,12 +259,8 @@ var tlid=0;
    -
    - WIP -
    @@ -687,11 +683,10 @@ var tlid=0;
    - search - + -

    @@ -705,7 +700,7 @@ var tlid=0;
      -
      diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html index 57c39c33..e2e18f12 100644 --- a/app/view/make/index.sample.html +++ b/app/view/make/index.sample.html @@ -259,12 +259,8 @@ var tlid=0;
      -
      - WIP -
      @@ -687,11 +683,10 @@ var tlid=0;
      - search - + -

      @@ -705,7 +700,7 @@ var tlid=0;
        -
        diff --git a/app/view/ps/index.html b/app/view/ps/index.html index 42417e72..06721816 100644 --- a/app/view/ps/index.html +++ b/app/view/ps/index.html @@ -259,12 +259,8 @@ var tlid=0;
        -
        - WIP -
        @@ -687,11 +683,10 @@ var tlid=0;
        - search - + -

        @@ -705,7 +700,7 @@ var tlid=0;
          -