Skip to content

Commit d061c00

Browse files
viownthornbill
viown
authored and
thornbill
committed
Replace on listeners and misc
1 parent 0dc3db8 commit d061c00

File tree

9 files changed

+68
-40
lines changed

9 files changed

+68
-40
lines changed

‎src/components/mediaLibraryCreator/mediaLibraryCreator.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,10 @@ function getCollectionTypeOptionsHtml(collectionTypeOptions) {
7272
}
7373

7474
function initEditor(page, collectionTypeOptions) {
75-
$('#selectCollectionType', page).html(getCollectionTypeOptionsHtml(collectionTypeOptions)).val('').on('change', function () {
75+
const selectCollectionType = page.querySelector('#selectCollectionType');
76+
selectCollectionType.innerHTML = getCollectionTypeOptionsHtml(collectionTypeOptions);
77+
selectCollectionType.value = '';
78+
selectCollectionType.addEventListener('change', function () {
7679
const value = this.value;
7780
const dlg = dom.parentWithClass(this, 'dialog');
7881
libraryoptionseditor.setContentType(dlg.querySelector('.libraryOptions'), value);

‎src/components/tvproviders/schedulesdirect.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -257,15 +257,17 @@ export default function (page, providerId, options) {
257257
const hideSubmitButton = options.showSubmitButton === false;
258258
page.querySelector('.btnSubmitListings').classList.toggle('hide', hideSubmitButton);
259259

260-
$('.formLogin', page).on('submit', function () {
260+
page.querySelector('.formLogin').addEventListener('submit', function () {
261261
submitLoginForm();
262262
return false;
263263
});
264-
$('.formListings', page).on('submit', function () {
264+
265+
page.querySelector('.formListings').addEventListener('submit', function () {
265266
submitListingsForm();
266-
return false;
267+
return false;
267268
});
268-
$('.txtZipCode', page).on('change', function () {
269+
270+
page.querySelector('.txtZipCode').addEventListener('change', function () {
269271
refreshListings(this.value);
270272
});
271273
page.querySelector('.chkAllTuners').addEventListener('change', function (e) {

‎src/controllers/dashboard/general.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@ function loadPage(page, config, languageOptions, systemInfo) {
1616
page.querySelector('#chkQuickConnectAvailable').checked = config.QuickConnectAvailable === true;
1717
page.querySelector('#txtMetadataPath').value = systemInfo.InternalMetadataPath || '';
1818
page.querySelector('#txtMetadataNetworkPath').value = systemInfo.MetadataNetworkPath || '';
19-
$('#selectLocalizationLanguage', page).html(languageOptions.map(function (language) {
19+
const localizationLanguageElem = page.querySelector('#selectLocalizationLanguage');
20+
localizationLanguageElem.innerHTML = languageOptions.map(function (language) {
2021
return '<option value="' + language.Value + '">' + language.Name + '</option>';
21-
})).val(config.UICulture);
22+
}).join('');
23+
localizationLanguageElem.value = config.UICulture;
2224
page.querySelector('#txtLibraryScanFanoutConcurrency').value = config.LibraryScanFanoutConcurrency || '';
2325
page.querySelector('#txtParallelImageEncodingLimit').value = config.ParallelImageEncodingLimit || '';
2426

@@ -30,7 +32,7 @@ function onSubmit() {
3032
const form = this;
3133
ApiClient.getServerConfiguration().then(function (config) {
3234
config.ServerName = form.querySelector('#txtServerName').value;
33-
config.UICulture = form.querySelector('#selectLocalizationLanguage',).value;
35+
config.UICulture = form.querySelector('#selectLocalizationLanguage').value;
3436
config.CachePath = form.querySelector('#txtCachePath').value;
3537
config.MetadataPath = form.querySelector('#txtMetadataPath').value;
3638
config.MetadataNetworkPath = form.querySelector('#txtMetadataNetworkPath').value;

‎src/controllers/dashboard/library.js

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -181,21 +181,28 @@ function reloadVirtualFolders(page, virtualFolders) {
181181
divVirtualFolders.innerHTML = html;
182182
divVirtualFolders.classList.add('itemsContainer');
183183
divVirtualFolders.classList.add('vertical-wrap');
184-
$('.btnCardMenu', divVirtualFolders).on('click', function () {
185-
showCardMenu(page, this, virtualFolders);
186-
});
184+
const btnCardMenuElements = divVirtualFolders.querySelectorAll('.btnCardMenu');
185+
btnCardMenuElements.forEach(function (btn) {
186+
btn.addEventListener('click', function () {
187+
showCardMenu(page, btn, virtualFolders);
188+
})
189+
})
187190
divVirtualFolders.querySelector('#addLibrary').addEventListener('click', function () {
188191
addVirtualFolder(page);
189192
});
190-
$('.editLibrary', divVirtualFolders).on('click', function () {
191-
const card = dom.parentWithClass(this, 'card');
192-
const index = parseInt(card.getAttribute('data-index'), 10);
193-
const virtualFolder = virtualFolders[index];
194193

195-
if (virtualFolder.ItemId) {
196-
editVirtualFolder(page, virtualFolder);
197-
}
198-
});
194+
const libraryEditElements = divVirtualFolders.querySelectorAll('.editLibrary');
195+
libraryEditElements.forEach(function (btn) {
196+
btn.addEventListener('click', function () {
197+
const card = dom.parentWithClass(btn, 'card');
198+
const index = parseInt(card.getAttribute('data-index'), 10);
199+
const virtualFolder = virtualFolders[index];
200+
201+
if (virtualFolder.ItemId) {
202+
editVirtualFolder(page, virtualFolder);
203+
}
204+
})
205+
})
199206
loading.hide();
200207
}
201208

‎src/controllers/dashboard/metadatanfo.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ function loadPage(page, config, users) {
1010
html += users.map(function (user) {
1111
return '<option value="' + user.Id + '">' + escapeHtml(user.Name) + '</option>';
1212
}).join('');
13-
$('#selectUser', page).html(html).val(config.UserId || '');
14-
$('#selectReleaseDateFormat', page).val(config.ReleaseDateFormat);
13+
const elem = page.querySelector('#selectUser');
14+
elem.innerHTML = html;
15+
elem.value = config.UserId || '';
16+
page.querySelector('#selectReleaseDateFormat').value = config.ReleaseDateFormat;
1517
page.querySelector('#chkSaveImagePaths').checked = config.SaveImagePathsInNfo;
1618
page.querySelector('#chkEnablePathSubstitution').checked = config.EnablePathSubstitution;
1719
page.querySelector('#chkEnableExtraThumbs').checked = config.EnableExtraThumbsDuplication;

‎src/controllers/dashboard/scheduledtasks/scheduledtask.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ const ScheduledTaskPage = {
126126
showAddTriggerPopup: function (view) {
127127
view.querySelector('#selectTriggerType').value = 'DailyTrigger';
128128
view.querySelector('#selectTriggerType').dispatchEvent(new CustomEvent('change', {}));
129-
$('#popupAddTrigger', view).removeClass('hide');
129+
view.querySelector('#popupAddTrigger').classList.remove('hide');
130130
},
131131
confirmDeleteTrigger: function (view, index) {
132132
confirm(globalize.translate('MessageDeleteTaskTrigger'), globalize.translate('HeaderDeleteTaskTrigger')).then(function () {
@@ -207,7 +207,7 @@ export default function (view) {
207207
ApiClient.getScheduledTask(id).then(function (task) {
208208
task.Triggers.push(ScheduledTaskPage.getTriggerToAdd(view));
209209
ApiClient.updateScheduledTaskTriggers(task.Id, task.Triggers).then(function () {
210-
$('#popupAddTrigger').addClass('hide');
210+
document.querySelector('#popupAddTrigger').classList.add('hide');
211211
ScheduledTaskPage.refreshScheduledTask(view);
212212
});
213213
});
@@ -216,7 +216,7 @@ export default function (view) {
216216

217217
view.querySelector('.addTriggerForm').addEventListener('submit', onSubmit);
218218
fillTimeOfDay(view.querySelector('#selectTimeOfDay'));
219-
$(view.querySelector('#popupAddTrigger').parentNode).trigger('create');
219+
view.querySelector('#popupAddTrigger').parentNode.trigger(new Event('create'));
220220
view.querySelector('.selectTriggerType').addEventListener('change', function () {
221221
ScheduledTaskPage.refreshTriggerFields(view, this.value);
222222
});

‎src/controllers/livetvsettings.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ import alert from '../components/alert';
77

88
function loadPage(page, config) {
99
page.querySelector('.liveTvSettingsForm').classList.remove('hide');
10-
page.querySelector('.noLiveTvServices').classList.add('hide');
11-
page.querySelector('#selectGuideDays',).value = config.GuideDays || '';
10+
if (page.querySelector('.noLiveTvServices')) {
11+
page.querySelector('.noLiveTvServices').classList.add('hide');
12+
}
13+
page.querySelector('#selectGuideDays').value = config.GuideDays || '';
1214
page.querySelector('#txtPrePaddingMinutes').value = config.PrePaddingSeconds / 60;
1315
page.querySelector('#txtPostPaddingMinutes').value = config.PostPaddingSeconds / 60;
1416
page.querySelector('#txtRecordingPath').value = config.RecordingPath || '';

‎src/controllers/livetvstatus.js

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,16 @@ function renderProviders(page, providers) {
130130
}
131131

132132
const elem = page.querySelector('.providerList');
133-
elem.innerHTML = html
134-
$('.btnOptions', elem).on('click', function () {
135-
const id = this.getAttribute('data-id');
136-
showProviderOptions(page, id, this);
137-
});
133+
elem.innerHTML = html;
134+
if (elem.querySelector('.btnOptions')) {
135+
const btnOptionElements = elem.querySelectorAll('.btnOptions');
136+
btnOptionElements.forEach(function (btn) {
137+
btn.addEventListener('click', function () {
138+
const id = this.getAttribute('data-id');
139+
showProviderOptions(page, id, btn);
140+
})
141+
})
142+
}
138143
}
139144

140145
function showProviderOptions(page, providerId, button) {
@@ -298,14 +303,17 @@ function onDevicesListClick(e) {
298303

299304
$(document).on('pageinit', '#liveTvStatusPage', function () {
300305
const page = this;
301-
$('.btnAddDevice', page).on('click', function () {
306+
page.querySelector('.btnAddDevice').addEventListener('click', function () {
302307
addDevice();
303308
});
304-
$('.formAddDevice', page).on('submit', function () {
305-
submitAddDeviceForm(page);
306-
return false;
307-
});
308-
$('.btnAddProvider', page).on('click', function () {
309+
if (page.querySelector('.formAddDevice')) {
310+
// unused?
311+
page.querySelector('.formAddDevice').addEventListener('submit', function () {
312+
submitAddDeviceForm(page);
313+
return false;
314+
});
315+
}
316+
page.querySelector('.btnAddProvider').addEventListener('click', function () {
309317
addProvider(this);
310318
});
311319
page.querySelector('.devicesList').addEventListener('click', onDevicesListClick);

‎src/controllers/wizard/start/index.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ import Dashboard from '../../../utils/dashboard';
66
import dom from 'scripts/dom';
77

88
function loadPage(page, config, languageOptions) {
9-
$('#selectLocalizationLanguage', page).html(languageOptions.map(function (l) {
9+
const elem = page.querySelector('#selectLocalizationLanguage');
10+
elem.innerHTML = languageOptions.map(function (l) {
1011
return '<option value="' + l.Value + '">' + l.Name + '</option>';
11-
})).val(config.UICulture);
12+
}).join('');
13+
elem.value = config.UICulture;
1214
loading.hide();
1315
}
1416

@@ -34,7 +36,7 @@ function onSubmit() {
3436
}
3537

3638
export default function (view) {
37-
$('.wizardStartForm', view).on('submit', onSubmit);
39+
view.querySelector('.wizardStartForm').addEventListener('submit', onSubmit);
3840
view.addEventListener('viewshow', function () {
3941
document.querySelector('.skinHeader').classList.add('noHomeButtonHeader');
4042
loading.show();

0 commit comments

Comments
 (0)