mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-11-18 04:29:22 +00:00
UTF compatible CFData base64 string encoder and decoder. Use it for CPButton key equivalent archiving. Also ordered CPText.j constants by value and removed the empty CPText class definition as it caused errors with nib2cib. Fixed: the key equivalent for forward delete (CPDeleteFunctionKey, \uF728) was transformed to '(' (\u0028) when archived and unarchived.
This commit is contained in:
1 parent
dcec14decd
commit
44555ac724
4 files changed
+43
-14
No files matched your search
+2
-2
@@ -656,7 +656,7 @@ var CPButtonImageKey = @"CPButtonImageKey",
|
||||
[self setImageDimsWhenDisabled:[aCoder decodeObjectForKey:CPButtonImageDimsWhenDisabledKey]];
|
||||
|
||||
if ([aCoder containsValueForKey:CPButtonKeyEquivalentKey])
|
||||
[self setKeyEquivalent:CFData.decodeBase64ToString([aCoder decodeObjectForKey:CPButtonKeyEquivalentKey])];
|
||||
[self setKeyEquivalent:CFData.decodeBase64ToUtf16String([aCoder decodeObjectForKey:CPButtonKeyEquivalentKey])];
|
||||
|
||||
[self setKeyEquivalentModifierMask:[aCoder decodeObjectForKey:CPButtonKeyEquivalentMaskKey]];
|
||||
|
||||
@@ -684,7 +684,7 @@ var CPButtonImageKey = @"CPButtonImageKey",
|
||||
[aCoder encodeObject:[self imageDimsWhenDisabled] forKey:CPButtonImageDimsWhenDisabledKey];
|
||||
|
||||
if (_keyEquivalent)
|
||||
[aCoder encodeObject:CFData.encodeBase64String(_keyEquivalent) forKey:CPButtonKeyEquivalentKey];
|
||||
[aCoder encodeObject:CFData.encodeBase64Utf16String(_keyEquivalent) forKey:CPButtonKeyEquivalentKey];
|
||||
|
||||
[aCoder encodeInt:_keyEquivalentModifierMask forKey:CPButtonKeyEquivalentMaskKey];
|
||||
}
|
||||
|
||||
+4
-11
@@ -22,18 +22,11 @@
|
||||
|
||||
@import "CPView.j"
|
||||
|
||||
CPTabCharacter = "\u0009";
|
||||
CPFormFeedCharacter = "\u000c";
|
||||
CPNewlineCharacter = "\u000a";
|
||||
CPCarriageReturnCharacter = "\u000d";
|
||||
CPEnterCharacter = "\u0003";
|
||||
CPBackspaceCharacter = "\u0008";
|
||||
CPTabCharacter = "\u0009";
|
||||
CPNewlineCharacter = "\u000a";
|
||||
CPFormFeedCharacter = "\u000c";
|
||||
CPCarriageReturnCharacter = "\u000d";
|
||||
CPBackTabCharacter = "\u0019";
|
||||
CPDeleteCharacter = "\u007f";
|
||||
|
||||
/*@implementation CPText : CPView
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
@end*/
|
||||
@@ -227,6 +227,11 @@ CFData.decodeBase64ToString = function(input, strip)
|
||||
return CFData.bytesToString(CFData.decodeBase64ToArray(input, strip));
|
||||
}
|
||||
|
||||
CFData.decodeBase64ToUtf16String = function(input, strip)
|
||||
{
|
||||
return CFData.bytesToUtf16String(CFData.decodeBase64ToArray(input, strip));
|
||||
}
|
||||
|
||||
CFData.bytesToString = function(bytes)
|
||||
{
|
||||
// This is relatively efficient, I think:
|
||||
@@ -242,3 +247,28 @@ CFData.encodeBase64String = function(input)
|
||||
|
||||
return CFData.encodeBase64Array(temp);
|
||||
}
|
||||
|
||||
CFData.bytesToUtf16String = function(bytes)
|
||||
{
|
||||
// Strings are encoded with 16 bits per character.
|
||||
var temp = [];
|
||||
for (var i = 0; i < bytes.length; i+=2)
|
||||
temp.push(bytes[i+1] << 8 | bytes[i]);
|
||||
// This is relatively efficient, I think:
|
||||
return String.fromCharCode.apply(NULL, temp);
|
||||
}
|
||||
|
||||
|
||||
CFData.encodeBase64Utf16String = function(input)
|
||||
{
|
||||
// charCodeAt returns UTF-16.
|
||||
var temp = [];
|
||||
for (var i = 0; i < input.length; i++)
|
||||
{
|
||||
var c = input.charCodeAt(i);
|
||||
temp.push(input.charCodeAt(i) & 0xFF);
|
||||
temp.push((input.charCodeAt(i) & 0xFF00) >> 8);
|
||||
}
|
||||
|
||||
return CFData.encodeBase64Array(temp);
|
||||
}
|
||||
@@ -42,10 +42,16 @@ var base64TestStrings = [
|
||||
{
|
||||
var result = CFData.decodeBase64ToArray(base64TestStrings[i][1]),
|
||||
expected = base64TestStrings[i][0];
|
||||
|
||||
|
||||
for (var j = 0; j < expected.length || j < result.length; j++)
|
||||
[self assert:result[j] equals:expected.charCodeAt(j)];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)test_CFData_encodeUtfString
|
||||
{
|
||||
var utfTest = "\uF728"; // A common key equivalent.
|
||||
[self assert:CFData.decodeBase64ToUtf16String(CFData.encodeBase64Utf16String(utfTest)) equals:utfTest];
|
||||
}
|
||||
|
||||
@end
|
||||
Reference in new issue
Block a user