deblan-mirror/Choices
deblan-mirror/Choices
1
0
Fork 0
mirror of https://github.com/Choices-js/Choices.git synced 2024-05-09 17:16:36 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #209 from maximmig/master

Browse source 
Backup & recover original styles: added test
This commit is contained in:
Josh Johnson 2017-07-18 08:39:01 +01:00 committed by GitHub
parent 23871cc943 d8e8e1ab97
commit a7ee256a85
5 changed files with 40 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
assets/scripts/dist/choices.js vendored
View file

@ -351,11 +351,11 @@ return /******/ (function(modules) { // webpackBootstrap
// Reinstate passed element
this.passedElement.classList.remove(this.config.classNames.input, this.config.classNames.hiddenState);
this.passedElement.removeAttribute('tabindex');
// restore original styles if any
var oldStyle = this.passedElement.getAttribute('data-choices-js-orig-style');
if (Boolean(oldStyle)) {
this.passedElement.removeAttribute('data-choices-js-orig-style');
this.passedElement.setAttribute('style', oldStyle);
// Recover original styles if any
var origStyle = this.passedElement.getAttribute('data-choice-orig-style');
if (Boolean(origStyle)) {
this.passedElement.removeAttribute('data-choice-orig-style');
this.passedElement.setAttribute('style', origStyle);
} else {
this.passedElement.removeAttribute('style');
}
@ -2624,10 +2624,10 @@ return /******/ (function(modules) { // webpackBootstrap
this.passedElement.classList.add(this.config.classNames.input, this.config.classNames.hiddenState);
this.passedElement.tabIndex = '-1';
// persist original styles if any
var oldStyle = this.passedElement.getAttribute('style');
if (Boolean(oldStyle)) {
this.passedElement.setAttribute('data-choices-js-orig-style', oldStyle);
// Backup original styles if any
var origStyle = this.passedElement.getAttribute('style');
if (Boolean(origStyle)) {
this.passedElement.setAttribute('data-choice-orig-style', origStyle);
}
this.passedElement.setAttribute('style', 'display:none;');
this.passedElement.setAttribute('aria-hidden', 'true');

2
assets/scripts/dist/choices.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
assets/scripts/dist/choices.min.js vendored
View file

File diff suppressed because one or more lines are too long

18
assets/scripts/src/choices.js
View file

@ -281,11 +281,11 @@ class Choices {
// Reinstate passed element
this.passedElement.classList.remove(this.config.classNames.input, this.config.classNames.hiddenState);
this.passedElement.removeAttribute('tabindex');
// restore original styles if any
const oldStyle = this.passedElement.getAttribute('data-choices-js-orig-style');
if (Boolean(oldStyle)) {
this.passedElement.removeAttribute('data-choices-js-orig-style');
this.passedElement.setAttribute('style', oldStyle);
// Recover original styles if any
const origStyle = this.passedElement.getAttribute('data-choice-orig-style');
if (Boolean(origStyle)) {
this.passedElement.removeAttribute('data-choice-orig-style');
this.passedElement.setAttribute('style', origStyle);
} else {
this.passedElement.removeAttribute('style');
}
@ -2584,10 +2584,10 @@ class Choices {
);
this.passedElement.tabIndex = '-1';
// persist original styles if any
const oldStyle = this.passedElement.getAttribute('style');
if (Boolean(oldStyle)) {
this.passedElement.setAttribute('data-choices-js-orig-style', oldStyle);
// Backup original styles if any
const origStyle = this.passedElement.getAttribute('style');
if (Boolean(origStyle)) {
this.passedElement.setAttribute('data-choice-orig-style', origStyle);
}
this.passedElement.setAttribute('style', 'display:none;');
this.passedElement.setAttribute('aria-hidden', 'true');

20
tests/spec/choices_spec.js
View file

@ -28,7 +28,7 @@ describe('Choices', () => {
expect(this.choices).toBeDefined();
});
it('should have initalised', function() {
it('should have initialised', function() {
expect(this.choices.initialised).toBe(true);
});
@ -135,6 +135,24 @@ describe('Choices', () => {
it('should create a dropdown', function() {
expect(this.choices.dropdown).toEqual(jasmine.any(HTMLElement));
});
it('should backup and recover original styles', function () {
const origStyle = 'background-color: #ccc; margin: 5px padding: 10px;';
this.choices.destroy();
this.input.setAttribute('style', origStyle);
this.choices = new Choices(this.input);
let style = this.input.getAttribute('data-choice-orig-style');
expect(style).toEqual(origStyle);
this.choices.destroy();
style = this.input.getAttribute('data-choice-orig-style');
expect(style).toBeNull();
style = this.input.getAttribute('style');
expect(style).toEqual(origStyle);
});
});
describe('should accept text inputs', function() {