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

add toggleClass parameter for setClassToggle #421

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add toggleClass parameter for setClassToggle #421

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
35 changes: 26 additions & 9 deletions dev/src/ScrollMagic/Scene/feature-classToggles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
var
_cssClasses,
_cssClassElems = [];
_cssClassElems = [],
_cssClassToggle = false,
_cssClassToggleOnRemove = false;

Scene
.on("destroy.internal", function (e) {
Expand All @@ -20,10 +22,11 @@ Scene
*
* @param {(string|object)} element - A Selector targeting one or more elements or a DOM object that is supposed to be modified.
* @param {string} classes - One or more Classnames (separated by space) that should be added to the element during the scene.
* @param {boolean} toggleClass - Whether to use toggleClass jQuery method, rather than addClass and removeClass
*
* @returns {Scene} Parent object for chaining.
*/
this.setClassToggle = function (element, classes) {
this.setClassToggle = function (element, classes, toggleClass) {
var elems = _util.get.elements(element);
if (elems.length === 0 || !_util.type.String(classes)) {
log(1, "ERROR calling method 'setClassToggle()': Invalid " + (elems.length === 0 ? "element" : "classes") + " supplied.");
Expand All @@ -35,12 +38,19 @@ this.setClassToggle = function (element, classes) {
}
_cssClasses = classes;
_cssClassElems = elems;
Scene.on("enter.internal_class leave.internal_class", function (e) {
var toggle = e.type === "enter" ? _util.addClass : _util.removeClass;
_cssClassElems.forEach(function (elem, key) {
toggle(elem, _cssClasses);
});
});
_cssClassToggle = toggleClass;
Scene.on("enter.internal_class leave.internal_class", function (e) {
var toggle = e.type === "enter" ? _util.addClass : _util.removeClass;
_cssClassElems.forEach(function (elem, key) {
if (_cssClassToggle) {
_util.toggleClass(elem, _cssClasses);
_cssClassToggleOnRemove = !_cssClassToggleOnRemove;
}
else {
toggle(elem, _cssClasses);
}
});
});
return Scene;
};

Expand All @@ -60,11 +70,18 @@ this.setClassToggle = function (element, classes) {
this.removeClassToggle = function (reset) {
if (reset) {
_cssClassElems.forEach(function (elem, key) {
_util.removeClass(elem, _cssClasses);
if (!_cssClassToggle) {
_util.removeClass(elem, _cssClasses);
}
else if (_cssClassToggleOnRemove) {
_util.toggleClass(elem, _cssClasses);
}
});
}
Scene.off("start.internal_class end.internal_class");
_cssClasses = undefined;
_cssClassElems = [];
_cssClassToggle = false;
_cssClassToggleOnRemove = false;
return Scene;
};
8 changes: 8 additions & 0 deletions dev/src/ScrollMagic/_util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,14 @@ var _util = ScrollMagic._util = (function (window) {
elem.className = elem.className.replace(new RegExp('(^|\\b)' + classname.split(' ').join('|') + '(\\b|$)', 'gi'), ' ');
}
};
U.toggleClass = function(elem, classname) {
if (classname) {
if (elem.className.split(/\s+/).indexOf(classname) > -1)
U.removeClass(elem, classname);
else
U.addClass(elem, classname);
}
};
// if options is string -> returns css value
// if options is array -> returns object with css value pairs
// if options is object -> set new css values
Expand Down