Skip to content

MOBILE-3583 quiz: Fix matching questions in 3.10 #2590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 5, 2020
Merged

MOBILE-3583 quiz: Fix matching questions in 3.10 #2590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/core/pushnotifications/providers/pushnotifications.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ import { CoreConfigConstants } from '../../../configconstants';
import { ILocalNotification } from '@ionic-native/local-notifications';
import { SQLiteDB } from '@classes/sqlitedb';
import { CoreSite } from '@classes/site';
import { CoreFilterProvider } from '@core/filter/providers/filter';
import { CoreFilterDelegate } from '@core/filter/providers/delegate';

/**
* Data needed to register a device in a Moodle site.
Expand Down Expand Up @@ -196,8 +194,6 @@ export class CorePushNotificationsProvider {
platform: Platform,
appProvider: CoreAppProvider,
private sitesFactory: CoreSitesFactoryProvider,
private filterProvider: CoreFilterProvider,
private filterDelegate: CoreFilterDelegate
) {
this.logger = logger.getInstance('CorePushNotificationsProvider');
this.appDB = appProvider.getDB();
Expand Down
10 changes: 8 additions & 2 deletions src/core/question/classes/base-question-component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,8 +473,14 @@ export class CoreQuestionBaseComponent {

this.question.disabled = this.question.disabled && element.disabled;

// Get the label with the question text.
const label = questionEl.querySelector('label[for="' + option.id + '"]');
// Get the label with the question text. Try the new format first.
const labelId = element.getAttribute('aria-labelledby');
let label = labelId ? questionEl.querySelector('#' + labelId.replace(/:/g, '\\:')) : undefined;
if (!label) {
// Not found, use the old format.
label = questionEl.querySelector('label[for="' + option.id + '"]');
}

if (label) {
option.text = label.innerHTML;

Expand Down