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

Allow required elements to be passed as options (React) #488

Closed
wants to merge 5 commits into from
Closed

Allow required elements to be passed as options (React) #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3d11729
Don’t move elements if wrappers are passed
smartmike Nov 11, 2016
26346e3
Merge branch 'master' of github.com:metafizzy/flickity
smartmike Jun 1, 2017
fc92fb9
Merge branch 'master' of github.com:metafizzy/flickity
smartmike Jun 2, 2017
33fc448
Stopped wiping out class names of containers
KittyGiraudel Jun 12, 2017
dcb9572
Merge pull request #2 from HugoGiraudel/feature/containers-classes
smartmike Jun 12, 2017
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
37 changes: 23 additions & 14 deletions dist/flickity.pkgd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1286,9 +1286,9 @@ proto._create = function() {
this.x = 0;
this.velocity = 0;
this.originSide = this.options.rightToLeft ? 'right' : 'left';

// create viewport & slider
this.viewport = document.createElement('div');
this.viewport.className = 'flickity-viewport';
this._createViewport();
this._createSlider();

if ( this.options.resize || this.options.watchCSS ) {
Expand Down Expand Up @@ -1326,11 +1326,14 @@ proto.activate = function() {
}

this.getSize();
// move initial cell elements so they can be loaded as cells
var cellElems = this._filterFindCellElements( this.element.children );
moveElements( cellElems, this.slider );
this.viewport.appendChild( this.slider );
this.element.appendChild( this.viewport );
// only move elements if we haven't defined our own viewport
if (!this.options.viewport && !this.options.slider) {
// move initial cell elements so they can be loaded as cells
var cellElems = this._filterFindCellElements( this.element.children );
moveElements( cellElems, this.slider );
this.viewport.appendChild( this.slider );
this.element.appendChild( this.viewport );
}
// get cells from children
this.reloadCells();

Expand Down Expand Up @@ -1358,11 +1361,15 @@ proto.activate = function() {
this.isInitActivated = true;
};

Flickity.prototype._createViewport = function() {
this.viewport = this.options.viewport || document.createElement('div');
this.viewport.classList.add('flickity-viewport');
};

// slider positions the cells
proto._createSlider = function() {
// slider element does all the positioning
var slider = document.createElement('div');
slider.className = 'flickity-slider';
Flickity.prototype._createSlider = function() {
var slider = this.options.slider || document.createElement('div');
slider.classList.add('flickity-slider');
slider.style[ this.originSide ] = 0;
this.slider = slider;
};
Expand Down Expand Up @@ -1953,9 +1960,11 @@ proto.deactivate = function() {
cell.destroy();
});
this.unselectSelectedSlide();
this.element.removeChild( this.viewport );
// move child elements back into element
moveElements( this.slider.children, this.element );
if (!this.options.viewport && !this.options.slider) {
this.element.removeChild( this.viewport );
// move child elements back into element
moveElements( this.slider.children, this.element );
}
if ( this.options.accessibility ) {
this.element.removeAttribute('tabIndex');
this.element.removeEventListener( 'keydown', this );
Expand Down
Loading