Merge pull request #49 from cutls/WIP-(before-CI)

Wip (before ci)

.travis.yml

@@ -1,33 +1,38 @@
-os: windows
+language: objective-c
-language: node_js
+cache:
-node_js:
+  directories:
-- '10.15.2'
+    - node_modules
-script: node -v
+env:
+  - NODE_VERSION="9.9.0"
+before_install:
+  # nvm をインストールする。Travis の OS X 環境には nvm はデフォルトで入っていない
+  - git clone https://github.com/creationix/nvm.git /tmp/.nvm
+  - source /tmp/.nvm/nvm.sh
+  # 指定バージョンの Node をインストールする
+  - nvm install $NODE_VERSION
+  # 指定バージョンの Node を有効にする
+  - nvm use --delete-prefix $NODE_VERSION
+  - node --version
+script:
+  - node --version
 before_deploy:
-  - cd app
+  - brew update
   - npm install electron-builder -g
+  - cd app
   - npm install
-  - electron-builder --win --ia32
+  - electron-builder --mac --x64
-  - mv ../build/TheDesk-setup.exe ../TheDesk-setup-ia32.exe
+  - mv ../build/TheDesk*.dmg ../TheDesk.dmg
-  - mv ../build/TheDesk*.exe ../TheDesk-ia32.exe
+  - mv ../build/TheDesk*.zip ../TheDesk-darwin-x64.zip
-  - electron-builder --win --x64
-  - mv ../build/TheDesk-setup.exe ../TheDesk-setup.exe
-  - mv ../build/TheDesk*.exe ../TheDesk.exe
   - cd ../
-  - ls
-after_deploy: ls
 deploy:
-  skip_cleanup: true
   provider: releases
+  # GitHub にリリースするための API KEY を暗号化した値
   api_key:
     secure: jndR02p5KRTtcJk18b3YsXL2cC+yzEf1AOqXdpWciF8f3lO5oY01jlxd17xdHIcK7VywSsLVZpLToSdqAoIEhJ5OxEQ/FmA3FlmbwwD6ou13gLa4VGIvsBHveCmKGjVu0Z++atIy76tZYU1SOWFWv4B0ZhnVz2ca2VZynvLgw3YNsPJH7rHO966GXgRkGYJAJ4UvLg3sj/iztVh2FSfbUj5IGO1e/JHJO63wAo1MSQtRjkutVgl/djnBLC6vbL4YHkM3Ynpkx/YQEcxwrmeY0Ra8D5yYDq4MNIDMmZahWC+k4u2eA2Cj2ifBFNxbZvTN75vLwRBp6DsTNHsiqkXrSPDBdNeet31RbwTQ6LtsK8jqmL4S/59dmLcj7uCU2WxyBLPbJdbdZWlqW2ZQvfQY8QVAYy7S3MiHQWQN0oP5wqXk89jcgR42ig/zsqFNPpXHM4mExR7l/gDLPg0j9c3XEF6sWtk3FmJN1i4+B+9kn09b6UKlV7EFPKp8XcFNrz4ZcE9/I8lKwsqLVG2jAXIk7Z9LwDRcAmK5eG348X5zwFtOY6raKIvRw2cn92bPnEI+55v8A4WANS2647GFTgxHj30D0d/sOZmJ5BS34zpdWTgE0AlKg7sOqkncjqoW5J5zCh5Ow7b3KXvEvlAts44mAag8tZTectxMP4iguXvTnv4=
-  file: 
+  # Releases ページにアップロードするファイル
-    - TheDesk.exe
+  file:
-    - TheDesk-setup.exe
+    - TheDesk.dmg
-    - TheDesk-ia32.exe
+    - TheDesk-darwin-x64.dmg
-    - TheDesk-setup-ia32.exe
+  skip_cleanup: true
   on:
-    repo: cutls/TheDesk
+    repo: cutls/TheDesk
-branches:
-  only:
-  - master

app/js/tl/parse.js

@@ -475,7 +475,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 		}else{
 			var nicoemojick=false;
 		}
-		//絵文字があれば
+		//絵文字があれば(nico)
 		if (nicoemojick) {
 			Object.keys(toot.profile_emojis).forEach(function(keynico) {
 				var emoji = toot.profile_emojis[keynico];
@@ -734,7 +734,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				}
 				poll=poll+'<div class="'+voteclass+' vote vote_'+acct_id+'_'+toot.poll.id+'_'+keyc+'" onclick="'+votesel+'">'+choice.title+'<span class="vote_'+acct_id+'_'+toot.poll.id+'_result '+result_hide+'">('+choice.votes_count+')</span></div>';
 			});
