public';
+ 'public ';
var can_rt = "";
} else if (visen == "unlisted") {
var vis =
- 'lock_open ';
+ 'lock_open ';
var can_rt = "";
} else if (visen == "private") {
var vis =
- 'lock ';
+ 'lock ';
var can_rt = "hide";
} else if (visen == "direct") {
var vis =
- 'mail ';
+ 'mail ';
var can_rt = "hide";
}
if (toot.account.acct == localStorage.getItem("user_" + acct_id)) {
var if_mine = "";
+ var mine_via="type-b";
} else {
var if_mine = "hide";
+ var mine_via="";
}
if (toot.favourited) {
var if_fav = " yellow-text";
@@ -407,7 +437,7 @@ function parse(obj, mix, acct_id, tlid, popup) {
templete = templete + '' +
'' + content +
' ' + spoil + spoiler_show +
@@ -431,38 +462,38 @@ function parse(obj, mix, acct_id, tlid, popup) {
'
' + analyze +
' ' +
'' + mentions + tags + '
' +
- '' +
- '
' +
- vis + '
'+
+ '
' +
+ '
' +
- '
' +
- '
' +
- '
' +
- '
' +
- '
' +trans+
+ '
' +
'
' +
- '
' +
- '
via ' +
+ ',\''+tlid+'\')" class="waves-effect waves-dark btn-flat details" style="padding:0">more_vert
' +
+ '
via ' +
via +
- ' ダイレクトメッセージ ');
+ $('#type-sel').material_select('update');
+ }else{
+ $("#direct-add").remove();
+ $('#type-sel').material_select('update');
+ }
}
//カラム削除
function removeColumn(tlid) {
diff --git a/app/js/ui/pip.js b/app/js/ui/pip.js
index 484fbc78..39cd7505 100644
--- a/app/js/ui/pip.js
+++ b/app/js/ui/pip.js
@@ -3,7 +3,7 @@ function pip(id){
$("#pip").removeClass("hide");
}
function endPip(){
- $("#pip-content").html();
+ $("#pip-content").html("");
$("#pip").addClass("hide");
}
diff --git a/app/js/ui/radio.js b/app/js/ui/radio.js
index 0c84e047..3e27f149 100644
--- a/app/js/ui/radio.js
+++ b/app/js/ui/radio.js
@@ -34,4 +34,23 @@ function Rselect(){
function Rinput(){
var url=$("#radio-url").val();
Rplay(url,url)
-}
\ No newline at end of file
+}
+/*
+
+
+
Listen.moe
+
AnimeNfo Radio
+
LoFi hip hop Radio
+
Linn Classical
+
Linn Jazz
+
Jazz FM
+
canal-jazz.eu
+
Others
+
+Play
+Presets
+
+*/
\ No newline at end of file
diff --git a/app/js/ui/settings.js b/app/js/ui/settings.js
index 86db50e7..d9c45a8a 100644
--- a/app/js/ui/settings.js
+++ b/app/js/ui/settings.js
@@ -126,6 +126,21 @@ function settings() {
Materialize.toast("引用形式を" + qtt + "に設定しました。", 3000);
}
localStorage.setItem("quote", qtd);
+
+ var viad = $("[name=via]:checked").val();
+ var viat = $("[for=via_"+viad+"]").text();
+ if (viad != localStorage.getItem("viashow")) {
+ Materialize.toast("via表示を" + viat + "に設定しました。", 3000);
+ }
+ localStorage.setItem("viashow", viad);
+
+ var movd = $("[name=mov]:checked").val();
+ var movt = $("[for=mov_"+movd+"]").text();
+ if (movd != localStorage.getItem("mouseover")) {
+ Materialize.toast("マウスオーバー・ヒディングを" + movt + "に設定しました。", 3000);
+ }
+ localStorage.setItem("mouseover", movd);
+
}
//読み込み時の設定ロード
@@ -247,6 +262,18 @@ function load() {
var qt = "simple";
}
$("#q_" + qt).prop("checked", true);
+
+ var viat = localStorage.getItem("viashow");
+ if (!viat) {
+ var viat = "hide";
+ }
+ $("#via_" + viat).prop("checked", true);
+
+ var movt = localStorage.getItem("mouseover");
+ if (!movt) {
+ var movt = "no";
+ }
+ $("#mov_" + movt).prop("checked", true);
}
//最初に読む
load();
diff --git a/app/js/userdata/showOnTL.js b/app/js/userdata/showOnTL.js
index 5ffd5df5..70719840 100644
--- a/app/js/userdata/showOnTL.js
+++ b/app/js/userdata/showOnTL.js
@@ -97,14 +97,18 @@ function udg(user, acct_id) {
$("#his-follower").text(json.followers_count);
$("#his-since").text(crat(json.created_at));
if(json.fields){
- var note=json.note+'My Fields'
- for(var i=0;i'+fname+' '+fval+' ';
+ if(json.fields.length>0){
+ var note=json.note+'My Fields'
+ for(var i=0;i'+fname+' '+fval+' ';
+ }
+ note=note+'
'
+ $("#his-des").html(note);
+ }else{
+ $("#his-des").html(json.note);
}
- note=note+'
'
- $("#his-des").html(note);
}else{
$("#his-des").html(json.note);
}
diff --git a/app/main.js b/app/main.js
index 585a15a3..4e06d0e0 100644
--- a/app/main.js
+++ b/app/main.js
@@ -26,7 +26,6 @@ const BrowserWindow = electron.BrowserWindow;
const {
download
} = require('electron-dl');
-const openAboutWindow = require('about-window').default;
const join = require('path').join;
// メインウィンドウはGCされないようにグローバル宣言
let mainWindow;
@@ -395,6 +394,33 @@ ipc.on('nano', function (e, x, y) {
window.setPosition(0, 0);
return "true"
})
+ ipc.on('adobe', (e, arg) => {
+ if(!arg){
+ const options = {
+ type: 'info',
+ title: 'Adobeフォトエディタ',
+ message: "「許可」または「永続的に許可」をクリックするとTheDeskとAdobeで情報を共有します。",
+ buttons: ['拒否', '許可','永続的に許可']
+ }
+ dialog.showMessageBox(options, function(index) {
+ if(index==2){
+ mainWindow.webContents.send('adobeagree', "true");
+ }
+ if(index>0){
+ adobeWindow();
+ }
+ })
+ }else{
+ adobeWindow();
+ }
+});
+function adobeWindow(){
+ var window = new BrowserWindow({
+ width: 1000,
+ height: 750
+ });
+ window.loadURL('file://' + __dirname + '/adobe.html');
+}
app.setAsDefaultProtocolClient('thedesk')
\ No newline at end of file
diff --git a/app/node_modules/about-window/.npmignore b/app/node_modules/about-window/.npmignore
deleted file mode 100644
index d2ffd5c6..00000000
--- a/app/node_modules/about-window/.npmignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/typings
-/.git
-/example
-npm-debug.log
-node_modules
diff --git a/app/node_modules/about-window/.stylelintrc.json b/app/node_modules/about-window/.stylelintrc.json
deleted file mode 100644
index 40db42c6..00000000
--- a/app/node_modules/about-window/.stylelintrc.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "extends": "stylelint-config-standard"
-}
diff --git a/app/node_modules/about-window/LICENSE.txt b/app/node_modules/about-window/LICENSE.txt
deleted file mode 100644
index 67f4d981..00000000
--- a/app/node_modules/about-window/LICENSE.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2015 rhysd
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
diff --git a/app/node_modules/about-window/README.md b/app/node_modules/about-window/README.md
deleted file mode 100644
index 00ba9a6c..00000000
--- a/app/node_modules/about-window/README.md
+++ /dev/null
@@ -1,100 +0,0 @@
-'About This App' Window for [Electron](https://github.com/atom/electron) Apps
-=============================================================================
-[](https://www.npmjs.com/package/about-window)
-
-[This package](https://www.npmjs.com/package/about-window) provides 'About This App' window for [Electron](https://github.com/atom/electron) applications.
-
-- [x] Create 'About This App' window from given parameters
- - [x] Icon path
- - [x] Copy right
- - [x] App name and Versions
- - [x] Description
-- [x] Gather package information from package.json
-- [x] Automatically detect package.json
-- [x] Adjust window size to its contents automatically
-- [x] CSS customizability
-
-You can install this module via [npm](https://www.npmjs.com/).
-
-```sh
-$ npm install about-window
-```
-
-Only one function is exported as default. Please see [TypeScript type definition](index.d.ts).
-The function can be called from both main process and renderer process.
-
-```typescript
-export default function openAboutWindow(info: {
- icon_path: string;
- package_json_dir?: string;
- bug_report_url?: string;
- copyright?: string;
- homepage?: string;
- description?: string;
- license?: string;
- css_path?: string;
- adjust_window_size?: boolean;
- win_options?: BrowserWindowOptions;
-}): BrowserWindow
-```
-
-Only `icon_path` property is required, others are optional.
-I recommend to specify as below to extract information from package.json as much as possible.
-Path to package.json is also automatically detected if possible.
-
-```typescript
-openAboutWindow({
- icon_path: 'path/to/icon.png'
-});
-```
-
-You can check [an example app](example) to know how to use this package.
-
-```sh
-$ git clone https://github.com/rhysd/about-window.git
-$ cd about-window/example
-$ npm install
-$ npm start
-
-# Or for debug
-$ npm run debug
-```
-
-### Parameter's properties of `openAboutWindow()`
-
-| Name | Description | Type |
-|------|-------------|------|
-| `icon_path` | Path to icon file of the application. The path is passed to `src` property of `About This App
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/node_modules/about-window/index.d.ts b/app/node_modules/about-window/index.d.ts
deleted file mode 100644
index 4e394f95..00000000
--- a/app/node_modules/about-window/index.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/// 検索対象のインスタンスのみ
viaを表示する
+ はい
+ いいえ
+ マウスオーバーするまでアクションメニューを非表示
+ 1画面で得られる情報量が格段にアップしますが、すこし鬱陶しいと思うかもしれません。はい
+ いいえ
+ 指定行数以上を折りたたむ 5文字以下のトゥートは折りたたみません。また、折りたたみ時は改行が描画されません。
-
play_circle_outline ボタンで表示されるメニューから簡単にNowPlayingができます。
+
ボタンから簡単にNowPlayingができます。
アカウントの連携
APIの性質上，thedesk.topへアクセスします。
設定