Skip to content

Bug fixes #14

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 1 commit into
base: master
Choose a base branch
from
Open

Bug fixes #14

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
64 changes: 44 additions & 20 deletions jquery.textillate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,50 @@
};

// custom get data api method
function getData (node) {
var attrs = node.attributes || []
, data = {};

if (!attrs.length) return data;

$.each(attrs, function (i, attr) {
if (/^data-in-*/.test(attr.nodeName)) {
data.in = data.in || {};
data.in[attr.nodeName.replace(/data-in-/, '')] = attr.nodeValue;
} else if (/^data-out-*/.test(attr.nodeName)) {
data.out = data.out || {};
data.out[attr.nodeName.replace(/data-out-/, '')] = attr.nodeValue;
} else if (/^data-*/.test(attr.nodeName)) {
data[attr.nodeName] = attr.nodeValue;
}
})
function getData (node) {

var data={};
var attrs;

//fixed for nodes
if(node[0])
attrs = node[0].attributes;
else{
attrs = node.attributes
}

$.each(attrs, function (i, attr) {
if (/^data-in-*/.test(attr.nodeName)) {
data.in = data.in || {};
data.in[attr.nodeName.replace(/data-in-/, '')] = args(attr.nodeValue);
} else if (/^data-out-*/.test(attr.nodeName)) {
data.out = data.out || {};
data.out[attr.nodeName.replace(/data-out-/, '')] = args(attr.nodeValue);
} else if (/^data-*/.test(attr.nodeName)) {
data[attr.nodeName] = args(attr.nodeValue);
}
});

return data;
}

//argument parse
function args(arg){
var ret;
if(arg == 'true'){
ret = true;
}
else if(arg == 'false'){
ret = false;
}
else if(!isNaN(arg)){
ret = parseInt(arg);
}
else{
ret = arg;
}
return ret;
}

function shuffle (o) {
for (var j, x, i = o.length; i; j = parseInt(Math.random() * i), x = o[--i], o[i] = o[j], o[j] = x);
Expand Down Expand Up @@ -78,8 +102,8 @@
count -= 1;
if (!count && cb) cb();
}

var delay = options.sync ? options.delay : options.delay * i * options.delayScale;
var delay = options.sync ? options.delay : options.delay * i * options.delayscale;

$this.text() ?
setTimeout(function () { animate($this, options.effect, complete) }, delay) :
Expand Down Expand Up @@ -217,4 +241,4 @@
outEffects: [ 'hinge' ]
};

}(jQuery));
}(jQuery));