Compare commits

...

2 Commits

Author SHA1 Message Date
cutls
0bf3f69a28 initial 2020-07-09 17:03:22 +09:00
cutls
414782fd71 Introduce: remove Materialize JS 2020-07-05 19:45:21 +09:00
26 changed files with 82 additions and 72 deletions

View File

@ -11,6 +11,12 @@ body {
html { html {
font-size: 13px; font-size: 13px;
} }
.waves-effect:hover {
filter: brightness(80%);
}
.waves-effect:focus {
filter: brightness(70%);
}
.titlebar, .titlebar,
.menubar-menu-container, .menubar-menu-container,
.action-menu-item { .action-menu-item {

View File

@ -1,6 +1,7 @@
//モーダル・ドロップダウンの各種設定 //モーダル・ドロップダウンの各種設定
$(document).ready(function () { $(document).ready(function () {
// the "href" attribute of the modal trigger must specify the modal ID that wants to be triggered // the "href" attribute of the modal trigger must specify the modal ID that wants to be triggered
return;
$('.modal').modal({ $('.modal').modal({
inDuration: 300, inDuration: 300,
outDuration: 225, outDuration: 225,

View File

@ -204,7 +204,7 @@ function verck(ver, jp) {
} }
} }
if (showVer) { if (showVer) {
M.toast({ Mtoast({
html: html:
escapeHTML(obj.text) + escapeHTML(obj.text) +
toot + toot +
@ -265,7 +265,7 @@ function infowebsocket() {
if (showVer) { if (showVer) {
console.log(obj.text) console.log(obj.text)
console.log(escapeHTML(obj.text)) console.log(escapeHTML(obj.text))
M.toast({ Mtoast({
html: html:
escapeHTML(obj.text) + escapeHTML(obj.text) +
toot + toot +

View File

@ -197,7 +197,7 @@ function getdata() {
.then(function(json) { .then(function(json) {
if (json.error) { if (json.error) {
console.error('Error:' + json.error) console.error('Error:' + json.error)
M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 }) Mtoast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
return return
} }
var avatar = json['avatar'] var avatar = json['avatar']
@ -255,7 +255,7 @@ function getdataAdv(domain, at) {
.then(function(json) { .then(function(json) {
if (json.error) { if (json.error) {
console.error('Error:' + json.error) console.error('Error:' + json.error)
M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 }) Mtoast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
return return
} }
var avatar = json['avatar'] var avatar = json['avatar']
@ -321,7 +321,7 @@ function refresh(target, loadskip) {
.then(function(json) { .then(function(json) {
if (json.error) { if (json.error) {
console.error('Error:' + json.error) console.error('Error:' + json.error)
M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 }) Mtoast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
return return
} }
var avatar = json['avatar'] var avatar = json['avatar']
@ -573,7 +573,7 @@ function multiSelector(parseC) {
) )
$('#dir-acct-sel').append('<option value="noauth">' + lang.lang_login_noauth + '</option>') $('#dir-acct-sel').append('<option value="noauth">' + lang.lang_login_noauth + '</option>')
} }
$('select').formSelect() //$('select').formSelect()
if (!parseC) { if (!parseC) {
parseColumn(null, true) parseColumn(null, true)
} }

View File

@ -640,7 +640,7 @@ function code(code) {
$('#code').val('') $('#code').val('')
} }
if (!code || code == '') { if (!code || code == '') {
M.toast({ html: lang.lang_fatalerroroccured + 'Error: no code', displayLength: 5000 }) Mtoast({ html: lang.lang_fatalerroroccured + 'Error: no code', displayLength: 5000 })
return false return false
} }
var url = localStorage.getItem('domain_tmp') var url = localStorage.getItem('domain_tmp')
@ -757,7 +757,7 @@ function getdata(domain, at) {
.then(function(json) { .then(function(json) {
if (json.error) { if (json.error) {
console.error('Error:' + json.error) console.error('Error:' + json.error)
M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 }) Mtoast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
return return
} }
var avatar = json['avatar'] var avatar = json['avatar']
@ -830,7 +830,7 @@ function atSetup(type) {
} }
} }
if (!i || i == '') { if (!i || i == '') {
M.toast({ html: lang.lang_fatalerroroccured + 'Error: access token', displayLength: 5000 }) Mtoast({ html: lang.lang_fatalerroroccured + 'Error: access token', displayLength: 5000 })
return false return false
} }
var obj = JSON.parse(multi) var obj = JSON.parse(multi)
@ -883,7 +883,7 @@ function refresh(target) {
.then(function(json) { .then(function(json) {
if (json.error) { if (json.error) {
console.error('Error:' + json.error) console.error('Error:' + json.error)
M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 }) Mtoast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
return return
} }
var avatar = json['avatar'] var avatar = json['avatar']
@ -1007,12 +1007,12 @@ function multisel() {
$('.acct-sel').append(template) $('.acct-sel').append(template)
}) })
} }
$('select').formSelect() //$('select').formSelect()
} }
function mainacct() { function mainacct() {
var acct_id = $('#main-acct-sel').val() var acct_id = $('#main-acct-sel').val()
localStorage.setItem('main', acct_id) localStorage.setItem('main', acct_id)
M.toast({ html: lang.lang_manager_mainAcct, displayLength: 3000 }) Mtoast({ html: lang.lang_manager_mainAcct, displayLength: 3000 })
} }
function colorpicker(key) { function colorpicker(key) {
temp = `<div onclick="coloradd('${key}','def','def')" class="pointer exc">${lang.lang_manager_none}</div> temp = `<div onclick="coloradd('${key}','def','def')" class="pointer exc">${lang.lang_manager_none}</div>

View File

@ -153,7 +153,7 @@ onmessage = function(e) {
var showTxt = `${lang.lang_img_DLDone}${ var showTxt = `${lang.lang_img_DLDone}${
e.data[1][0] e.data[1][0]
}<button class="btn-flat toast-action" onclick="openFinder('${e.data[1][1]}')">Show</button>` }<button class="btn-flat toast-action" onclick="openFinder('${e.data[1][1]}')">Show</button>`
M.toast({ html: showTxt, displayLength: 5000 }) Mtoast({ html: showTxt, displayLength: 5000 })
} else if (e.data[0] == 'parseColumn') { } else if (e.data[0] == 'parseColumn') {
parseColumn(e.data[1]) parseColumn(e.data[1])
} else if (e.data[0] == 'exportSettingsCore') { } else if (e.data[0] == 'exportSettingsCore') {

View File

@ -225,6 +225,9 @@ function evalAttr(json, attr, lenCk) {
return false return false
} }
} }
function Mtoast(obj) {
return true
}
function statusModel(now) { function statusModel(now) {
if (!now) { if (!now) {
var now = new Date().toString() var now = new Date().toString()

View File

@ -45,7 +45,7 @@ function mdCheck() {
$('#trendtag').html('') $('#trendtag').html('')
} }
if (localStorage.getItem('mode_' + domain) == 'misskey') { if (localStorage.getItem('mode_' + domain) == 'misskey') {
M.toast({ html: lang.lang_bbmd_misskey, displayLength: 5000 }) Mtoast({ html: lang.lang_bbmd_misskey, displayLength: 5000 })
} }
if (idata[domain + '_letters']) { if (idata[domain + '_letters']) {
$('#textarea').attr('data-length', idata[domain + '_letters']) $('#textarea').attr('data-length', idata[domain + '_letters'])

View File

@ -154,9 +154,9 @@ async function media(b64, type, no, stamped) {
$('#nsfw').addClass('nsfw-avail') $('#nsfw').addClass('nsfw-avail')
} }
$('.toot-btn-group').prop('disabled', false) $('.toot-btn-group').prop('disabled', false)
$('select').formSelect() //$('select').formSelect()
$('#mec').text(lang.lang_there) $('#mec').text(lang.lang_there)
M.toast({ html: '<span>' + lang.lang_postimg_sync + '</span><button class="btn-flat toast-action" onclick="syncDetail()">Click</button>', displayLength: 3000 }) Mtoast({ html: '<span>' + lang.lang_postimg_sync + '</span><button class="btn-flat toast-action" onclick="syncDetail()">Click</button>', displayLength: 3000 })
$('#imgup').text('') $('#imgup').text('')
$('#imgsel').show() $('#imgsel').show()
localStorage.removeItem('image') localStorage.removeItem('image')
@ -176,9 +176,9 @@ async function media(b64, type, no, stamped) {
if (this.status !== 200) { if (this.status !== 200) {
setLog(start, this.status, json) setLog(start, this.status, json)
$('.toot-btn-group').prop('disabled', false) $('.toot-btn-group').prop('disabled', false)
$('select').formSelect() //$('select').formSelect()
$('#mec').text(lang.lang_there) $('#mec').text(lang.lang_there)
M.toast({ html: this.status + ':' +json, displayLength: 2000 }) Mtoast({ html: this.status + ':' +json, displayLength: 2000 })
$('#imgup').text('') $('#imgup').text('')
$('#imgsel').show() $('#imgsel').show()
} }
@ -187,14 +187,14 @@ async function media(b64, type, no, stamped) {
$('#imgup').text('') $('#imgup').text('')
$('.toot-btn-group').prop('disabled', false) $('.toot-btn-group').prop('disabled', false)
$('#post-acct-sel').prop('disabled', false) $('#post-acct-sel').prop('disabled', false)
$('select').formSelect() //$('select').formSelect()
$('#imgsel').show() $('#imgsel').show()
M.toast({ html: lang.lang_postimg_failupload, displayLength: 5000 }) Mtoast({ html: lang.lang_postimg_failupload, displayLength: 5000 })
return false return false
} }
$('#imgup').text('') $('#imgup').text('')
$('.toot-btn-group').prop('disabled', false) $('.toot-btn-group').prop('disabled', false)
$('select').formSelect() //$('select').formSelect()
$('#imgsel').show() $('#imgsel').show()
var img = localStorage.getItem('img') var img = localStorage.getItem('img')
if (json.type.indexOf('image') != -1) { if (json.type.indexOf('image') != -1) {

View File

@ -34,7 +34,7 @@ function renoteqt(id, acct_id) {
$('#rec').text('Renote') $('#rec').text('Renote')
$('#post-acct-sel').val(acct_id) $('#post-acct-sel').val(acct_id)
$('#post-acct-sel').prop('disabled', true) $('#post-acct-sel').prop('disabled', true)
$('select').formSelect() //$('select').formSelect()
$('#textarea').attr('placeholder', lang.lang_misskeyparse_qt) $('#textarea').attr('placeholder', lang.lang_misskeyparse_qt)
$('#textarea').focus() $('#textarea').focus()
} }
@ -46,7 +46,7 @@ function misskeyreply(id, acct_id) {
$('#rec').text('Renote') $('#rec').text('Renote')
$('#post-acct-sel').val(acct_id) $('#post-acct-sel').val(acct_id)
$('#post-acct-sel').prop('disabled', true) $('#post-acct-sel').prop('disabled', true)
$('select').formSelect() //$('select').formSelect()
$('#textarea').attr('placeholder', lang.lang_misskeyparse_qt) $('#textarea').attr('placeholder', lang.lang_misskeyparse_qt)
$('#textarea').focus() $('#textarea').focus()
} }
@ -120,7 +120,7 @@ function reactioncustom(acct_id, id) {
$('#unreact').hide() $('#unreact').hide()
$('#addreact').removeClass('hide') $('#addreact').removeClass('hide')
$('#post-acct-sel').val(acct_id) $('#post-acct-sel').val(acct_id)
$('select').formSelect() //$('select').formSelect()
localStorage.setItem('nohide', true) localStorage.setItem('nohide', true)
show() show()
emojiToggle(true) emojiToggle(true)

View File

@ -347,7 +347,7 @@ function clear() {
$('#post-acct-sel').val(localStorage.getItem('main')) $('#post-acct-sel').val(localStorage.getItem('main'))
} }
$('#emoji').addClass('hide') $('#emoji').addClass('hide')
$('select').formSelect() //$('select').formSelect()
$('#default-emoji').show() $('#default-emoji').show()
$('#unreact').show() $('#unreact').show()
$('#addreact').addClass('hide') $('#addreact').addClass('hide')

View File

@ -49,7 +49,7 @@ function fav(id, acct_id, remote) {
$('.fav_' + id).addClass('yellow-text') $('.fav_' + id).addClass('yellow-text')
} }
} else { } else {
M.toast({ html: lang.lang_status_favWarn, displayLength: 1000 }) Mtoast({ html: lang.lang_status_favWarn, displayLength: 1000 })
} }
} }
} }
@ -240,7 +240,7 @@ async function acctResolve(acct_id, user) {
if (idJson.accounts[0]) { if (idJson.accounts[0]) {
var id = idJson.accounts[0].id var id = idJson.accounts[0].id
} else { } else {
M.toast({ html: lang.lang_fatalerroroccured, displayLength: 2000 }) Mtoast({ html: lang.lang_fatalerroroccured, displayLength: 2000 })
} }
return id return id
} }
@ -428,7 +428,7 @@ function redraft(id, acct_id) {
var json = httpreq.response var json = httpreq.response
$('#post-acct-sel').prop('disabled', true) $('#post-acct-sel').prop('disabled', true)
$('#post-acct-sel').val(acct_id) $('#post-acct-sel').val(acct_id)
$('select').formSelect() //$('select').formSelect()
mdCheck() mdCheck()
var medias = $('[toot-id=' + id + ']').attr('data-medias') var medias = $('[toot-id=' + id + ']').attr('data-medias')
var mediack = json.media_attachments[0] var mediack = json.media_attachments[0]
@ -580,7 +580,7 @@ function empUser() {
if (!obj) { if (!obj) {
var obj = [] var obj = []
obj.push(id) obj.push(id)
M.toast({ html: id + lang.lang_status_emphas, displayLength: 4000 }) Mtoast({ html: id + lang.lang_status_emphas, displayLength: 4000 })
} else { } else {
var can var can
Object.keys(obj).forEach(function(key) { Object.keys(obj).forEach(function(key) {
@ -590,7 +590,7 @@ function empUser() {
} else { } else {
can = true can = true
obj.splice(key, 1) obj.splice(key, 1)
M.toast({ html: id + lang.lang_status_unemphas, displayLength: 4000 }) Mtoast({ html: id + lang.lang_status_unemphas, displayLength: 4000 })
} }
}) })
} }
@ -634,7 +634,7 @@ function pinUser() {
//URLコピー //URLコピー
function tootUriCopy(url) { function tootUriCopy(url) {
execCopy(url) execCopy(url)
M.toast({ html: lang.lang_details_url, displayLength: 1500 }) Mtoast({ html: lang.lang_details_url, displayLength: 1500 })
} }
//他のアカウントで… //他のアカウントで…

View File

@ -15,7 +15,7 @@ function re(id, ats_cm, acct_id, mode) {
$('#rec').text(lang.lang_yesno) $('#rec').text(lang.lang_yesno)
$('#post-acct-sel').val(acct_id) $('#post-acct-sel').val(acct_id)
$('#post-acct-sel').prop('disabled', true) $('#post-acct-sel').prop('disabled', true)
$('select').formSelect() //$('select').formSelect()
mdCheck() mdCheck()
$('#textarea').attr('placeholder', lang.lang_usetxtbox_reply) $('#textarea').attr('placeholder', lang.lang_usetxtbox_reply)
$('#textarea').focus() $('#textarea').focus()
@ -65,7 +65,7 @@ function qt(id, acct_id, at, url) {
$('#quote').val(id) $('#quote').val(id)
$('#post-acct-sel').val(acct_id) $('#post-acct-sel').val(acct_id)
$('#post-acct-sel').prop('disabled', true) $('#post-acct-sel').prop('disabled', true)
$('select').formSelect() //$('select').formSelect()
$('#textarea').attr('placeholder', lang.lang_usetxtbox_reply) $('#textarea').attr('placeholder', lang.lang_usetxtbox_reply)
$('#textarea').focus() $('#textarea').focus()
var profimg = localStorage.getItem('prof_' + acct_id) var profimg = localStorage.getItem('prof_' + acct_id)
@ -75,7 +75,7 @@ function qt(id, acct_id, at, url) {
$('#acct-sel-prof').attr('src', profimg) $('#acct-sel-prof').attr('src', profimg)
} }
$('#post-acct-sel').val(acct_id) $('#post-acct-sel').val(acct_id)
$('select').formSelect() //$('select').formSelect()
mdCheck() mdCheck()
$('#textarea').focus() $('#textarea').focus()
} }

View File

@ -121,7 +121,7 @@ function announReactionNew(id, acct_id, tlid) {
$('#unreact').hide() $('#unreact').hide()
$('#addreact').removeClass('hide') $('#addreact').removeClass('hide')
$('#post-acct-sel').val(acct_id) $('#post-acct-sel').val(acct_id)
$('select').formSelect() //$('select').formSelect()
localStorage.setItem('nohide', true) localStorage.setItem('nohide', true)
show() show()
emojiToggle(true) emojiToggle(true)

View File

@ -555,10 +555,10 @@ function cbCopy(mode) {
`<iframe src="${url}/embed" class="mastodon-embed" style="max-width: 100%; border: 0" width="400"></iframe> `<iframe src="${url}/embed" class="mastodon-embed" style="max-width: 100%; border: 0" width="400"></iframe>
<script src="https://${domain}/embed.js" async="async"></script>` <script src="https://${domain}/embed.js" async="async"></script>`
execCopy(emb) execCopy(emb)
M.toast({ html: lang.lang_details_embed, displayLength: 1500 }) Mtoast({ html: lang.lang_details_embed, displayLength: 1500 })
} else { } else {
if (execCopy(url)) { if (execCopy(url)) {
M.toast({ html: lang.lang_details_url, displayLength: 1500 }) Mtoast({ html: lang.lang_details_url, displayLength: 1500 })
} }
} }
} }
@ -573,7 +573,7 @@ function staCopy(id) {
html = html.replace(/<img[\s\S]*alt="(.+?)"[\s\S]*?>/g, '$1') html = html.replace(/<img[\s\S]*alt="(.+?)"[\s\S]*?>/g, '$1')
html = $.strip_tags(html) html = $.strip_tags(html)
if (execCopy(html)) { if (execCopy(html)) {
M.toast({ html: lang.lang_details_txt, displayLength: 1500 }) Mtoast({ html: lang.lang_details_txt, displayLength: 1500 })
} }
} }
//翻訳 //翻訳

View File

@ -260,7 +260,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
} }
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
if (popup > 0) { if (popup > 0) {
M.toast({ html: "[" + domain + "]" + escapeHTMLtemp(toot.user.name) + what, displayLength: popup * 1000 }) Mtoast({ html: "[" + domain + "]" + escapeHTMLtemp(toot.user.name) + what, displayLength: popup * 1000 })
} }
if (native == "yes") { if (native == "yes") {
var os = localStorage.getItem("platform"); var os = localStorage.getItem("platform");
@ -888,7 +888,7 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
} }
var memory = localStorage.getItem("notice-mem"); var memory = localStorage.getItem("notice-mem");
if (popup >= 0 && obj.length < 5 && notftext != memory) { if (popup >= 0 && obj.length < 5 && notftext != memory) {
M.toast({ html: escapeHTMLtemp(toot.name) + ":" + ftxt, displayLength: popup * 1000 }) Mtoast({ html: escapeHTMLtemp(toot.name) + ":" + ftxt, displayLength: popup * 1000 })
$(".notf-icon_" + tlid).addClass("red-text"); $(".notf-icon_" + tlid).addClass("red-text");
localStorage.setItem("notice-mem", notftext); localStorage.setItem("notice-mem", notftext);
notftext = ""; notftext = "";

View File

@ -315,7 +315,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
} }
} }
if (popup > 0) { if (popup > 0) {
M.toast({ Mtoast({
html: '[' + domain + ']' + escapeHTML(toot.account.display_name) + what, html: '[' + domain + ']' + escapeHTML(toot.account.display_name) + what,
displayLength: popup * 1000 displayLength: popup * 1000
}) })
@ -1226,7 +1226,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
} }
var memory = localStorage.getItem('notice-mem') var memory = localStorage.getItem('notice-mem')
if (popup >= 0 && obj.length < 5 && notftext != memory) { if (popup >= 0 && obj.length < 5 && notftext != memory) {
M.toast({ html: escapeHTML(toot.display_name) + ':' + ftxt, displayLength: popup * 1000 }) Mtoast({ html: escapeHTML(toot.display_name) + ':' + ftxt, displayLength: popup * 1000 })
$('.notf-icon_' + tlid).addClass('red-text') $('.notf-icon_' + tlid).addClass('red-text')
localStorage.setItem('notice-mem', notftext) localStorage.setItem('notice-mem', notftext)
notftext = '' notftext = ''
@ -1366,7 +1366,7 @@ function client(name) {
if (!obj) { if (!obj) {
var obj = [] var obj = []
obj.push(name) obj.push(name)
M.toast({ html: escapeHTML(name) + lang.lang_status_emphas, displayLength: 2000 }) Mtoast({ html: escapeHTML(name) + lang.lang_status_emphas, displayLength: 2000 })
} else { } else {
var can var can
Object.keys(obj).forEach(function(key) { Object.keys(obj).forEach(function(key) {
@ -1376,12 +1376,12 @@ function client(name) {
} else { } else {
can = true can = true
obj.splice(key, 1) obj.splice(key, 1)
M.toast({ html: escapeHTML(name) + lang.lang_status_unemphas, displayLength: 2000 }) Mtoast({ html: escapeHTML(name) + lang.lang_status_unemphas, displayLength: 2000 })
} }
}) })
if (!can) { if (!can) {
obj.push(name) obj.push(name)
M.toast({ html: escapeHTML(name) + lang.lang_status_emphas, displayLength: 2000 }) Mtoast({ html: escapeHTML(name) + lang.lang_status_emphas, displayLength: 2000 })
} else { } else {
} }
var json = JSON.stringify(obj) var json = JSON.stringify(obj)
@ -1398,7 +1398,7 @@ function client(name) {
obj.push(name) obj.push(name)
var json = JSON.stringify(obj) var json = JSON.stringify(obj)
localStorage.setItem('client_mute', json) localStorage.setItem('client_mute', json)
M.toast({ html: escapeHTML(name) + lang.lang_parse_mute, displayLength: 2000 }) Mtoast({ html: escapeHTML(name) + lang.lang_parse_mute, displayLength: 2000 })
parseColumn() parseColumn()
} }
}) })

View File

@ -143,14 +143,14 @@ function voiceSettings() {
var awk = $('[name=bym]:checked').val() var awk = $('[name=bym]:checked').val()
if (awk == 'yes') { if (awk == 'yes') {
localStorage.setItem('voice_bouyomi', 'yes') localStorage.setItem('voice_bouyomi', 'yes')
M.toast({ html: 'Bouyomi Chan connection requires WebSocket Plugin', displayLength: 3000 }) Mtoast({ html: 'Bouyomi Chan connection requires WebSocket Plugin', displayLength: 3000 })
} else { } else {
localStorage.removeItem('voice_bouyomi') localStorage.removeItem('voice_bouyomi')
} }
localStorage.setItem('voice_speed', $('#voicespeed').val() / 10) localStorage.setItem('voice_speed', $('#voicespeed').val() / 10)
localStorage.setItem('voice_pitch', $('#voicepitch').val() / 50) localStorage.setItem('voice_pitch', $('#voicepitch').val() / 50)
localStorage.setItem('voice_vol', $('#voicevol').val() / 100) localStorage.setItem('voice_vol', $('#voicevol').val() / 100)
M.toast({ html: lang.lang_speech_refresh, displayLength: 3000 }) Mtoast({ html: lang.lang_speech_refresh, displayLength: 3000 })
} }
function voiceSettingLoad() { function voiceSettingLoad() {
var flag = localStorage.getItem('voice_bouyomi') var flag = localStorage.getItem('voice_bouyomi')

View File

@ -156,10 +156,10 @@ function autoToot(tag) {
var nowPT = localStorage.getItem('stable') var nowPT = localStorage.getItem('stable')
if (nowPT == tag) { if (nowPT == tag) {
localStorage.removeItem('stable') localStorage.removeItem('stable')
M.toast({ html: lang.lang_tags_unrealtime, displayLength: 3000 }) Mtoast({ html: lang.lang_tags_unrealtime, displayLength: 3000 })
} else { } else {
localStorage.setItem('stable', tag) localStorage.setItem('stable', tag)
M.toast({ Mtoast({
html: lang.lang_tags_tagwarn.replace('{{tag}}', tag).replace('{{tag}}', tag), html: lang.lang_tags_tagwarn.replace('{{tag}}', tag).replace('{{tag}}', tag),
displayLength: 3000 displayLength: 3000
}) })
@ -195,7 +195,7 @@ function tagFeature(name, acct_id) {
}) })
.then(function(json) { .then(function(json) {
console.log(json) console.log(json)
M.toast({ html: 'Complete: ' + escapeHTML(name), displayLength: 3000 }) Mtoast({ html: 'Complete: ' + escapeHTML(name), displayLength: 3000 })
}) })
} }
//タグのフィルタ //タグのフィルタ

View File

@ -1000,7 +1000,7 @@ function reconnector(tlid, type, acct_id, data, mode) {
var mute = getFilterTypeByAcct(acct_id, type) var mute = getFilterTypeByAcct(acct_id, type)
reload(type, '', acct_id, tlid, data, mute, '', voice, mode) reload(type, '', acct_id, tlid, data, mute, '', voice, mode)
} }
M.toast({ html: lang.lang_tl_reconnect, displayLength: 2000 }) Mtoast({ html: lang.lang_tl_reconnect, displayLength: 2000 })
} }
function columnReload(tlid, type) { function columnReload(tlid, type) {
$('#notice_icon_' + tlid).addClass('red-text') $('#notice_icon_' + tlid).addClass('red-text')

View File

@ -291,5 +291,5 @@ function stopVideo() {
function copyImgUrl() { function copyImgUrl() {
var murl = $('#imagemodal').attr('data-original') var murl = $('#imagemodal').attr('data-original')
execCopy(murl) execCopy(murl)
M.toast({ html: lang.lang_img_copyDone, displayLength: 1500 }) Mtoast({ html: lang.lang_img_copyDone, displayLength: 1500 })
} }

View File

@ -5,7 +5,7 @@ var envView = new Vue({
methods: { methods: {
complete: function (i, val) { complete: function (i, val) {
var ls = envView.config[i].storage var ls = envView.config[i].storage
M.toast({ html: 'Complete', displayLength: 3000 }) Mtoast({ html: 'Complete', displayLength: 3000 })
if (!val) { if (!val) {
var id = envView.config[i].id var id = envView.config[i].id
var val = $('#' + id).val() var val = $('#' + id).val()
@ -39,7 +39,7 @@ var tlView = new Vue({
ls = ls.data ls = ls.data
} }
for (var j = 0; j < ls.length; j++) { for (var j = 0; j < ls.length; j++) {
M.toast({ html: 'Complete', displayLength: 3000 }) Mtoast({ html: 'Complete', displayLength: 3000 })
var id = ls[j].id var id = ls[j].id
var val = $('#' + id).val() var val = $('#' + id).val()
localStorage.setItem(ls[j].storage, val) localStorage.setItem(ls[j].storage, val)
@ -68,7 +68,7 @@ var postView = new Vue({
ls = ls.data ls = ls.data
} }
for (var j = 0; j < ls.length; j++) { for (var j = 0; j < ls.length; j++) {
M.toast({ html: 'Complete', displayLength: 3000 }) Mtoast({ html: 'Complete', displayLength: 3000 })
var id = ls[j].id var id = ls[j].id
var val = $('#' + id).val() var val = $('#' + id).val()
localStorage.setItem(ls[j].storage, val) localStorage.setItem(ls[j].storage, val)
@ -90,7 +90,7 @@ function settings() {
$('#' + theme).prop('checked', true) $('#' + theme).prop('checked', true)
} else { } else {
if (cd != localStorage.getItem('theme')) { if (cd != localStorage.getItem('theme')) {
M.toast({ html: lang.lang_setting_theme.replace('{{set}}', ct), displayLength: 3000 }) Mtoast({ html: lang.lang_setting_theme.replace('{{set}}', ct), displayLength: 3000 })
} }
//テーマはこの場で設定 //テーマはこの場で設定
themes(cd) themes(cd)
@ -99,14 +99,14 @@ function settings() {
var fontd = $('#font').val() var fontd = $('#font').val()
if (fontd) { if (fontd) {
if (fontd != localStorage.getItem('font')) { if (fontd != localStorage.getItem('font')) {
M.toast({ html: lang.lang_setting_font.replace('{{set}}', fontd), displayLength: 3000 }) Mtoast({ html: lang.lang_setting_font.replace('{{set}}', fontd), displayLength: 3000 })
} }
localStorage.setItem('font', fontd) localStorage.setItem('font', fontd)
themes() themes()
} else { } else {
if (localStorage.getItem('font')) { if (localStorage.getItem('font')) {
localStorage.removeItem('font') localStorage.removeItem('font')
M.toast({ html: lang.lang_setting_font.replace('{{set}}', '"default"'), displayLength: 3000 }) Mtoast({ html: lang.lang_setting_font.replace('{{set}}', '"default"'), displayLength: 3000 })
themes() themes()
} }
} }
@ -286,7 +286,7 @@ function notftest() {
function oks(no) { function oks(no) {
var txt = $('#oks-' + no).val() var txt = $('#oks-' + no).val()
localStorage.setItem('oks-' + no, txt) localStorage.setItem('oks-' + no, txt)
M.toast({ html: lang.lang_setting_ksref, displayLength: 3000 }) Mtoast({ html: lang.lang_setting_ksref, displayLength: 3000 })
} }
function oksload() { function oksload() {
if (localStorage.getItem('oks-1')) { if (localStorage.getItem('oks-1')) {
@ -656,7 +656,7 @@ function ctLoadCore(args) {
$('#custom-sel-sel').html(templete) $('#custom-sel-sel').html(templete)
templete = '<option value="add_new">' + $('#edit-selector').attr('data-add') + '</option>' + templete templete = '<option value="add_new">' + $('#edit-selector').attr('data-add') + '</option>' + templete
$('#custom-edit-sel').html(templete) $('#custom-edit-sel').html(templete)
$('select').formSelect() //$('select').formSelect()
} }
function customSel() { function customSel() {
var id = $('#custom-sel-sel').val() var id = $('#custom-sel-sel').val()
@ -830,5 +830,5 @@ function lastFmSet() {
} else { } else {
localStorage.removeItem('lastFmUser') localStorage.removeItem('lastFmUser')
} }
M.toast({ html: 'Complete: last.fm', displayLength: 3000 }) Mtoast({ html: 'Complete: last.fm', displayLength: 3000 })
} }

View File

@ -104,7 +104,7 @@ function sort() {
var json = JSON.stringify(newobj); var json = JSON.stringify(newobj);
localStorage.setItem("column", json); localStorage.setItem("column", json);
$("#sort").html(""); $("#sort").html("");
M.toast({ html: "Sorted", displayLength: 3000 }) Mtoast({ html: "Sorted", displayLength: 3000 })
sortLoad(); sortLoad();
parseColumn(); parseColumn();
sortMenu() sortMenu()

View File

@ -53,20 +53,20 @@ function spotifyFlagSave() {
var awk = $('[name=awk]:checked').val() var awk = $('[name=awk]:checked').val()
if (awk == 'yes') { if (awk == 'yes') {
localStorage.setItem('artwork', 'yes') localStorage.setItem('artwork', 'yes')
M.toast({ html: lang.lang_spotify_img, displayLength: 3000 }) Mtoast({ html: lang.lang_spotify_img, displayLength: 3000 })
} else { } else {
localStorage.removeItem('artwork') localStorage.removeItem('artwork')
M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 }) Mtoast({ html: lang.lang_spotify_imgno, displayLength: 3000 })
} }
} }
function aMusicFlagSave() { function aMusicFlagSave() {
var awk = $('[name=amw]:checked').val() var awk = $('[name=amw]:checked').val()
if (awk == 'yes') { if (awk == 'yes') {
localStorage.setItem('complete-artwork', 'yes') localStorage.setItem('complete-artwork', 'yes')
M.toast({ html: lang.lang_spotify_img, displayLength: 3000 }) Mtoast({ html: lang.lang_spotify_img, displayLength: 3000 })
} else { } else {
localStorage.removeItem('complete-artwork') localStorage.removeItem('complete-artwork')
M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 }) Mtoast({ html: lang.lang_spotify_imgno, displayLength: 3000 })
} }
} }
function nowplaying(mode) { function nowplaying(mode) {
@ -267,7 +267,7 @@ async function npCore(arg) {
function spotifySave() { function spotifySave() {
var temp = $('#np-temp').val() var temp = $('#np-temp').val()
localStorage.setItem('np-temp', temp) localStorage.setItem('np-temp', temp)
M.toast({ html: lang.lang_spotify_np, displayLength: 3000 }) Mtoast({ html: lang.lang_spotify_np, displayLength: 3000 })
} }
if (location.search) { if (location.search) {
var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/) var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/)

View File

@ -99,7 +99,7 @@ function udg(user, acct_id) {
} }
//moved設定時 //moved設定時
if (json.moved) { if (json.moved) {
M.toast({ Mtoast({
html: lang.lang_showontl_movetxt + '<button class="btn-flat toast-action" onclick="udg(\'' + json.moved.id + "','" + acct_id + "')\">" + lang.lang_showontl_movebtn + "</button>", html: lang.lang_showontl_movetxt + '<button class="btn-flat toast-action" onclick="udg(\'' + json.moved.id + "','" + acct_id + "')\">" + lang.lang_showontl_movebtn + "</button>",
displayLength: 4000 displayLength: 4000
}); });
@ -483,7 +483,7 @@ function setMain() {
var acct_id = $("#his-data").attr("use-acct"); var acct_id = $("#his-data").attr("use-acct");
localStorage.setItem("main", acct_id); localStorage.setItem("main", acct_id);
multiSelector(true); multiSelector(true);
M.toast({ html: lang.lang_manager_mainAcct, displayLength: 3000 }); Mtoast({ html: lang.lang_manager_mainAcct, displayLength: 3000 });
} }
//オールリセット //オールリセット
function hisclose() { function hisclose() {

View File

@ -1724,10 +1724,10 @@
<script type="text/javascript" src="../../@@node_base@@/jquery/dist/jquery.js"></script> <script type="text/javascript" src="../../@@node_base@@/jquery/dist/jquery.js"></script>
<script type="text/javascript" src="../../js/platform/first.js"></script> <script type="text/javascript" src="../../js/platform/first.js"></script>
<script type="text/javascript" src="../../@@node_base@@/grapheme-splitter/index.js"></script> <script type="text/javascript" src="../../@@node_base@@/grapheme-splitter/index.js"></script>
<script <!--script
type="text/javascript" type="text/javascript"
src="../../@@node_base@@/materialize-css/dist/js/materialize.js" src="../../@@node_base@@/materialize-css/dist/js/materialize.js"
></script> ></script-->
<script type="text/javascript" src="../../@@node_base@@/lodash/lodash.min.js"></script> <script type="text/javascript" src="../../@@node_base@@/lodash/lodash.min.js"></script>
<script type="text/javascript" src="main.js"></script> <script type="text/javascript" src="main.js"></script>
<script type="text/javascript" src="../../js/common/time.js"></script> <script type="text/javascript" src="../../js/common/time.js"></script>