Skip to content

Make cleaner #241

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Make cleaner #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
682076c
shortened a little bit
Jan 23, 2018
4326dcf
made a little bit cleaner
Jan 23, 2018
663bd7f
Update package.json
Jan 23, 2018
3f0d56d
Delete package-lock.json
Jan 23, 2018
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
34 changes: 12 additions & 22 deletions parallax.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,9 @@

var positions = (this.position + '').toLowerCase().match(/\S+/g) || [];

if (positions.length < 1) {
positions.push('center');
}
if (positions.length == 1) {
positions.push(positions[0]);
}
if (positions.length < 1) positions.push('center');

if (positions.length == 1) positions.push(positions[0]);

if (positions[0] == 'top' || positions[0] == 'bottom' || positions[1] == 'left' || positions[1] == 'right') {
positions = [positions[1], positions[0]];
Expand All @@ -71,19 +68,15 @@
self.positionY = positions[1];

if (this.positionX != 'left' && this.positionX != 'right') {
if (isNaN(parseInt(this.positionX))) {
this.positionX = 'center';
} else {
this.positionX = parseInt(this.positionX);
}
isNaN(parseInt(this.positionX)) ?
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all of this can be in one line.

this.positionX = 'center' :
this.positionX = parseInt(this.positionX);
}

if (this.positionY != 'top' && this.positionY != 'bottom') {
if (isNaN(parseInt(this.positionY))) {
this.positionY = 'center';
} else {
this.positionY = parseInt(this.positionY);
}
isNaN(parseInt(this.positionY)) ?
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above

this.positionY = 'center' :
this.positionY = parseInt(this.positionY);
}

this.position =
Expand Down Expand Up @@ -120,7 +113,7 @@
if (slider.length == 0)
this.$slider = $('<img />').prependTo(this.$mirror);
else {
this.$slider = slider.prependTo(this.$mirror)
this.$slider = slider.prependTo(this.$mirror);
sliderExisted = true;
}

Expand Down Expand Up @@ -379,12 +372,9 @@
{
$.extend($this.data('px.parallax'), options);
}

if (typeof option == 'string') {
if(option == 'destroy'){
Parallax.destroy(this);
}else{
Parallax[option]();
}
option == 'destroy' ? Parallax.destroy(this) : Parallax[option]();
}
});
}
Expand Down
2 changes: 1 addition & 1 deletion parallax.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.