Skip to content

Commit

Permalink
remove tabs, rename compat to polyfill, prep v0.5
Browse files Browse the repository at this point in the history
  • Loading branch information
madrobby committed Mar 1, 2011
1 parent 4951154 commit 9c4af7f
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
require 'rake'
require 'rake/packagetask'

ZEPTO_VERSION = "0.4"
ZEPTO_VERSION = "0.5"

ZEPTO_ROOT = File.expand_path(File.dirname(__FILE__))
ZEPTO_SRC_DIR = File.join(ZEPTO_ROOT, 'src')
ZEPTO_DIST_DIR = File.join(ZEPTO_ROOT, 'dist')
ZEPTO_PKG_DIR = File.join(ZEPTO_ROOT, 'pkg')

ZEPTO_FILES = [
File.join(ZEPTO_SRC_DIR,'compat.js'),
File.join(ZEPTO_SRC_DIR,'polyfill.js'),
File.join(ZEPTO_SRC_DIR,'zepto.js'),
File.join(ZEPTO_SRC_DIR,'event.js'),
File.join(ZEPTO_SRC_DIR,'detect.js'),
Expand Down
4 changes: 2 additions & 2 deletions src/fx.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
for (key in properties)
if (key === 'opacity') opacity = properties[key];
else transforms.push(key + '(' + properties[key] + ')');

typeof callback == 'function' && this.one('webkitTransitionEnd', callback);

return this.css({
'-webkit-transition': 'all ' + (duration !== undefined ? duration : 0.5) + 's ' + (ease || ''),
'-webkit-transform': transforms.join(' '),
Expand Down
File renamed without changes.
18 changes: 9 additions & 9 deletions src/zepto.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,16 @@ var Zepto = (function() {
not: function(selector){
var nodes=[];
if (typeof selector == 'function' && selector.call !== undefined){
this.each(function(idx){
if (!selector.call(this,idx)) nodes.push(this);
});
this.each(function(idx){
if (!selector.call(this,idx)) nodes.push(this);
});
}else{
var ignores=slice.call(typeof selector === "string" ?
this.filter(selector) :
selector instanceof NodeList ? selector : $(selector));
slice.call(this).forEach(function(el){
if (ignores.indexOf(el) < 0) nodes.push(el);
});
var ignores=slice.call(typeof selector === "string" ?
this.filter(selector) :
selector instanceof NodeList ? selector : $(selector));
slice.call(this).forEach(function(el){
if (ignores.indexOf(el) < 0) nodes.push(el);
});
}
return $(nodes);
},
Expand Down
8 changes: 4 additions & 4 deletions test/fx.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ <h1>Zepto FX unit tests</h1>
}, 0);
t.assertEqual('0s', $('#durationtest_2').get(0).style.webkitTransitionDuration);
},

testCallback: function(t){
t.pause();
var duration = 250; //Milliseconds
Expand All @@ -58,12 +58,12 @@ <h1>Zepto FX unit tests</h1>
translate3d: '100px, 100px, 100px',
rotateZ: '90deg',
opacity: 0.5
}, duration / 1000, 'linear',
}, duration / 1000, 'linear',
function(){
t.resume(
function(){
function(){
this.assert((new Date().getTime() - start) >= duration);
});
});
});
}
});
Expand Down

0 comments on commit 9c4af7f

Please sign in to comment.