インスタンス名がブラウザタイトルに反映されないのを修正 (#2668)
* titleが反映されないのを修正 * deckでtitleが反映されるように修正
This commit is contained in:
		
							parent
							
								
									67f60ab307
								
							
						
					
					
						commit
						5a13c38a6d
					
				
					 6 changed files with 10 additions and 5 deletions
				
			
		| 
						 | 
				
			
			@ -5,6 +5,7 @@ declare const _COPYRIGHT_: string;
 | 
			
		|||
declare const _VERSION_: string;
 | 
			
		||||
declare const _CODENAME_: string;
 | 
			
		||||
declare const _ENV_: string;
 | 
			
		||||
declare const _NAME_: string;
 | 
			
		||||
 | 
			
		||||
const address = new URL(location.href);
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -20,3 +21,4 @@ export const copyright = _COPYRIGHT_;
 | 
			
		|||
export const version = _VERSION_;
 | 
			
		||||
export const codename = _CODENAME_;
 | 
			
		||||
export const env = _ENV_;
 | 
			
		||||
export const name = _NAME_;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -85,6 +85,7 @@ export default Vue.extend({
 | 
			
		|||
	},
 | 
			
		||||
 | 
			
		||||
	mounted() {
 | 
			
		||||
		document.title = (this as any).os.instanceName;
 | 
			
		||||
		document.documentElement.style.overflow = 'hidden';
 | 
			
		||||
	},
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -3,7 +3,7 @@ import { EventEmitter } from 'eventemitter3';
 | 
			
		|||
import * as uuid from 'uuid';
 | 
			
		||||
 | 
			
		||||
import initStore from './store';
 | 
			
		||||
import { apiUrl, version, lang } from './config';
 | 
			
		||||
import { apiUrl, version, lang, name } from './config';
 | 
			
		||||
import Progress from './common/scripts/loading';
 | 
			
		||||
import Connection from './common/scripts/streaming/stream';
 | 
			
		||||
import { HomeStreamManager } from './common/scripts/streaming/home';
 | 
			
		||||
| 
						 | 
				
			
			@ -72,7 +72,7 @@ export default class MiOS extends EventEmitter {
 | 
			
		|||
	};
 | 
			
		||||
 | 
			
		||||
	public get instanceName() {
 | 
			
		||||
		return this.meta ? this.meta.data.name : 'Misskey';
 | 
			
		||||
		return this.meta ? this.meta.data.name : name;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	private isMetaFetching = false;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -6,7 +6,7 @@ block vars
 | 
			
		|||
	- const url = `${config.url}/notes/${note.id}`;
 | 
			
		||||
 | 
			
		||||
block title
 | 
			
		||||
	= `${title} | Misskey`
 | 
			
		||||
	= `${title} | ${config.name}`
 | 
			
		||||
 | 
			
		||||
block desc
 | 
			
		||||
	meta(name='description' content= summary)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -6,7 +6,7 @@ block vars
 | 
			
		|||
	- const img = user.avatarId ? `${config.drive_url}/${user.avatarId}` : null;
 | 
			
		||||
 | 
			
		||||
block title
 | 
			
		||||
	= `${title} | Misskey`
 | 
			
		||||
	= `${title} | ${config.name}`
 | 
			
		||||
 | 
			
		||||
block desc
 | 
			
		||||
	meta(name='description' content= user.description)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -22,6 +22,7 @@ const locales = require('./locales');
 | 
			
		|||
const meta = require('./package.json');
 | 
			
		||||
const version = `${meta.clientVersion}-${rndstr({ length: 8, chars: '0-9a-z' })}`;
 | 
			
		||||
const codename = meta.codename;
 | 
			
		||||
import config from './src/config';
 | 
			
		||||
 | 
			
		||||
declare var global: {
 | 
			
		||||
	faReplacement: typeof faReplacement;
 | 
			
		||||
| 
						 | 
				
			
			@ -75,7 +76,8 @@ const consts = {
 | 
			
		|||
	_CODENAME_: codename,
 | 
			
		||||
	_LANG_: '%lang%',
 | 
			
		||||
	_LANGS_: Object.keys(locales).map(l => [l, locales[l].meta.lang]),
 | 
			
		||||
	_ENV_: process.env.NODE_ENV
 | 
			
		||||
	_ENV_: process.env.NODE_ENV,
 | 
			
		||||
	_NAME_: config.name
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
const _consts: { [ key: string ]: any } = {};
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue