Skip to content
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

Jump to bottom

MNT ESLint issues #714

Merged
merged 1 commit into from
Jul 9, 2023
Merged

MNT ESLint issues #714

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
188 changes: 94 additions & 94 deletions client/src/bundles/cms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,141 +2,141 @@
import jQuery from 'jquery';

jQuery.entwine('ss', ($) => {
/**
/**
* The page success/error message sits outside of the html block
* containing the sidebar and cms fields. This means it overflows
* underneath the sidebar.
*
* @see https://github.com/silverstripe/silverstripe-blog/issues/210
*/
$('.cms-content-fields > #Form_EditForm_error').entwine({
onadd() {
const $target = $('.blog-admin-outer');
if ($target.length === 1) {
$target.prepend(this);
}
}
});

/**
$('.cms-content-fields > #Form_EditForm_error').entwine({
onadd() {
const $target = $('.blog-admin-outer');
if ($target.length === 1) {
$target.prepend(this);
}
}
});

/**
* Register expandable help text functions with fields.
*/
$('.toggle-description').entwine({
onadd() {
const $this = $(this);
$('.toggle-description').entwine({
onadd() {
const $this = $(this);

/**
/**
* Prevent multiple events being added.
*/
if ($this.hasClass('toggle-description-enabled')) {
return;
}
if ($this.hasClass('toggle-description-enabled')) {
return;
}

$this.addClass('toggle-description-enabled');
$this.addClass('toggle-description-enabled');

/**
/**
* Toggle next description when button is clicked.
*/
let shown = false;
const $helpInfo = $this.closest('.field').find('.form-text');
let shown = false;
const $helpInfo = $this.closest('.field').find('.form-text');

$this.on('click', () => {
$helpInfo[shown ? 'hide' : 'show']();
$this.toggleClass('toggle-description-shown');
shown = !shown;
});
$this.on('click', () => {
$helpInfo[shown ? 'hide' : 'show']();
$this.toggleClass('toggle-description-shown');
shown = !shown;
});

/**
/**
* Hide next description by default.
*/
$helpInfo.hide();
$helpInfo.hide();

/**
/**
* Add classes to correct inherited layout issues in a small context.
*/
$this.parent().addClass('toggle-description-correct-right');
$this.parent().prev('.middleColumn').addClass('toggle-description-correct-middle');
$this.parent().next('.description').addClass('toggle-description-correct-description');
}
});
$this.parent().addClass('toggle-description-correct-right');
$this.parent().prev('.middleColumn').addClass('toggle-description-correct-middle');
$this.parent().next('.description').addClass('toggle-description-correct-description');
}
});

/**
/**
* Custom merge actions for tags and categories
*/
$('.MergeAction').entwine({
onadd() {
const $this = $(this);
$('.MergeAction').entwine({
onadd() {
const $this = $(this);

$this.on('click', 'select', () => false);
$this.on('click', 'select', () => false);

$this.children('button').each((i, button) => {
const $button = $(button);
const $select = $button.prev('select');
$this.children('button').each((i, button) => {
const $button = $(button);
const $select = $button.prev('select');

$button.before(`<input type="hidden" name="${$button.attr('data-target')}" value="${$select.val()}" />`);
});
$button.before(`<input type="hidden" name="${$button.attr('data-target')}" value="${$select.val()}" />`);
});

$this.on('change', 'select', (e) => {
const $target = $(e.target);
$this.on('change', 'select', (e) => {
const $target = $(e.target);

$target.next('input').val($target.val());
});
$target.next('input').val($target.val());
});

$this.children('button, select').hide();
$this.children('button, select').hide();

$this.on('click', '.MergeActionReveal', (e) => {
const $target = $(e.target);
$this.on('click', '.MergeActionReveal', (e) => {
const $target = $(e.target);

$target.parent().children('button, select').show();
$target.hide();
$target.parent().children('button, select').show();
$target.hide();

return false;
});
}
});
return false;
});
}
});

/**
/**
* Customise the cms-panel behaviour for blog sidebar
*
* see LeftAndMain.Panel.js for base behaviour
*/
$('.blog-admin-sidebar.cms-panel').entwine({
MinInnerWidth: 620,
onadd() {
this._super();
this.updateLayout();

// Contract panel if it's open and the left hand column is smaller than the minimum
if (!this.hasClass('collapsed') && ($('.blog-admin-outer').width() < this.getMinInnerWidth())) {
this.collapsePanel();
}

const onresize = () => {
this.updateLayout();
};
onresize.bind(this);

window.onresize = onresize;
},
togglePanel(bool, silent) {
this._super(bool, silent);
this.updateLayout();
},
/**
$('.blog-admin-sidebar.cms-panel').entwine({
MinInnerWidth: 620,
onadd() {
this._super();
this.updateLayout();

// Contract panel if it's open and the left hand column is smaller than the minimum
if (!this.hasClass('collapsed') && ($('.blog-admin-outer').width() < this.getMinInnerWidth())) {
this.collapsePanel();
}

const onresize = () => {
this.updateLayout();
};
onresize.bind(this);

window.onresize = onresize;
},
togglePanel(bool, silent) {
this._super(bool, silent);
this.updateLayout();
},
/**
* Adjust minimum width of content to account for extra panel
*
* @returns {undefined}
*/
updateLayout() {
$(this).css('height', '100%');
const currentHeight = $(this).outerHeight();
const bottomHeight = $('.cms-content-actions').eq(0).outerHeight();
$(this).css('height', `${currentHeight - bottomHeight}px`);
$(this).css('bottom', `${bottomHeight}px`);

$('.cms-container').updateLayoutOptions({
minContentWidth: 820 + this.width()
});
}
});
updateLayout() {
$(this).css('height', '100%');
const currentHeight = $(this).outerHeight();
const bottomHeight = $('.cms-content-actions').eq(0).outerHeight();
$(this).css('height', `${currentHeight - bottomHeight}px`);
$(this).css('bottom', `${bottomHeight}px`);

$('.cms-container').updateLayoutOptions({
minContentWidth: 820 + this.width()
});
}
});
});
20 changes: 10 additions & 10 deletions client/src/bundles/gridfieldaddbydbfield.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import jQuery from 'jquery';

jQuery.entwine('ss', ($) => {
/**
/**
* Prevent the CMS hijacking the return key
*/
$('.add-existing-autocompleter input.text').entwine({
onkeydown(e) {
if (e.which === 13) {
const $parent = $(this).parents('.add-existing-autocompleter');
$parent.find('button[type="submit"]').click();
e.preventDefault();
}
}
});
$('.add-existing-autocompleter input.text').entwine({
onkeydown(e) {
if (e.which === 13) {
const $parent = $(this).parents('.add-existing-autocompleter');
$parent.find('button[type="submit"]').click();
e.preventDefault();
}
}
});
});