Merge branch 'od/issue_780' into develop

TackMobile · Jul 4, 2014 · 4526ee7 · 4526ee7
2 parents f22aab6 + 9c286e3
commit 4526ee7
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 16 deletions.
diff --git a/Core/Source/DTHTMLElement.m b/Core/Source/DTHTMLElement.m
@@ -607,6 +607,12 @@ - (BOOL)_parseEdgeInsetsFromStyleDictionary:(NSDictionary *)styles forAttributes
 {
 	DTEdgeInsets edgeInsets = {0,0,0,0};
 
+	// preserve previous values in insets
+	if (intoEdgeInsets)
+	{
+		edgeInsets = *intoEdgeInsets;
+	}
+
 	BOOL didModify = NO;
 
 	if (![styles count])

diff --git a/Demo/Resources/CurrentTest.html b/Demo/Resources/CurrentTest.html
@@ -1,2 +1,3 @@
-<p>An animated GIF:</p>
-<img src="simpson20.gif" />
+<p>TXT-a</p>
+<p style="margin-left:40px">TXT-b</p>
+<p>TXT-c</p>
diff --git a/Test/Source/DTHTMLAttributedStringBuilderTest.m b/Test/Source/DTHTMLAttributedStringBuilderTest.m
@@ -8,12 +8,6 @@
 
 #import "DTHTMLAttributedStringBuilderTest.h"
 
-#import "DTHTMLAttributedStringBuilder.h"
-#import "DTCoreTextConstants.h"
-#import "DTCoreTextParagraphStyle.h"
-#import "DTTextAttachment.h"
-#import "DTCoreText.h"
-
 @implementation DTHTMLAttributedStringBuilderTest
 
 #pragma mark - Utilities

diff --git a/Test/Source/DTHTMLElementTest.m b/Test/Source/DTHTMLElementTest.m
@@ -8,8 +8,6 @@
 
 #import "DTHTMLElementTest.h"
 
-#import "DTHTMLAttributedStringBuilder.h"
-
 @implementation DTHTMLElementTest
 
 - (void)testHTMLAlign
@@ -35,4 +33,29 @@ - (void)testHTMLAlign
 	}];
 }
 
+// issue 780: Applying a style dictionary with both -webkit and normal margin
+- (void)testCombiningWebKitAndNormalMargin
+{
+	DTHTMLElement *element = [[DTHTMLElement alloc] init];
+	element.textScale = 1;
+	element.paragraphStyle = [DTCoreTextParagraphStyle defaultParagraphStyle];
+	CTFontRef font = CTFontCreateWithName(CFSTR("Helvetica"), 20, NULL);
+	element.fontDescriptor = [DTCoreTextFontDescriptor fontDescriptorForCTFont:font];
+	CFRelease(font);
+
+	NSDictionary *styles = @{@"-webkit-margin-after" : @"1em",
+									 @"-webkit-margin-before" : @"1em",
+									 @"-webkit-margin-end" : @"0",
+									 @"-webkit-margin-start" : @"0",
+									 @"display" : @"block",
+									 @"margin-left" : @"40px"};
+
+	[element applyStyleDictionary:styles];
+
+	XCTAssertEqual(element.margins.left, 40, @"Incorrect left margin");
+	XCTAssertEqual(element.margins.right, 0, @"Incorrect right margin");
+	XCTAssertEqual(element.margins.top, 20, @"Incorrect top margin");
+	XCTAssertEqual(element.margins.bottom, 20, @"Incorrect bottom margin");
+}
+
 @end
diff --git a/Test/Source/DTHTMLWriterTest.m b/Test/Source/DTHTMLWriterTest.m
@@ -7,8 +7,6 @@
 //
 
 #import "DTHTMLWriterTest.h"
-#import "DTCoreText.h"
-#import "DTColorFunctions.h"
 
 @implementation DTHTMLWriterTest
 

diff --git a/Test/Source/UIColorHTMLTest.m b/Test/Source/UIColorHTMLTest.m
@@ -6,10 +6,7 @@
 //  Copyright 2011 Drobnik.com. All rights reserved.
 //
 
-#import "DTCoreText.h"
 #import "UIColorHTMLTest.h"
-#import "DTCoreText.h"
-#import "DTColorFunctions.h"
 
 @implementation UIColorHTMLTest
 

diff --git a/Test/UnitTest-Prefix.pch b/Test/UnitTest-Prefix.pch
@@ -6,5 +6,5 @@
 	#import <Foundation/Foundation.h>
 	#import <UIKit/UIKit.h>
 	#import <XCTest/XCTest.h>
-	#import <CoreText/CoreText.h>
+	#import "DTCoreText.h"
 #endif