Merge pull request #190 from taku-o/staging

Staging 0.10.5
taku-o · Feb 24, 2019 · 89f2fd5 · 89f2fd5
2 parents b805923 + 290d213
commit 89f2fd5
Show file tree

Hide file tree

Showing 86 changed files with 4,942 additions and 4,053 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -7,8 +7,9 @@
     "mocha": true
   },
   "globals": {
-    "angular": 1,
-    "introJs": 1
+    "angular": true,
+    "introJs": true,
+    "dataJson": true
   },
   "extends": "eslint:recommended",
   "parserOptions": {
@@ -19,18 +20,16 @@
     "array-bracket-spacing": ["error", "never"],
     "indent": 0,
     "linebreak-style": ["error", "unix"],
+    "no-empty": "off",
     "no-unused-vars": "warn",
     "semi": ["error", "always"]
   },
   "overrides": {
-    "files": [
-      "*.ts",
-      "js/*.ts",
-      "test/*.ts"
-    ],
+    "files": ["*.ts", "js/*.ts", "test/*.ts"],
     "parser": "typescript-eslint-parser",
     "rules": {
       "comma-dangle": ["error", "always-multiline"],
+      "no-empty": "error",
       "no-undef": "off",
       "quotes": ["error", "single", { "avoidEscape": true }],
       "object-curly-spacing": ["error", "never"]

diff --git a/contents-helpsearch.html b/contents-helpsearch.html
@@ -39,6 +39,6 @@
 
   </div> <!-- pane-group -->
 </div> <!-- window-content -->
-
+</div> <!-- window -->
 </body>
 </html>
diff --git a/contents-main.html b/contents-main.html
@@ -3,6 +3,7 @@
 <head>
   <meta charset="UTF-8">
   <title>MYukkuriVoice</title>
+  <script src="js/apps.main.preload.js"></script>
   <link rel="stylesheet" href="node_modules/photon/dist/css/photon.css">
   <link rel="stylesheet" href="node_modules/intro.js/minified/introjs.min.css">
   <link rel="stylesheet" href="css/range.css">

diff --git a/contents-spec.html b/contents-spec.html
@@ -32,124 +32,124 @@
   <form>
     <!-- models -->
     <div>YPhontList
-      <button id="get-yphont-list" ng-click="ctrl.getYPhontList()">
+      <button id="get-yphont-list" ng-click="ctrl.getYPhontList()"></button>
       <input id="get-yphont-list-result" type="text" ng-model="getYPhontListResult">
     </div>
     <div>YVoice
-      <button id="get-yvoice" ng-click="ctrl.getYVoice()">
+      <button id="get-yvoice" ng-click="ctrl.getYVoice()"></button>
       <input id="get-yvoice-result" type="text" ng-model="getYVoiceResult">
     </div>
     <div>YVoiceInitialData
-      <button id="get-yvoice-initial-data" ng-click="ctrl.getYVoiceInitialData()">
+      <button id="get-yvoice-initial-data" ng-click="ctrl.getYVoiceInitialData()"></button>
       <input id="get-yvoice-initial-data-result" type="text" ng-model="getYVoiceInitialDataResult">
     </div>
     <div>YInput
-      <button id="get-yinput" ng-click="ctrl.getYInput()">
+      <button id="get-yinput" ng-click="ctrl.getYInput()"></button>
       <input id="get-yinput-result" type="text" ng-model="getYInputResult">
     </div>
     <div>YInputInitialData
-      <button id="get-yinput-initial-data" ng-click="ctrl.getYInputInitialData()">
+      <button id="get-yinput-initial-data" ng-click="ctrl.getYInputInitialData()"></button>
       <input id="get-yinput-initial-data-result" type="text" ng-model="getYInputInitialDataResult">
     </div>
     <div>YCommandInput
-      <button id="get-ycommand-input" ng-click="ctrl.getYCommandInput()">
+      <button id="get-ycommand-input" ng-click="ctrl.getYCommandInput()"></button>
       <input id="get-ycommand-input-result" type="text" ng-model="getYCommandInputResult">
     </div>
 
     <div>models-dict KindList
-      <button id="get-kind-list" ng-click="ctrl.getKindList()">
+      <button id="get-kind-list" ng-click="ctrl.getKindList()"></button>
       <input id="get-kind-list-result" type="text" ng-model="getKindListResult">
     </div>
     <div>models-dict KindHash
-      <button id="get-kind-hash" ng-click="ctrl.getKindHash()">
+      <button id="get-kind-hash" ng-click="ctrl.getKindHash()"></button>
       <input id="get-kind-hash-result" type="text" ng-model="getKindHashResult">
     </div>
 
     <div>LicenseService
       <input id="pass-phrase" type="text" ng-model="passPhrase">
       <input id="plain-key" type="text" ng-model="plainKey">
       <input id="encrypted-key" type="text" ng-model="encryptedKey">
-      <button id="encrypt" ng-click="ctrl.encrypt()">
-      <button id="decrypt" ng-click="ctrl.decrypt()">
+      <button id="encrypt" ng-click="ctrl.encrypt()"></button>
+      <button id="decrypt" ng-click="ctrl.decrypt()"></button>
 
       <input id="license-type" type="text" ng-model="licenseType">
-      <button id="consumer-key" ng-click="ctrl.consumerKey()">
+      <button id="consumer-key" ng-click="ctrl.consumerKey()"></button>
       <input id="consumer-key-result" type="text" ng-model="consumerKeyResult">
       <input id="consumer-key-done" type="text" ng-model="consumerKeyDone">
       <input id="consumer-key-err" type="text" ng-model="consumerKeyErr">
     </div>
 
     <div>IntroService
-      <button id="main-tutorial" ng-click="ctrl.mainTutorial()">
-      <button id="settings-tutorial" ng-click="ctrl.settingsTutorial()">
-      <button id="shortcut" ng-click="ctrl.shortcut()">
-      <button id="dict-tutorial" ng-click="ctrl.dictTutorial()">
+      <button id="main-tutorial" ng-click="ctrl.mainTutorial()"></button>
+      <button id="settings-tutorial" ng-click="ctrl.settingsTutorial()"></button>
+      <button id="shortcut" ng-click="ctrl.shortcut()"></button>
+      <button id="dict-tutorial" ng-click="ctrl.dictTutorial()"></button>
     </div>
 
     <div>MessageService
-      <button id="action" ng-click="ctrl.action()">
-      <button id="record" ng-click="ctrl.record()">
-      <button id="record-source" ng-click="ctrl.recordSource()">
-      <button id="info" ng-click="ctrl.info()">
-      <button id="error" ng-click="ctrl.error()">
-      <button id="error-null" ng-click="ctrl.errorNull()">
-      <button id="syserror" ng-click="ctrl.syserror()">
-      <button id="syserror-null" ng-click="ctrl.syserrorNull()">
+      <button id="action" ng-click="ctrl.action()"></button>
+      <button id="record" ng-click="ctrl.record()"></button>
+      <button id="record-source" ng-click="ctrl.recordSource()"></button>
+      <button id="info" ng-click="ctrl.info()"></button>
+      <button id="error" ng-click="ctrl.error()"></button>
+      <button id="error-null" ng-click="ctrl.errorNull()"></button>
+      <button id="syserror" ng-click="ctrl.syserror()"></button>
+      <button id="syserror-null" ng-click="ctrl.syserrorNull()"></button>
       <input id="message-service-post" type="text" ng-model="messageServicePost">
       <input id="last-wav-file" type="text" ng-model="lastWavFile">
     </div>
 
     <div>CommandService
       <textarea id="contains-command-input" ng-model="containsCommandInput"></textarea>
-      <button id="contains-command" ng-click="ctrl.containsCommand()">
+      <button id="contains-command" ng-click="ctrl.containsCommand()"></button>
       <input id="contains-command-result" type="text" ng-model="containsCommandResult">
 
       <textarea id="parse-input-input" ng-model="parseInputInput"></textarea>
-      <button id="parse-input" ng-click="ctrl.parseInput()">
+      <button id="parse-input" ng-click="ctrl.parseInput()"></button>
       <input id="parse-input-result" type="text" ng-model="parseInputResult">
 
       <input id="command-input-source" type="text" ng-model="commandInputSource">
-      <button id="detect-voice-config" ng-click="ctrl.detectVoiceConfig()">
+      <button id="detect-voice-config" ng-click="ctrl.detectVoiceConfig()"></button>
       <input id="detect-voice-config-result" type="text" ng-model="detectVoiceConfigResult">
 
       <textarea id="command-input-list" ng-model="commandInputList"></textarea>
-      <button id="to-string" ng-click="ctrl.toString()">
+      <button id="to-string" ng-click="ctrl.toString()"></button>
       <textarea id="to-string-result" ng-model="toStringResult"></textarea>
     </div>
 
     <div>DataService
-      <button id="load" ng-click="ctrl.load()">
+      <button id="load" ng-click="ctrl.load()"></button>
       <input id="load-result" type="text" ng-model="loadResult">
       <input id="load-err" type="text" ng-model="loadErr">
 
-      <button id="initial-data" ng-click="ctrl.initialData()">
+      <button id="initial-data" ng-click="ctrl.initialData()"></button>
       <input id="initial-data-result" type="text" ng-model="initialDataResult">
 
-      <button id="create" ng-click="ctrl.create()">
+      <button id="create" ng-click="ctrl.create()"></button>
       <input id="create-result" type="text" ng-model="createResult">
 
-      <button id="copy" ng-click="ctrl.copy()">
+      <button id="copy" ng-click="ctrl.copy()"></button>
       <input id="copy-result" type="text" ng-model="copyResult">
 
-      <button id="save-data" ng-click="ctrl.saveData()">
+      <button id="save-data" ng-click="ctrl.saveData()"></button>
       <input id="save-data-result" type="text" ng-model="saveDataResult">
 
-      <button id="clear" ng-click="ctrl.clear()">
+      <button id="clear" ng-click="ctrl.clear()"></button>
       <input id="clear-result" type="text" ng-model="clearResult">
     </div>
 
     <div>MasterService
-      <button id="get-phont-list" ng-click="ctrl.getPhontList()">
+      <button id="get-phont-list" ng-click="ctrl.getPhontList()"></button>
       <input id="get-phont-list-result" type="text" ng-model="getPhontListResult">
     </div>
 
     <div>HistoryService
-      <button id="history-load" ng-click="ctrl.historyLoad()">
-      <button id="history-save" ng-click="ctrl.historySave()">
-      <button id="history-clear" ng-click="ctrl.historyClear()">
-      <button id="history-get" ng-click="ctrl.historyGet()">
-      <button id="history-add" ng-click="ctrl.historyAdd()">
-      <button id="history-get-list" ng-click="ctrl.historyGetList()">
+      <button id="history-load" ng-click="ctrl.historyLoad()"></button>
+      <button id="history-save" ng-click="ctrl.historySave()"></button>
+      <button id="history-clear" ng-click="ctrl.historyClear()"></button>
+      <button id="history-get" ng-click="ctrl.historyGet()"></button>
+      <button id="history-add" ng-click="ctrl.historyAdd()"></button>
+      <button id="history-get-list" ng-click="ctrl.historyGetList()"></button>
       <input id="history-key" type="text" ng-model="historyKey">
       <input id="history-entry" type="text" ng-model="historyEntry">
       <input id="history-result" type="text" ng-model="historyResult">
@@ -158,99 +158,99 @@
 
     <div>AquesService
       <input id="source" type="text" ng-model="source">
-      <button id="encode" ng-click="ctrl.encode()">
+      <button id="encode" ng-click="ctrl.encode()"></button>
       <input id="encode-result" type="text" ng-model="encodeResult">
       <input id="encode-err" type="text" ng-model="encodeError">
 
       <input id="encoded" type="text" ng-model="encoded">
-      <button id="wave-ver1" ng-click="ctrl.waveVer1()">
-      <button id="wave-ver2" ng-click="ctrl.waveVer2()">
-      <button id="wave-ver10" ng-click="ctrl.waveVer10()">
+      <button id="wave-ver1" ng-click="ctrl.waveVer1()"></button>
+      <button id="wave-ver2" ng-click="ctrl.waveVer2()"></button>
+      <button id="wave-ver10" ng-click="ctrl.waveVer10()"></button>
       <input id="wave-result" type="text" ng-model="waveResult">
       <input id="wave-err" type="text" ng-model="waveErr">
     </div>
 
     <div>AqUsrDicService
       <input id="csv-path" type="text" ng-model="csvPath">
       <input id="user-dic-path" type="text" ng-model="userDicPath">
-      <button id="generate-user-dict" ng-click="ctrl.generateUserDict()">
+      <button id="generate-user-dict" ng-click="ctrl.generateUserDict()"></button>
       <input id="generate-user-dict-result" type="text" ng-model="generateUserDictResult">
 
-      <button id="generate-csv" ng-click="ctrl.generateCSV()">
+      <button id="generate-csv" ng-click="ctrl.generateCSV()"></button>
       <input id="generate-csv-result" type="text" ng-model="generateCsvResult">
 
       <input id="surface" type="text" ng-model="surface">
       <input id="yomi" type="text" ng-model="yomi">
       <input id="pos-code" type="text" ng-model="posCode">
-      <button id="validate-input" ng-click="ctrl.validateInput()">
+      <button id="validate-input" ng-click="ctrl.validateInput()"></button>
       <input id="validate-input-result" type="text" ng-model="validateInputResult">
 
-      <button id="get-last-error" ng-click="ctrl.getLastError()">
+      <button id="get-last-error" ng-click="ctrl.getLastError()"></button>
       <input id="get-last-error-result" type="text" ng-model="getLastErrorResult">
     </div>
 
     <div>AudioService1
       <input id="play1-encoded" type="text" ng-model="play1Encoded">
 
-      <button id="play1-aqver1" ng-click="ctrl.play1AqVer1()">
-      <button id="play1-aqver2" ng-click="ctrl.play1AqVer2()">
-      <button id="play1-aqver10" ng-click="ctrl.play1AqVer10()">
+      <button id="play1-aqver1" ng-click="ctrl.play1AqVer1()"></button>
+      <button id="play1-aqver2" ng-click="ctrl.play1AqVer2()"></button>
+      <button id="play1-aqver10" ng-click="ctrl.play1AqVer10()"></button>
       <input id="play-result-1" type="text" ng-model="playResult1">
 
       <input id="wav-file-path-1" type="text" ng-model="wavFilePath1">
-      <button id="record1-aqver1" ng-click="ctrl.record1AqVer1()">
-      <button id="record1-aqver2" ng-click="ctrl.record1AqVer2()">
-      <button id="record1-aqver10" ng-click="ctrl.record1AqVer10()">
+      <button id="record1-aqver1" ng-click="ctrl.record1AqVer1()"></button>
+      <button id="record1-aqver2" ng-click="ctrl.record1AqVer2()"></button>
+      <button id="record1-aqver10" ng-click="ctrl.record1AqVer10()"></button>
       <input id="record-result-1" type="text" ng-model="recordResult1">
     </div>
 
     <div>AudioService2
       <input id="play2-encoded" type="text" ng-model="play2Encoded">
 
-      <button id="play2-aqver1" ng-click="ctrl.play2AqVer1()">
-      <button id="play2-aqver2" ng-click="ctrl.play2AqVer2()">
-      <button id="play2-aqver10" ng-click="ctrl.play2AqVer10()">
+      <button id="play2-aqver1" ng-click="ctrl.play2AqVer1()"></button>
+      <button id="play2-aqver2" ng-click="ctrl.play2AqVer2()"></button>
+      <button id="play2-aqver10" ng-click="ctrl.play2AqVer10()"></button>
       <input id="play-result-2" type="text" ng-model="playResult2">
 
       <input id="wav-file-path-2" type="text" ng-model="wavFilePath2">
-      <button id="record2-aqver1" ng-click="ctrl.record2AqVer1()">
-      <button id="record2-aqver2" ng-click="ctrl.record2AqVer2()">
-      <button id="record2-aqver10" ng-click="ctrl.record2AqVer10()">
+      <button id="record2-aqver1" ng-click="ctrl.record2AqVer1()"></button>
+      <button id="record2-aqver2" ng-click="ctrl.record2AqVer2()"></button>
+      <button id="record2-aqver10" ng-click="ctrl.record2AqVer10()"></button>
       <input id="record-result-2" type="text" ng-model="recordResult2">
     </div>
 
     <div>AudioSourceService
       <input id="wav-file-path" type="text" ng-model="wavFilePath">
-      <button id="source-fname" ng-click="ctrl.sourceFname()">
+      <button id="source-fname" ng-click="ctrl.sourceFname()"></button>
       <input id="source-fname-result" type="text" ng-model="sourceFnameResult">
 
       <input id="file-path" type="text" ng-model="filePath">
       <input id="source-text" type="text" ng-model="sourceText">
-      <button id="save" ng-click="ctrl.save()">
+      <button id="save" ng-click="ctrl.save()"></button>
       <input id="save-result" type="text" ng-model="saveResult">
       <input id="save-error" type="text" ng-model="saveError">
     </div>
 
     <div>SeqFNameService
       <input id="prefix" type="text" ng-model="prefix">
       <input id="num" type="text" ng-model="num">
-      <button id="next-fname" ng-click="ctrl.nextFname()">
+      <button id="next-fname" ng-click="ctrl.nextFname()"></button>
       <input id="next-fname-result" type="text" ng-model="nextFnameResult">
       <input id="split-fname-filepath" type="text" ng-model="splitFnameFilepath">
-      <button id="split-fname" ng-click="ctrl.splitFname()">
+      <button id="split-fname" ng-click="ctrl.splitFname()"></button>
       <input id="split-fname-result" type="text" ng-model="splitFnameResult">
       <input id="next-number-dir" type="text" ng-model="nextNumberDir">
       <input id="next-number-prefix" type="text" ng-model="nextNumberPrefix">
-      <button id="next-number" ng-click="ctrl.nextNumber()">
+      <button id="next-number" ng-click="ctrl.nextNumber()"></button>
       <input id="next-number-result" type="text" ng-model="nextNumberResult">
     </div>
 
     <div>AppUtilService
       <input id="rhythm-text" type="text" ng-model="rhythmText">
-      <button id="disable-rhythm" ng-click="ctrl.disableRhythm()">
+      <button id="disable-rhythm" ng-click="ctrl.disableRhythm()"></button>
       <input id="disable-rhythm-result" type="text" ng-model="disableRhythmResult">
       <input id="duration" type="text" ng-model="duration">
-      <button id="report-duration" ng-click="ctrl.reportDuration()">
+      <button id="report-duration" ng-click="ctrl.reportDuration()"></button>
       <input id="report-duration-result" type="text" ng-model="reportDurationResult">
     </div>
 

diff --git a/css/about.less b/css/about.less
@@ -1,9 +1,7 @@
-
 div.logo {
-  text-align: center;
+    text-align: center;
 }
 img#app-icon {
-  width: 128px;
-  height: 128px;
+    width: 128px;
+    height: 128px;
 }
-
diff --git a/css/dict.css b/css/dict.css
@@ -13,7 +13,7 @@ li.list-group-item:active {
   background-color: #3399ff;
 }
 li.list-group-item#export.disable {
-  color: #CCCCCC;
+  color: #cccccc;
 }
 li.list-group-item#export.disable img {
   opacity: 0.2;