Merge remote-tracking branch 'refs/remotes/origin/im/global-polls' in…

…to di/improve-poll-option
FriendsOfFlarum · Apr 9, 2024 · ca361bc · ca361bc
2 parents f0ad1a4 + 2dffefd
commit ca361bc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/js/src/forum/components/Poll/PollOption.tsx b/js/src/forum/components/Poll/PollOption.tsx
@@ -50,6 +50,8 @@ export default class PollOption extends Component<PollOptionAttrs, PollState> {
   }
 
   view(): Mithril.Children {
+    this.voted = this.state.hasVotedFor(this.option);
+
     const isDisabled = this.state.loadingOptions || (this.hasVoted && !this.poll.canChangeVote());
     const width = this.canSeeVoteCount ? this.percent() : (Number(this.voted) / (this.poll.myVotes()?.length || 1)) * 100;
 

diff --git a/js/src/forum/components/PollsPage.tsx b/js/src/forum/components/PollsPage.tsx
@@ -2,7 +2,6 @@ import type Mithril from 'mithril';
 import app from 'flarum/forum/app';
 import listItems from 'flarum/common/helpers/listItems';
 import ItemList from 'flarum/common/utils/ItemList';
-import Page, { IPageAttrs } from 'flarum/common/components/Page';
 import IndexPage from 'flarum/forum/components/IndexPage';
 import PollList from './Poll/PollList';
 import LogInModal from 'flarum/forum/components/LogInModal';
@@ -11,7 +10,6 @@ import PollListState from '../states/PollListState';
 import Button from 'flarum/common/components/Button';
 import SelectDropdown from 'flarum/common/components/SelectDropdown';
 import LoadingIndicator from 'flarum/common/components/LoadingIndicator';
-import PollModel from '../models/Poll';
 import PollView from './PollView';
 import { AbstractPollPage } from './AbstractPollPage';