darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-09 02:44:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove branding_type from set_email_branding page

Browse Source 
Includes updates to the controller so
branding_type is got from the email_branding model
instead of from user input.

Follows on from:

https://github.com/alphagov/notifications-admin/pull/2249
This commit is contained in:
Tom Byers
2018-08-29 11:36:50 +01:00
parent f6c3a8f817
commit 0df88ea182
5 changed files with 11 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/assets/javascripts/emailPreviewPane.js
View File

@@ -5,18 +5,16 @@
const root = this,
$ = this.jQuery;
let branding_type = $('.multiple-choice input[name="branding_type"]:checked');
let branding_style = $('.multiple-choice input[name="branding_style"]:checked');
if (!branding_type.length || !branding_style.length) { return; }
if (!branding_style.length) { return; }
branding_type = branding_type.val();
branding_style = branding_style.val();
const $paneWrapper = $('<div class="column-full"></div>');
const $form = $('form');
const $previewPane = $('<iframe src="/_email?' +
buildQueryString(['branding_type', branding_type], ['branding_style', branding_style]) +
const $previewPane = $('<iframe src="/_email?' +
buildQueryString(['branding_style', branding_style]) +
'" class="email-branding-preview"></iframe>');
function buildQueryString () {
@@ -25,13 +23,10 @@
function setPreviewPane (e) {
const $target = $(e.target);
if ($target.attr('name') == 'branding_type') {
branding_type = $target.val();
}
if ($target.attr('name') == 'branding_style') {
branding_style = $target.val();
}
$previewPane.attr('src', '/_email?' + buildQueryString(['branding_type', branding_type], ['branding_style', branding_style]));
$previewPane.attr('src', '/_email?' + buildQueryString(['branding_style', branding_style]));
}
$paneWrapper.append($previewPane);
@@ -39,5 +34,5 @@
$form.attr('action', location.pathname.replace(/set-email-branding$/, 'preview-email-branding'));
$form.find('button[type="submit"]').text('Save');
$('fieldset').on('change', 'input[name="branding_type"], input[name="branding_style"]', setPreviewPane);
$('fieldset').on('change', 'input[name="branding_style"]', setPreviewPane);
})();