Skip to content

Commit 60c7919

Browse files
committed
improve Ember.js compatibility
references madrobby#462
1 parent ade7931 commit 60c7919

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

src/data.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66

77
;(function($) {
88
var data = {}, dataAttr = $.fn.data, camelize = $.zepto.camelize,
9-
uuid = $.uuid = +new Date(),
10-
exp = $.expando = 'Zepto' + uuid
9+
exp = $.expando = 'Zepto' + (+new Date())
1110

1211
// Get value from node:
1312
// 1. first try key as given,
@@ -28,7 +27,7 @@
2827

2928
// Store value under camelized key on node
3029
function setData(node, name, value) {
31-
var id = node[exp] || (node[exp] = ++uuid),
30+
var id = node[exp] || (node[exp] = ++$.uuid),
3231
store = data[id] || (data[id] = attributeData(node))
3332
if (name !== undefined) store[camelize(name)] = value
3433
return store

src/zepto.js

+6
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,11 @@ var Zepto = (function() {
211211
return emptyArray.indexOf.call(array, elem, i)
212212
}
213213

214+
$.trim = function(str) { return str.trim() }
215+
216+
// plugin compatibility
217+
$.uuid = 0
218+
214219
$.map = function(elements, callback){
215220
var value, values = [], i, key
216221
if (likeArray(elements))
@@ -267,6 +272,7 @@ var Zepto = (function() {
267272
get: function(idx){
268273
return idx === undefined ? slice.call(this) : this[idx]
269274
},
275+
toArray: function(){ return this.get() },
270276
size: function(){
271277
return this.length
272278
},

0 commit comments

Comments
 (0)