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

Polls:

Browse Source 
Fix update poll when 'min' in results
Fix creation bug
Fix overflow in answer input field
Fix creation popup height
This commit is contained in:
morethanwords 2020-10-13 03:12:39 +03:00
parent 0e78498f87
commit 2ddc209ee5
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/popupCreatePoll.ts
View File

@ -159,7 +159,7 @@ export default class PopupCreatePoll extends PopupElement {
} }
const quizSolution = this.quizSolutionInput.value.trim() || undefined; const quizSolution = this.quizSolutionInput.value.trim() || undefined;
if(quizSolution.length > MAX_LENGTH_SOLUTION) { if(quizSolution?.length > MAX_LENGTH_SOLUTION) {
toast('Explanation is too long.'); toast('Explanation is too long.');
return; return;
} }

22
src/lib/appManagers/appPollsManager.ts
View File

@ -1,5 +1,5 @@
import { InputMedia } from "../../layer"; import { InputMedia } from "../../layer";
import { logger, LogLevels } from "../logger"; import { logger } from "../logger";
import apiManager from "../mtproto/mtprotoworker"; import apiManager from "../mtproto/mtprotoworker";
import { MOUNT_CLASS_TO } from "../mtproto/mtproto_config"; import { MOUNT_CLASS_TO } from "../mtproto/mtproto_config";
import { RichTextProcessor } from "../richtextprocessor"; import { RichTextProcessor } from "../richtextprocessor";
@ -74,7 +74,7 @@ class AppPollsManager {
public polls: {[id: string]: Poll} = {}; public polls: {[id: string]: Poll} = {};
public results: {[id: string]: PollResults} = {}; public results: {[id: string]: PollResults} = {};
private log = logger('POLLS', LogLevels.error); private log = logger('POLLS'/* , LogLevels.error */);
constructor() { constructor() {
$rootScope.$on('apiUpdate', (e) => { $rootScope.$on('apiUpdate', (e) => {
@ -89,7 +89,7 @@ class AppPollsManager {
case 'updateMessagePoll': { // when someone voted, we too case 'updateMessagePoll': { // when someone voted, we too
this.log('updateMessagePoll:', update); this.log('updateMessagePoll:', update);
let poll: Poll = /* this.polls[update.poll_id] || */update.poll; let poll: Poll = update.poll || this.polls[update.poll_id];
if(!poll) { if(!poll) {
break; break;
} }
@ -124,13 +124,15 @@ class AppPollsManager {
public saveResults(poll: Poll, results: PollResults) { public saveResults(poll: Poll, results: PollResults) {
this.results[poll.id] = results; this.results[poll.id] = results;
poll.chosenIndexes.length = 0; if(!results.pFlags.min) { // ! https://core.telegram.org/constructor/pollResults - min
if(results?.results?.length) { poll.chosenIndexes.length = 0;
results.results.forEach((answer, idx) => { if(results?.results?.length) {
if(answer.pFlags?.chosen) { results.results.forEach((answer, idx) => {
poll.chosenIndexes.push(idx); if(answer.pFlags?.chosen) {
} poll.chosenIndexes.push(idx);
}); }
});
}
} }
} }

6
src/scss/partials/popups/_createPoll.scss
View File

@ -4,7 +4,7 @@
#{$parent} { #{$parent} {
&-container { &-container {
//max-height: 468px; //max-height: 468px;
max-height: 640px; max-height: unquote('min(640px, 100%)');
padding: 0; padding: 0;
} }
} }
@ -46,6 +46,10 @@
.poll-create-questions { .poll-create-questions {
padding: 0px 1.25rem 2.03125rem; padding: 0px 1.25rem 2.03125rem;
.input-field input {
padding-right: 3.25rem;
}
} }
.poll-create-settings { .poll-create-settings {