Skip to content

Commit

Permalink
Fix, the $addClass and $toggleClass bugs.
Browse files Browse the repository at this point in the history
  • Loading branch information
@darielnoel
darielnoel committed Sep 8, 2014
1 parent 1491728 commit 88bebf1
Show file tree
Hide file tree
Showing 9 changed files with 43 additions and 49 deletions.
2 changes: 1 addition & 1 deletion bower.json
View file
@@ -1,6 +1,6 @@
{
"name": "AniJS",
"version": "0.7.0",
"version": "0.7.1",
"homepage": "http://anijs.github.io/",
"description": "Declarative handling library for CSS animations.",
"main": "dist/anijs-min.js",
Expand Down
2 changes: 1 addition & 1 deletion component.json
View file
@@ -1,6 +1,6 @@
{
"name": "anijs",
"version": "0.7.0",
"version": "0.7.1",
"main": "dist/anijs.js",
"scripts": [
"dist/anijs.js"
Expand Down
2 changes: 1 addition & 1 deletion dist/anijs-min.js
View file

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions dist/anijs.js
View file
Expand Up @@ -380,7 +380,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
after = selfish._afterHelper(element, aniJSParsedSentence);

if (selfish._classNamesWhenAnim !== '') {
behavior += selfish._classNamesWhenAnim;
if(!Array.isArray(behavior))
behavior += selfish._classNamesWhenAnim;
}

//Creo un nuevo animation context
Expand Down Expand Up @@ -796,7 +797,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
var instance = animationContextInstance,
after = instance.after,
e = {};
behavior[0](e, animationContextInstance, behavior);
behavior[0](e, animationContextInstance, target, behavior);
if(selfish.Util.isFunction(after)){
after(e, animationContextInstance);
}
Expand Down
2 changes: 1 addition & 1 deletion dist/helpers/dom/anijs-helper-dom-min.js
View file

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

36 changes: 16 additions & 20 deletions dist/helpers/dom/anijs-helper-dom.js
View file
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, params) {
AniJSDefaultHelper.makeAction(e, animationContext, params, 0);
AniJSDefaultHelper.addClass = function(e, animationContext, target, params) {
AniJSDefaultHelper.makeAction(e, animationContext, target, params, 0);
};

/**
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, params) {
AniJSDefaultHelper.makeAction(e, animationContext, params, 1);
AniJSDefaultHelper.removeClass = function(e, animationContext, target, params) {
AniJSDefaultHelper.makeAction(e, animationContext, target, params, 1);
};

/**
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, params) {
AniJSDefaultHelper.makeAction(e, animationContext, params, 2);
AniJSDefaultHelper.toggleClass = function(e, animationContext, target, params) {
AniJSDefaultHelper.makeAction(e, animationContext, target, params, 2);
};

/**
Expand All @@ -63,22 +63,18 @@ 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, params, actionID){
AniJSDefaultHelper.makeAction = function(e, animationContext, target, params, actionID){
//Current elements that will be animated
animationContextBehaviorTargetList = animationContext.behaviorTargetList;

for (var i = 0; i < animationContextBehaviorTargetList.length; i++) {
element = animationContextBehaviorTargetList[i];
if(actionID === 0){
animationContext.nodeHelper.addClass(element, params[1]);
} else if(actionID === 1){
animationContext.nodeHelper.removeClass(element, params[1]);
} else{
if(animationContext.nodeHelper.hasClass(element, params[1])){
animationContext.nodeHelper.removeClass(element, params[1]);
}else {
animationContext.nodeHelper.addClass(element, params[1]);
}
if(actionID === 0){
animationContext.nodeHelper.addClass(target, params[1]);
} else if(actionID === 1){
animationContext.nodeHelper.removeClass(target, params[1]);
} else{
if(animationContext.nodeHelper.hasClass(target, params[1])){
animationContext.nodeHelper.removeClass(target, params[1]);
}else {
animationContext.nodeHelper.addClass(target, params[1]);
}
}
//Run the animation
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
@@ -1,6 +1,6 @@
{
"name": "AniJS",
"version": "0.7.0",
"version": "0.7.1",
"devDependencies": {
"grunt": "~0.4.2",
"grunt-contrib-copy": "~0.5.0",
Expand Down
5 changes: 3 additions & 2 deletions src/anijs.js
View file
Expand Up @@ -380,7 +380,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
after = selfish._afterHelper(element, aniJSParsedSentence);

if (selfish._classNamesWhenAnim !== '') {
behavior += selfish._classNamesWhenAnim;
if(!Array.isArray(behavior))
behavior += selfish._classNamesWhenAnim;
}

//Creo un nuevo animation context
Expand Down Expand Up @@ -796,7 +797,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
var instance = animationContextInstance,
after = instance.after,
e = {};
behavior[0](e, animationContextInstance, behavior);
behavior[0](e, animationContextInstance, target, behavior);
if(selfish.Util.isFunction(after)){
after(e, animationContextInstance);
}
Expand Down
36 changes: 16 additions & 20 deletions src/helpers/dom/anijs-helper-dom.js
View file
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, params) {
AniJSDefaultHelper.makeAction(e, animationContext, params, 0);
AniJSDefaultHelper.addClass = function(e, animationContext, target, params) {
AniJSDefaultHelper.makeAction(e, animationContext, target, params, 0);
};

/**
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, params) {
AniJSDefaultHelper.makeAction(e, animationContext, params, 1);
AniJSDefaultHelper.removeClass = function(e, animationContext, target, params) {
AniJSDefaultHelper.makeAction(e, animationContext, target, params, 1);
};

/**
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, params) {
AniJSDefaultHelper.makeAction(e, animationContext, params, 2);
AniJSDefaultHelper.toggleClass = function(e, animationContext, target, params) {
AniJSDefaultHelper.makeAction(e, animationContext, target, params, 2);
};

/**
Expand All @@ -63,22 +63,18 @@ 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, params, actionID){
AniJSDefaultHelper.makeAction = function(e, animationContext, target, params, actionID){
//Current elements that will be animated
animationContextBehaviorTargetList = animationContext.behaviorTargetList;

for (var i = 0; i < animationContextBehaviorTargetList.length; i++) {
element = animationContextBehaviorTargetList[i];
if(actionID === 0){
animationContext.nodeHelper.addClass(element, params[1]);
} else if(actionID === 1){
animationContext.nodeHelper.removeClass(element, params[1]);
} else{
if(animationContext.nodeHelper.hasClass(element, params[1])){
animationContext.nodeHelper.removeClass(element, params[1]);
}else {
animationContext.nodeHelper.addClass(element, params[1]);
}
if(actionID === 0){
animationContext.nodeHelper.addClass(target, params[1]);
} else if(actionID === 1){
animationContext.nodeHelper.removeClass(target, params[1]);
} else{
if(animationContext.nodeHelper.hasClass(target, params[1])){
animationContext.nodeHelper.removeClass(target, params[1]);
}else {
animationContext.nodeHelper.addClass(target, params[1]);
}
}
//Run the animation
Expand Down

0 comments on commit 88bebf1

Please sign in to comment.