From 31b1b30b9d6bcf843191bb1586143b2406062943 Mon Sep 17 00:00:00 2001
From: Vladimir Enchev <vladimir.enchev@telerik.com>
Date: Thu, 13 Aug 2015 16:26:31 +0300
Subject: [PATCH 1/2] br not handled properly by HtmlView + functional test

Fix for #581
---
 CrossPlatformModules.csproj           | 4 +++-
 apps/ui-tests-app/pages/html-view.ts  | 7 +++++++
 apps/ui-tests-app/pages/html-view.xml | 3 +++
 ui/html-view/html-view.ios.ts         | 1 +
 4 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 apps/ui-tests-app/pages/html-view.ts
 create mode 100644 apps/ui-tests-app/pages/html-view.xml

diff --git a/CrossPlatformModules.csproj b/CrossPlatformModules.csproj
index 749a8f64c..aebafa373 100644
--- a/CrossPlatformModules.csproj
+++ b/CrossPlatformModules.csproj
@@ -150,6 +150,7 @@
     <TypeScriptCompile Include="apps\tests\xml-declaration\inherited-base-page.ts" />
     <TypeScriptCompile Include="apps\tests\xml-declaration\inherited-page.ts" />
     <TypeScriptCompile Include="apps\ui-tests-app\pages\handlers.ts" />
+    <TypeScriptCompile Include="apps\ui-tests-app\pages\html-view.ts" />
     <TypeScriptCompile Include="ui\animation\animation.d.ts" />
     <TypeScriptCompile Include="ui\animation\animation-common.ts">
       <DependentUpon>animation.d.ts</DependentUpon>
@@ -939,6 +940,7 @@
     <Content Include="apps\ui-tests-app\pages\background.xml" />
     <Content Include="apps\ui-tests-app\pages\circle.xml" />
     <Content Include="apps\ui-tests-app\pages\handlers.xml" />
+    <Content Include="apps\ui-tests-app\pages\html-view.xml" />
     <Content Include="apps\ui-tests-app\pages\i86.xml" />
     <Content Include="apps\template-blank\app.css" />
     <Content Include="apps\template-hello-world\app.css" />
@@ -1932,7 +1934,7 @@
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
-      <UserProperties ui_2scroll-view_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2editable-text-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2absolute-layout-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2gallery-app_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2content-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2web-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2linear-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2absolute-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2dock-layout_2package_1json__JSONSchema="" ui_2layouts_2grid-layout_2package_1json__JSONSchema="" ui_2layouts_2wrap-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" />
+      <UserProperties ui_2layouts_2wrap-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2grid-layout_2package_1json__JSONSchema="" ui_2layouts_2dock-layout_2package_1json__JSONSchema="" ui_2layouts_2absolute-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2linear-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2web-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2content-view_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2gallery-app_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2absolute-layout-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2editable-text-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2scroll-view_2package_1json__JSONSchema="http://json.schemastore.org/package" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/apps/ui-tests-app/pages/html-view.ts b/apps/ui-tests-app/pages/html-view.ts
new file mode 100644
index 000000000..608a576ac
--- /dev/null
+++ b/apps/ui-tests-app/pages/html-view.ts
@@ -0,0 +1,7 @@
+import observable = require("data/observable");
+
+export function pageLoaded(args) {
+    var page = args.object;
+
+    page.bindingContext = { html: "one<br>two" };
+}
\ No newline at end of file
diff --git a/apps/ui-tests-app/pages/html-view.xml b/apps/ui-tests-app/pages/html-view.xml
new file mode 100644
index 000000000..967eb5b16
--- /dev/null
+++ b/apps/ui-tests-app/pages/html-view.xml
@@ -0,0 +1,3 @@
+<Page loaded="pageLoaded">
+  <HtmlView html="{{ html }}" />
+</Page>
\ No newline at end of file
diff --git a/ui/html-view/html-view.ios.ts b/ui/html-view/html-view.ios.ts
index b1ede80ef..79001ff2d 100644
--- a/ui/html-view/html-view.ios.ts
+++ b/ui/html-view/html-view.ios.ts
@@ -34,6 +34,7 @@ export class HtmlView extends common.HtmlView {
 
         this._ios = new UILabel();
         this._ios.userInteractionEnabled = true;
+        this._ios.numberOfLines = 0;
     }
 
     get ios(): UILabel {

From 31ad6599294fe2bf9a2e4c7c3c23ea30b2375476 Mon Sep 17 00:00:00 2001
From: Vladimir Enchev <vladimir.enchev@telerik.com>
Date: Thu, 13 Aug 2015 16:28:31 +0300
Subject: [PATCH 2/2] tslint error fixed

---
 apps/ui-tests-app/pages/html-view.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/ui-tests-app/pages/html-view.ts b/apps/ui-tests-app/pages/html-view.ts
index 608a576ac..c0549a9f2 100644
--- a/apps/ui-tests-app/pages/html-view.ts
+++ b/apps/ui-tests-app/pages/html-view.ts
@@ -1,6 +1,4 @@
-import observable = require("data/observable");
-
-export function pageLoaded(args) {
+export function pageLoaded(args) {
     var page = args.object;
 
     page.bindingContext = { html: "one<br>two" };