-			poll='<div class="vote_'+acct_id+'_'+toot.poll.id+'">'+poll+myvote+'<span class="cbadge cbadge-hover" title="' + date(toot.poll.expires_at, 'absolute') +
+			poll='<div class="vote_'+acct_id+'_'+toot.poll.id+'">'+strip_tags(poll)+myvote+'<span class="cbadge cbadge-hover" title="' + date(toot.poll.expires_at, 'absolute') +
 			'"><i class="fa fa-calendar-times-o"></i>' +
 			 ended+ '</span></div>';
 		}

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thedesk",
-  "version": "18.2.0",
+  "version": "18.2.1",
   "description": "TheDesk is a Mastodon client for PC.",
   "main": "main.js",
   "scripts": {
@@ -88,7 +88,7 @@
       "category": "Network"
     },
     "mac": {
-      "target": "dmg"
+      "target": ["dmg","zip"]
     },
     "electronDownload": {
       "version": "4.0.6"

app/view/en/index.html

@@ -32,7 +32,7 @@
 <script type="text/javascript" src="../../js/common/modal.js"></script>
 <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
 <script>
-var ver="Usamin (18.2.0)";
+var ver="Usamin (18.2.1)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";

app/view/ja/index.html

@@ -32,7 +32,7 @@
 <script type="text/javascript" src="../../js/common/modal.js"></script>
 <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
 <script>
-var ver="Usamin (18.2.0)";
+var ver="Usamin (18.2.1)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";

app/view/ps/index.html

@@ -32,7 +32,7 @@
 <script type="text/javascript" src="../../js/common/modal.js"></script>
 <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
 <script>
-var ver="Usamin (18.2.0)";
+var ver="Usamin (18.2.1)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";

trial.travis.yml

@@ -1,27 +1,11 @@
-language: objective-c
+os: windows
-cache:
+language: node_js
-  directories:
+node_js:
-    - node_modules
+- '10.15.2'
-env:
+script: node -v
-  - NODE_VERSION="9.9.0"
-before_install:
-  # nvm をインストールする。Travis の OS X 環境には nvm はデフォルトで入っていない
-  - git clone https://github.com/creationix/nvm.git /tmp/.nvm
-  - source /tmp/.nvm/nvm.sh
-  # 指定バージョンの Node をインストールする
-  - nvm install $NODE_VERSION
-  # 指定バージョンの Node を有効にする
-  - nvm use --delete-prefix $NODE_VERSION
-  - node --version
-script:
-  - node --version
 before_deploy:
-  - brew update
-  - brew install wine
-  - wine --version
-  - brew install makensis
-  - npm install electron-builder -g
   - cd app
+  - npm install electron-builder -g
   - npm install
   - electron-builder --win --ia32
   - mv ../build/TheDesk-setup.exe ../TheDesk-setup-ia32.exe
@@ -29,24 +13,22 @@ before_deploy:
   - electron-builder --win --x64
   - mv ../build/TheDesk-setup.exe ../TheDesk-setup.exe
   - mv ../build/TheDesk*.exe ../TheDesk.exe
-  - electron-builder --linux --x64
-  - mv ../build/thedesk*.snap ../TheDesk.snap
-  - electron-builder --mac --x64
-  - mv ../build/TheDesk*.dmg ../TheDesk.dmg
   - cd ../
+  - ls
+after_deploy: ls
 deploy:
+  skip_cleanup: true
   provider: releases
-  # GitHub にリリースするための API KEY を暗号化した値
   api_key:
     secure: jndR02p5KRTtcJk18b3YsXL2cC+yzEf1AOqXdpWciF8f3lO5oY01jlxd17xdHIcK7VywSsLVZpLToSdqAoIEhJ5OxEQ/FmA3FlmbwwD6ou13gLa4VGIvsBHveCmKGjVu0Z++atIy76tZYU1SOWFWv4B0ZhnVz2ca2VZynvLgw3YNsPJH7rHO966GXgRkGYJAJ4UvLg3sj/iztVh2FSfbUj5IGO1e/JHJO63wAo1MSQtRjkutVgl/djnBLC6vbL4YHkM3Ynpkx/YQEcxwrmeY0Ra8D5yYDq4MNIDMmZahWC+k4u2eA2Cj2ifBFNxbZvTN75vLwRBp6DsTNHsiqkXrSPDBdNeet31RbwTQ6LtsK8jqmL4S/59dmLcj7uCU2WxyBLPbJdbdZWlqW2ZQvfQY8QVAYy7S3MiHQWQN0oP5wqXk89jcgR42ig/zsqFNPpXHM4mExR7l/gDLPg0j9c3XEF6sWtk3FmJN1i4+B+9kn09b6UKlV7EFPKp8XcFNrz4ZcE9/I8lKwsqLVG2jAXIk7Z9LwDRcAmK5eG348X5zwFtOY6raKIvRw2cn92bPnEI+55v8A4WANS2647GFTgxHj30D0d/sOZmJ5BS34zpdWTgE0AlKg7sOqkncjqoW5J5zCh5Ow7b3KXvEvlAts44mAag8tZTectxMP4iguXvTnv4=
-  # Releases ページにアップロードするファイル
+  file: 
-  file:
     - TheDesk.exe
     - TheDesk-setup.exe
     - TheDesk-ia32.exe
     - TheDesk-setup-ia32.exe
-    - TheDesk.snap
-    - TheDesk.dmg
-  skip_cleanup: true
   on:
-    repo: cutls/TheDesk
+    repo: cutls/TheDesk
+branches:
+  only:
+  - master
+