r4sas/tweb-i2p
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix editing input fields with emoji as last char

Browse Source 
Removed DS_Store files
This commit is contained in:
morethanwords 2021-01-01 16:36:48 +04:00
parent a50e593cfd
commit 5f3c48db65
7 changed files with 642 additions and 457 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

2
.gitignore vendored
View File

@ -2,7 +2,7 @@ node_modules
coverage coverage
__pycache__ __pycache__
dist dist
.DS_Store **/.DS_Store
stats.json stats.json
certs certs
src/rlottie.github.io src/rlottie.github.io

1065
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
package.json
View File

@ -58,7 +58,7 @@
"media-query-plugin": "^1.3.1", "media-query-plugin": "^1.3.1",
"mini-css-extract-plugin": "^0.9.0", "mini-css-extract-plugin": "^0.9.0",
"node-sass": "^4.14.1", "node-sass": "^4.14.1",
"npm": "^6.14.5", "npm": "^6.14.10",
"on-build-webpack": "^0.1.0", "on-build-webpack": "^0.1.0",
"optimize-css-assets-webpack-plugin": "^5.0.3", "optimize-css-assets-webpack-plugin": "^5.0.3",
"pako": "^1.0.11", "pako": "^1.0.11",
@ -66,7 +66,7 @@
"postcss-loader": "^3.0.0", "postcss-loader": "^3.0.0",
"postcss-preset-env": "^6.7.0", "postcss-preset-env": "^6.7.0",
"qr-code-styling": "^1.0.1", "qr-code-styling": "^1.0.1",
"resolve-url-loader": "^3.1.1", "resolve-url-loader": "^3.1.2",
"sass-loader": "^8.0.2", "sass-loader": "^8.0.2",
"serviceworker-webpack-plugin": "^1.0.1", "serviceworker-webpack-plugin": "^1.0.1",
"style-loader": "^1.2.1", "style-loader": "^1.2.1",

2
src/components/sidebarLeft/tabs/editFolder.ts
View File

@ -184,7 +184,7 @@ export default class AppEditFolderTab implements SliderTab {
} }
const filter = this.filter; const filter = this.filter;
this.nameInputField.value = RichTextProcessor.wrapEmojiText(filter.title); this.nameInputField.value = RichTextProcessor.wrapDraftText(filter.title);
for(const flag in this.flags) { for(const flag in this.flags) {
// @ts-ignore // @ts-ignore

24
src/components/sidebarLeft/tabs/editProfile.ts
View File

@ -20,6 +20,10 @@ export default class AppEditProfileTab implements SliderTab {
private canvas: HTMLCanvasElement; private canvas: HTMLCanvasElement;
private uploadAvatar: () => Promise<InputFile> = null; private uploadAvatar: () => Promise<InputFile> = null;
private firstNameInputField: InputField;
private lastNameInputField: InputField;
private bioInputField: InputField;
private userNameInputField: InputField;
private firstNameInput: HTMLElement; private firstNameInput: HTMLElement;
private lastNameInput: HTMLElement; private lastNameInput: HTMLElement;
private bioInput: HTMLElement; private bioInput: HTMLElement;
@ -36,10 +40,6 @@ export default class AppEditProfileTab implements SliderTab {
userName: '', userName: '',
bio: '' bio: ''
}; };
firstNameInputField: InputField;
lastNameInputField: InputField;
bioInputField: InputField;
userNameInputField: InputField;
public init() { public init() {
this.container = document.querySelector('.edit-profile-container'); this.container = document.querySelector('.edit-profile-container');
@ -211,9 +211,9 @@ export default class AppEditProfileTab implements SliderTab {
bio: '' bio: ''
}); });
this.firstNameInput.innerHTML = user.rFirstName; this.firstNameInputField.value = RichTextProcessor.wrapDraftText(user.first_name);
this.lastNameInput.innerHTML = RichTextProcessor.wrapRichText(user.last_name, {noLinks: true, noLinebreaks: true}); this.lastNameInputField.value = RichTextProcessor.wrapDraftText(user.last_name);
this.bioInput.innerHTML = ''; this.bioInputField.value = '';
this.userNameInputField.value = this.originalValues.userName = user.username ?? ''; this.userNameInputField.value = this.originalValues.userName = user.username ?? '';
this.userNameInput.classList.remove('valid', 'error'); this.userNameInput.classList.remove('valid', 'error');
@ -222,7 +222,7 @@ export default class AppEditProfileTab implements SliderTab {
appProfileManager.getProfile(user.id, true).then(userFull => { appProfileManager.getProfile(user.id, true).then(userFull => {
if(userFull.about) { if(userFull.about) {
this.originalValues.bio = userFull.about; this.originalValues.bio = userFull.about;
this.bioInput.innerHTML = userFull.rAbout; this.bioInputField.value = RichTextProcessor.wrapDraftText(userFull.about);
this.handleChange(); this.handleChange();
} }
@ -263,15 +263,11 @@ export default class AppEditProfileTab implements SliderTab {
} }
private handleChange = () => { private handleChange = () => {
if(this.isChanged()) { this.nextBtn.classList.toggle('is-visible', this.isChanged());
this.nextBtn.classList.add('is-visible');
} else {
this.nextBtn.classList.remove('is-visible');
}
}; };
onCloseAfterTimeout() { onCloseAfterTimeout() {
this.nextBtn.classList.remove('is-visible'); this.nextBtn.classList.remove('is-visible');
this.firstNameInput.innerHTML = this.lastNameInput.innerHTML = this.bioInput.innerHTML = ''; this.firstNameInputField.value = this.lastNameInputField.value = this.bioInputField.value = '';
} }
} }

2
webpack.common.js
View File

@ -8,7 +8,7 @@ const fs = require('fs');
const allowedIPs = ['194.58.97.147', '195.66.140.39', '192.168.31.144', '127.0.0.1', '192.168.31.1', '192.168.31.192', '176.100.8.202', '46.219.250.22', '193.42.119.184', '46.133.168.67', '78.26.144.197', '46.133.225.88', '128.124.170.79']; const allowedIPs = ['194.58.97.147', '195.66.140.39', '192.168.31.144', '127.0.0.1', '192.168.31.1', '192.168.31.192', '176.100.8.202', '46.219.250.22', '193.42.119.184', '46.133.168.67', '78.26.144.197', '46.133.225.88', '128.124.170.79'];
const devMode = process.env.NODE_ENV !== 'production'; const devMode = process.env.NODE_ENV !== 'production';
const useLocal = false; const useLocal = true;
if(devMode) { if(devMode) {
console.log('DEVMODE IS ON!'); console.log('DEVMODE IS ON!');