Skip to content

Commit

Permalink
functions support multiples params
Browse files Browse the repository at this point in the history
  • Loading branch information
darielnoel committed Sep 10, 2014
1 parent 88bebf1 commit 1befd3d
Show file tree
Hide file tree
Showing 11 changed files with 513 additions and 158 deletions.
4 changes: 4 additions & 0 deletions Gruntfile.js
Expand Up @@ -78,6 +78,10 @@ module.exports = function(grunt) {
{ from: '_helperDefaultIndex', to: '_u' },
{ from: '_animationEndEvent', to: '_v' },
{ from: '_classNamesWhenAnim', to: '_w' },
{ from: 'beArray', to: '_x' },
{ from: '_actionHelper', to: '_y' },
{ from: '_paramsHelper', to: '_z' },
{ from: "Event object missing 'type' property.", to: 'error' },
]
}
}
Expand Down
2 changes: 1 addition & 1 deletion dist/anijs-min.js

Large diffs are not rendered by default.

156 changes: 97 additions & 59 deletions dist/anijs.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/helpers/dom/anijs-helper-dom-min.js

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

26 changes: 12 additions & 14 deletions dist/helpers/dom/anijs-helper-dom.js
Expand Up @@ -27,8 +27,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
* @param {object} animationContext AniJS Animation Context Object
* @param {[string]} params [description]
*/
AniJSDefaultHelper.addClass = function(e, animationContext, target, params) {
AniJSDefaultHelper.makeAction(e, animationContext, target, params, 0);
AniJSDefaultHelper.addClass = function(e, animationContext, params) {
AniJSDefaultHelper.makeAction(e, animationContext, params, 0, e.target);
};

/**
Expand All @@ -39,8 +39,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
* @param {object} animationContext AniJS Animation Context Object
* @param {[string]} params [description] [description]
*/
AniJSDefaultHelper.removeClass = function(e, animationContext, target, params) {
AniJSDefaultHelper.makeAction(e, animationContext, target, params, 1);
AniJSDefaultHelper.removeClass = function(e, animationContext, params) {
AniJSDefaultHelper.makeAction(e, animationContext, params, 1, e.target);
};

/**
Expand All @@ -51,8 +51,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
* @param {object} animationContext AniJS Animation Context Object
* @param {[string]} params [description]
*/
AniJSDefaultHelper.toggleClass = function(e, animationContext, target, params) {
AniJSDefaultHelper.makeAction(e, animationContext, target, params, 2);
AniJSDefaultHelper.toggleClass = function(e, animationContext, params) {
AniJSDefaultHelper.makeAction(e, animationContext, params, 2, e.target);
};

/**
Expand All @@ -63,18 +63,16 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
* @param {object} animationContext AniJS Animation Context Object
* @param {[string]} params [description]
*/
AniJSDefaultHelper.makeAction = function(e, animationContext, target, params, actionID){
//Current elements that will be animated
animationContextBehaviorTargetList = animationContext.behaviorTargetList;
AniJSDefaultHelper.makeAction = function(e, animationContext, params, actionID, target){
if(actionID === 0){
animationContext.nodeHelper.addClass(target, params[1]);
animationContext.nodeHelper.addClass(target, params[0]);
} else if(actionID === 1){
animationContext.nodeHelper.removeClass(target, params[1]);
animationContext.nodeHelper.removeClass(target, params[0]);
} else{
if(animationContext.nodeHelper.hasClass(target, params[1])){
animationContext.nodeHelper.removeClass(target, params[1]);
if(animationContext.nodeHelper.hasClass(target, params[0])){
animationContext.nodeHelper.removeClass(target, params[0]);
}else {
animationContext.nodeHelper.addClass(target, params[1]);
animationContext.nodeHelper.addClass(target, params[0]);
}
}
//Run the animation
Expand Down

0 comments on commit 1befd3d

Please sign in to comment.