Merge up to r3319

5 files changed, 97 insertions, 2 deletions

diff --git a/demos/quickstart/protected/pages/Controls/HtmlArea4.page b/demos/quickstart/protected/pages/Controls/HtmlArea4.page
new file mode 100644
index 00000000..1fa33424
--- /dev/null
+++ b/demos/quickstart/protected/pages/Controls/HtmlArea4.page
@@ -0,0 +1,28 @@
+<com:TContent ID="body" >
+
+<h1>THtmlArea4</h1>
+<com:DocLink ClassPath="System.Web.UI.WebControls.THtmlArea4" />
+
+<p class="block-content">
+<tt>THtmlArea4</tt> is a newer version of the <tt>THtmlArea</tt> component, based on TinyMCE version 4. Please refer to <tt>THtmlArea</tt> for basic usage.
+</p>
+
+<p class="block-content">
+<tt>THtmlArea4</tt> provides the WYSIWYG feature by wrapping the functionalities provided by the <a href="http://tinymce.com/">TinyMCE project version 4</a>.
+</p>
+
+<p class="block-content">
+The default editor tries to mimic <tt>THtmlArea</tt>'s old style and behaviour, disabling the menubar and permitting the resize of the editor in both directions. To enable the menubar or change any other aspect of the editor layout, use the <tt>Options</tt> property to add additional editor options with each options on a new line. See <a href="http://www.tinymce.com/wiki.php/Configuration">TinyMCE website</a> for a complete list of options. The following example displays a menu specific for HTML table manipulation,
+</p>
+<com:TTextHighlighter Language="prado" CssClass="source block-content">
+&lt;com:THtmlArea&gt;
+  &lt;prop:Options&gt;
+    plugins: "table"
+    menubar: "file edit table"
+  &lt;/prop:Options&gt;
+&lt;/com:THtmlArea&gt;
+</com:TTextHighlighter>
+
+<com:RunBar PagePath="Controls.Samples.THtmlArea4.Home" />
+
+</com:TContent>
diff --git a/demos/quickstart/protected/pages/Controls/Samples/TConditional/Home.page b/demos/quickstart/protected/pages/Controls/Samples/TConditional/Home.page
index 7baa16d6..9e37b675 100644
--- a/demos/quickstart/protected/pages/Controls/Samples/TConditional/Home.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TConditional/Home.page
@@ -1,9 +1,9 @@
 <com:TContent ID="body">

 <h1>TConditional Samples</h1>

 

-<com:TConditional Condition="Prado::getVersion()==='3.2.1'">

+<com:TConditional Condition="Prado::getVersion()==='3.2.2'">

 <prop:TrueTemplate>

-  <com:TLabel Text="You are using PRADO 3.2.1" />

+  <com:TLabel Text="You are using PRADO 3.2.2" />

 </prop:TrueTemplate>

 <prop:FalseTemplate>

   <com:TLabel Text="You are using PRADO <%= Prado::getVersion() %>" />

diff --git a/demos/quickstart/protected/pages/Controls/Samples/THtmlArea4/Home.page b/demos/quickstart/protected/pages/Controls/Samples/THtmlArea4/Home.page
new file mode 100755
index 00000000..6bb6449c
--- /dev/null
+++ b/demos/quickstart/protected/pages/Controls/Samples/THtmlArea4/Home.page
@@ -0,0 +1,43 @@
+<com:TContent ID="body">
+
+<h1>THtmlArea4 Samples</h1>
+
+<table class="sampletable">
+
+<tr><td class="samplenote">
+THtmlArea4 with default settings:
+</td><td class="sampleaction">
+<com:THtmlArea4 ID="HtmlArea1" />
+<com:TButton Text="Submit" OnClick="button1Clicked" />
+<br/>
+<com:TLiteral Encode="true" ID="Result1" />
+</td></tr>
+
+<tr><td class="samplenote">
+THtmlArea4 with manually set options
+</td><td class="sampleaction">
+<com:THtmlArea4 ID="HtmlArea2" Width="670px" Height="300px">
+  <prop:Options>
+  	resize: false
+    plugins: "charmap code wordcount"
+    toolbar: "undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | code charmap | ",
+  </prop:Options>
+</com:THtmlArea4>
+<com:TButton Text="Submit" OnClick="button2Clicked" />
+<br/>
+<com:TLiteral Encode="true" ID="Result2" />
+</td></tr>
+
+<tr><td class="samplenote">
+THtmlArea4 with visual editting disabled:
+</td><td class="sampleaction">
+<com:THtmlArea4 ID="HtmlArea3" EnableVisualEdit="false" />
+<br/>
+<com:TButton Text="Submit" OnClick="button3Clicked" />
+<br/>
+<com:TLiteral Encode="true" ID="Result3" />
+</td></tr>
+
+</table>
+
+</com:TContent>
diff --git a/demos/quickstart/protected/pages/Controls/Samples/THtmlArea4/Home.php b/demos/quickstart/protected/pages/Controls/Samples/THtmlArea4/Home.php
new file mode 100755
index 00000000..c513c8f7
--- /dev/null
+++ b/demos/quickstart/protected/pages/Controls/Samples/THtmlArea4/Home.php
@@ -0,0 +1,20 @@
+<?php
+
+class Home extends TPage
+{
+	public function button1Clicked($sender,$param)
+	{
+		$this->Result1->Text="You have entered: ".$this->HtmlArea1->Text;
+	}
+
+	public function button2Clicked($sender,$param)
+	{
+		$this->Result2->Text="You have entered: ".$this->HtmlArea2->Text;
+	}
+
+	public function button3Clicked($sender,$param)
+	{
+		$this->Result3->Text="You have entered: ".$this->HtmlArea3->Text;
+	}
+}
+
diff --git a/demos/quickstart/protected/pages/Controls/Standard.page b/demos/quickstart/protected/pages/Controls/Standard.page
index 188cdd19..463f90a5 100644
--- a/demos/quickstart/protected/pages/Controls/Standard.page
+++ b/demos/quickstart/protected/pages/Controls/Standard.page
@@ -60,6 +60,10 @@
   </li>

 

   <li>

+  <a href="?page=Controls.HtmlArea4">THtmlArea4</a> is the counterpart of THtmlArea based on TinyMCE4.

+  </li>

+

+  <li>

   <a href="?page=Controls.HyperLink">THyperLink</a> represents a hyperlink on a Web page.

   </li>