javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 03:31:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed span for ios. Fixes issue #452.

Browse Source
This commit is contained in:
Nedyalko Nikolov
2015-07-20 15:20:53 +03:00
parent dea2e693c0
commit 1976c28dc1
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
text/formatted-string.ios.ts
View File

@ -21,7 +21,7 @@ export class FormattedString extends formattedStringCommon.FormattedString {
for (p = 0; p < span.spanModifiers.length; p++) { for (p = 0; p < span.spanModifiers.length; p++) {
attrDict.setObjectForKey(span.spanModifiers[p].value, span.spanModifiers[p].key); attrDict.setObjectForKey(span.spanModifiers[p].value, span.spanModifiers[p].key);
} }
var nsAttributedString = NSMutableAttributedString.alloc().initWithStringAttributes(spanText, attrDict); var nsAttributedString = NSMutableAttributedString.alloc().initWithStringAttributes(String(spanText), attrDict);
mas.insertAttributedStringAtIndex(nsAttributedString, spanStart); mas.insertAttributedStringAtIndex(nsAttributedString, spanStart);
spanStart += spanLength; spanStart += spanLength;
} }

14
text/span.ios.ts
View File

@ -22,7 +22,8 @@ export class Span extends spanCommon.Span {
if (realFontFamily) { if (realFontFamily) {
font = UIFont.fontWithNameSize(realFontFamily, realFontSize); font = UIFont.fontWithNameSize(realFontFamily, realFontSize);
} }
else {
if (!font) {
var fontDescriptor = UIFontDescriptor.new(); var fontDescriptor = UIFontDescriptor.new();
var symbolicTraits; var symbolicTraits;
if (realFontAttributes & enums.FontAttributes.Bold) { if (realFontAttributes & enums.FontAttributes.Bold) {
@ -33,12 +34,11 @@ export class Span extends spanCommon.Span {
} }
font = UIFont.fontWithDescriptorSize(fontDescriptor.fontDescriptorWithSymbolicTraits(symbolicTraits), realFontSize); font = UIFont.fontWithDescriptorSize(fontDescriptor.fontDescriptorWithSymbolicTraits(symbolicTraits), realFontSize);
} }
if (font) {
this.spanModifiers.push({ this.spanModifiers.push({
key: NSFontAttributeName, key: NSFontAttributeName,
value: font value: font
}); });
}
} }
var realForegroundColor = this.foregroundColor || var realForegroundColor = this.foregroundColor ||