Zergling_man/thedesk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add "menu" and remove bottom-bar's 8 icons

Browse Source
This commit is contained in:
Cutls
2019-03-15 04:48:01 +09:00
parent 2856aec405
commit d6012ea128
26 changed files with 852 additions and 858 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/js/lang/lang.en.js
View File

@@ -122,6 +122,9 @@ var lang={
"lang_layout_webviewmode":"Prefer WebView",
"lang_excluded":"Excluded type of notification",
"lang_layout_excludingbt":"Show BT mode(OFF/Exclude BT/Only BT)",
//ui/sort.js
"lang_sort_gothis":"Go to this column",
"lang_sort_remthis":"Delete this column",
//ui/spotify.js
"lang_spotify_img":"Attach an album artwork",
"lang_spotify_imgno":"Not attach an album artwork",

3
app/js/lang/lang.ja.js
View File

@@ -122,6 +122,9 @@ var lang={
"lang_layout_webviewmode":"WebView優先",
"lang_excluded":"除外する通知",
"lang_layout_excludingbt":"BT表示(OFF/BT除外/BTのみ)",
//ui/sort.js
"lang_sort_gothis":"このカラムへ",
"lang_sort_remthis":"このカラムを削除",
//ui/spotify.js
"lang_spotify_img":"アルバムアートワークを添付します。",
"lang_spotify_imgno":"アルバムアートワークを添付しません。",

16
app/js/tl/filter.js
View File

@@ -101,17 +101,11 @@ function delreset(tlid){
}
/*ワードフィルター機能*/
function filterToggle(){
if ($("#filter-box").hasClass("hide")) {
$("#filter-box").removeClass("hide");
$("#filter-box").addClass("show");
$("#filter-box").css("bottom","40px");
$("#filter-box").css("left",$('#filter-tgl').offset().left-$('#filter-box').width()/2+"px");
//フィルターロード
} else {
$("#filter-box").removeClass("show");
$("#filter-box").addClass("hide")
}
function filterMenu(){
$("#left-menu div").removeClass("active");
$("#filterMenu").addClass("active");
$(".menu-content").addClass("hide");
$("#filter-box").removeClass("hide");
}
function filter(){
$("#filtered-words").html("");

18
app/js/tl/list.js
View File

@@ -1,14 +1,10 @@
function listToggle(){
if ($("#list-box").hasClass("hide")) {
$("#list-box").removeClass("hide");
$("#list-box").addClass("show");
$("#list-box").css("bottom","40px");
$("#list-box").css("left",$('#list-tgl').offset().left-$('#list-box').width()/2+"px");
//リストロード
} else {
$("#list-box").removeClass("show");
$("#list-box").addClass("hide")
}
function listMenu(){
$("#left-menu div").removeClass("active");
$("#listMenu").addClass("active");
$(".menu-content").addClass("hide");
$("#list-box").removeClass("hide");
$('ul.tabs').tabs('select_tab', 'src-sta');
$("#src-contents").html("");
}

10
app/js/tl/src.js
View File

@@ -1,10 +1,10 @@
//検索
//検索ボックストグル
function srcToggle() {
$("#src-box").toggleClass("hide");
$("#src-box").toggleClass("show");
$("#src-box").css("bottom","40px");
$("#src-box").css("left",$('#src-tgl').offset().left-$('#src-box').width()/2+"px");
function searchMenu() {
$("#left-menu div").removeClass("active");
$("#searchMenu").addClass("active");
$(".menu-content").addClass("hide");
$("#src-box").removeClass("hide");
$('ul.tabs').tabs('select_tab', 'src-sta');
$("#src-contents").html("");
}

37
app/js/tl/tl.js
View File

@@ -605,22 +605,33 @@ function misskeycom(type, data) {
//TLのアイコン
function icon(type) {
if (type == "home") {
return "home"
} else if (type == "local" || type == "noauth" || type == "local-media") {
return "people_outline"
} else if (type == "pub" || type == "pub-media") {
return "language"
var response="home";
} else if (type == "local") {
var response="people_outline";
} else if (type == "local-media") {
var response="people_outline";
} else if (type == "pub") {
var response="language";
} else if (type == "pub-media") {
var response="language";
} else if (type == "tag") {
return "search"
var response="search";
} else if (type == "list") {
return "view_headline"
}else if (type == "list") {
return "subject"
}else if (type == "dm") {
return "mail"
}else if (type == "mix") {
return "share"
var response="view_headline";
} else if (type == "notf") {
var response="notifications";
} else if (type == "noauth") {
var response="people_outline";
} else if (type == "dm") {
var response="mail_outline";
} else if (type == "mix") {
var response="merge_type";
} else if (type == "plus") {
var response="merge_type";
}else if (type == "webview") {
var response="language";
}
return response;
}
function strAlive(){
var date = new Date() ;

10
app/js/ui/layout.js
View File

@@ -7,12 +7,12 @@ var websocketLocal = [];
var websocketNotf = [];
//カラム追加ボックストグル
function addToggle() {
$("#add-box").toggleClass("hide");
function addColumnMenu() {
$("#left-menu div").removeClass("active");
$("#addColumnMenu").addClass("active");
$(".menu-content").addClass("hide");
$("#add-box").removeClass("hide");
addselCk()
$("#add-box").css("bottom","40px");
$("#add-box").css("left",$('#add-tgl').offset().left-$('#add-box').width()/2+"px");
$("#add-box").toggleClass("show");
}
//最初、カラム変更時に発火
function parseColumn() {

51
app/js/ui/menu.js Normal file
View File

@@ -0,0 +1,51 @@
function menu(){
if(!$("#menu").hasClass("appear")){
$("#menu").addClass("appear")
var left=localStorage.getItem("menu-left");
if(left>$('body').width()-$('#menu').width()){
left=$('body').width()-$('#menu').width();
}else if(left<0){
left=0;
}
var top=localStorage.getItem("menu-top");
if(top>$('body').height()-$('#menu').height()){
top=$('body').height()-$('#menu').height();
}else if(top<0){
top=0;
}
$('#menu').css("left",left+"px")
$('#menu').css("top",top+"px")
$('#menu').fadeIn();
$("#menu-bar").html("TheDesk "+localStorage.getItem("ver"));
$(".menu-content").addClass("hide");
$("#add-box").removeClass("hide");
}else{
$('#menu').fadeOut()
$("#menu").removeClass("appear")
}
}
$(function() {
$( "#menu" ).draggable({handle: "#menu-bar",
stop: function() {
var left=$('#menu').offset().left;
if(left>$('body').width()-$('#menu').width()){
left=$('body').width()-$('#menu').width();
}else if(left<0){
left=0;
}
var top=$('#menu').offset().top;
if(top>$('body').height()-$('#menu').height()){
top=$('body').height()-$('#menu').height();
}else if(top<0){
top=0;
}
localStorage.setItem("menu-left",left);
localStorage.setItem("menu-top",top);
}
});
});
function help(){
const {shell} = require('electron');
shell.openExternal("https://docs.thedesk.top");
}

18
app/js/ui/menubar.js
View File

@@ -1,18 +0,0 @@
function quit(){
console.log("quit")
var electron = require("electron");
var ipc = electron.ipcRenderer;
ipc.send('quit', 'go');
}
function minimize(){
console.log("mini")
var electron = require("electron");
var ipc = electron.ipcRenderer;
ipc.send('minimize', 'go');
}
function maxToggle(){
console.log("max")
var electron = require("electron");
var ipc = electron.ipcRenderer;
ipc.send('maximize', 'go');
}

21
app/js/ui/post-box.js
View File

@@ -95,23 +95,4 @@ $('#textarea,#cw-text').focusout(function(e) {
localStorage.removeItem("nohide")
}
//setTimeout(remove, 100);
});
$("#timeline-container").click(function(e) {
if(!$('#list-box').hasClass("hide")){
$("#list-box").removeClass("show");
$("#list-box").addClass("hide")
}
if(!$('#src-box').hasClass("hide")){
$("#src-box").removeClass("show");
$("#src-box").addClass("hide")
}
if(!$('#filter-box').hasClass("hide")){
$("#filter-box").removeClass("show");
$("#filter-box").addClass("hide")
}
if(!$('#add-box').hasClass("hide")){
$("#add-box").removeClass("show");
$("#add-box").addClass("hide")
}
});
});

24
app/js/ui/sort.js
View File

@@ -32,9 +32,9 @@ function sortload(){
var acctdata=user+"@"+domain;
}
var html='<li class="drag-content" data-id="'+key+'" data-flag="'+flag+'"'+insert+'><a onclick="goColumn(' + key +
')" class="setting nex"><i class="material-icons waves-effect nex" title="このカラムへ">forward</i></a> <a onclick="removeColumn(' + key +
')" class="setting nex"><i class="material-icons waves-effect nex" title="このカラムを削除">cancel</i></a><br>'+acctdata+" "+cap(acct.type, acct.data,acct.domain)+'</li>';
var html='<li class="drag-content" data-id="'+key+'" data-flag="'+flag+'"'+insert+'><div class="sorticon"><i class="material-icons">'+icon(acct.type)+'</i></div><div class="sorttitle">'+cap(acct.type, acct.data,acct.domain)+'</div><div class="sortaction"><a onclick="goColumn(' + key +
')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_sort_gothis+'">forward</i></a> <a onclick="removeColumn(' + key +
')" class="setting nex"><i class="material-icons waves-effect nex" title="このカラムを削除">cancel</i></a></div><div class="sortacct">'+acctdata+'</div></li>';
$("#sort").append(html);
});
drag();
@@ -104,18 +104,14 @@ function sort(){
Materialize.toast("並べ替え完了。", 3000);
sortload();
parseColumn();
sortToggle()
sortMenu()
}
//ソートボタントグル
function sortToggle(){
function sortMenu(){
$("#left-menu div").removeClass("active");
$("#sortMenu").addClass("active");
$(".menu-content").addClass("hide");
$("#sort-box").removeClass("hide");
$("#sort").html("");
if ($("#sort-box").hasClass("hide")) {
$("#sort-box").removeClass("hide");
$("#sort-box").addClass("show");
//並べ替え
sortload();
} else {
$("#sort-box").addClass("hide");
$("#sort-box").removeClass("show");
}
sortload();
}