Skip to content

Commit 224d758

Browse files
committed
fix for #21 default js sort is alpha-numeric
1 parent ed1e09a commit 224d758

File tree

3 files changed

+16
-8
lines changed

3 files changed

+16
-8
lines changed

dist/splitting.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,11 @@ function detectGrid(el, options, side) {
344344
(c[val] || (c[val] = [])).push(w);
345345
});
346346

347-
return Object.keys(c).map(Number).sort().map(selectFrom(c));
347+
return Object.keys(c).map(Number).sort(byNumber).map(selectFrom(c));
348+
}
349+
350+
function byNumber(a, b) {
351+
return a - b;
348352
}
349353

350354
var linePlugin = createPlugin(

dist/splitting.min.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ var n=e(t.by||h(a,"splitting")||y),l=function(n,t){for(var e in t)n[e]=t[e]
2525
return n}({},t)
2626
return g(n,function(n){if(n.split){var t=n.by,e=(f?"-"+f:"")+n.key,r=n.split(a,l,s)
2727
e&&(i=a,c=(o="--"+e)+"-index",g(u=r,function(n,t){Array.isArray(n)?g(n,function(n){d(n,c,t)}):d(n,c,t)}),d(i,o+"-total",u.length)),s[t]=r,a.classList.add(t)}var i,u,o,c}),a.classList.add("splitting"),s})}function N(n,t,e){var r=m(t.matching||n.children,n),i={}
28-
return g(r,function(n){var t=Math.round(n[e]);(i[t]||(i[t]=[])).push(n)}),Object.keys(i).map(Number).sort().map(c(i))}b.html=function(n){var t=(n=n||{}).target=p()
28+
return g(r,function(n){var t=Math.round(n[e]);(i[t]||(i[t]=[])).push(n)}),Object.keys(i).map(Number).sort(x).map(c(i))}function x(n,t){return n-t}b.html=function(n){var t=(n=n||{}).target=p()
2929
return t.innerHTML=n.content,b(n),t.outerHTML},b.add=t
30-
var x=n("lines",[i],"line",function(n,t,e){return N(n,{matching:e[i]},"offsetTop")}),T=n("items",s,"item",function(n,t){return m(t.matching||n.children,n)}),L=n("rows",s,"row",function(n,t){return N(n,t,"offsetTop")}),k=n("cols",s,"col",function(n,t){return N(n,t,"offsetLeft")}),A=n("grid",["rows","cols"]),C="layout",M=n(C,s,s,function(n,t){var e=t.rows=+(t.rows||h(n,"rows")||1),r=t.columns=+(t.columns||h(n,"columns")||1)
30+
var T=n("lines",[i],"line",function(n,t,e){return N(n,{matching:e[i]},"offsetTop")}),L=n("items",s,"item",function(n,t){return m(t.matching||n.children,n)}),k=n("rows",s,"row",function(n,t){return N(n,t,"offsetTop")}),A=n("cols",s,"col",function(n,t){return N(n,t,"offsetLeft")}),C=n("grid",["rows","cols"]),M="layout",S=n(M,s,s,function(n,t){var e=t.rows=+(t.rows||h(n,"rows")||1),r=t.columns=+(t.columns||h(n,"columns")||1)
3131
if(t.image=t.image||h(n,"image")||n.currentSrc||n.src,t.image){var i=m("img",n)[0]
3232
t.image=i&&(i.currentSrc||i.src)}t.image&&d(n,"background-image","url("+t.image+")")
3333
for(var u=e*r,o=[],c=p(s,"cell-grid");u--;){var a=p(c,"cell")
34-
p(a,"cell-inner"),o.push(a)}return f(n,c),o}),S=n("cellRows",[C],"row",function(n,t,e){var r=t.rows,i=o(r)
35-
return g(e[C],function(n,t,e){i[Math.floor(t/(e.length/r))].push(n)}),i}),H=n("cellColumns",[C],"col",function(n,t,e){var r=t.columns,i=o(r)
36-
return g(e[C],function(n,t){i[t%r].push(n)}),i}),O=n("cells",["cellRows","cellColumns"],"cell",function(n,t,e){return e[C]})
37-
return t(r),t(w),t(x),t(T),t(L),t(k),t(A),t(M),t(S),t(H),t(O),b})
34+
p(a,"cell-inner"),o.push(a)}return f(n,c),o}),H=n("cellRows",[M],"row",function(n,t,e){var r=t.rows,i=o(r)
35+
return g(e[M],function(n,t,e){i[Math.floor(t/(e.length/r))].push(n)}),i}),O=n("cellColumns",[M],"col",function(n,t,e){var r=t.columns,i=o(r)
36+
return g(e[M],function(n,t){i[t%r].push(n)}),i}),j=n("cells",["cellRows","cellColumns"],"cell",function(n,t,e){return e[M]})
37+
return t(r),t(w),t(T),t(L),t(k),t(A),t(C),t(S),t(H),t(O),t(j),b})

src/utils/detect-grid.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,9 @@ export function detectGrid(el, options, side) {
1010
(c[val] || (c[val] = [])).push(w);
1111
});
1212

13-
return Object.keys(c).map(Number).sort().map(selectFrom(c));
13+
return Object.keys(c).map(Number).sort(byNumber).map(selectFrom(c));
1414
}
15+
16+
function byNumber(a, b) {
17+
return a - b;
18+
}

0 commit comments

Comments
 (0)