colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-08-28 22:47:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

SortUsingDescriptors: Using the selector in the descriptor instead of always using compare:

Browse Source
This commit is contained in:
Martin Carlberg
2012-06-08 19:48:39 +02:00
parent dc30092b60
commit d7ff93f7f2
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Foundation/CPArray/CPMutableArray.j
+7 -5
View File
@@ -340,7 +340,7 @@
while (i--)
{
var d = [descriptors objectAtIndex:i];
[jsDescriptors addObject:{ "k": [d key], "a": [d ascending]}];
[jsDescriptors addObject:{ "k": [d key], "a": [d ascending], "s": [d selector]}];
}
sortArrayUsingJSDescriptors(self, jsDescriptors);
}
@@ -460,7 +460,8 @@ var sortArrayUsingJSDescriptors = function sortArrayUsingJSDescriptors(a, d)
cn,
aUID,
bUID,
key;
key,
dd;
if (dl < 0)
return;
@@ -511,9 +512,10 @@ var sortArrayUsingJSDescriptors = function sortArrayUsingJSDescriptors(a, d)
cn = dl;
do
{
key = d[cn].k;
o = [C1[key] compare:C2[key]];
if (o && !d[cn].a)
dd = d[cn];
key = dd.k;
o = objj_msgSend(C1[key], dd.s, C2[key]);
if (o && !dd.a)
o = -o;
} while (cn-- && o == CPOrderedSame)
if (o >= 0)