Merge branch '4.2' into 4.3

code/model/recipients/UserDefinedForm_EmailRecipient.php

@@ -261,10 +261,7 @@ class UserDefinedForm_EmailRecipient extends DataObject
                 ->addExtraClass('toggle-html-only'),
             TextareaField::create('EmailBody', _t('UserDefinedForm.EMAILBODY', 'Body'))
                 ->addExtraClass('toggle-plain-only'),
-            LiteralField::create(
+            LiteralField::create('EmailPreview', $preview)
-                'EmailPreview',
-                '<div id="EmailPreview" class="field toggle-html-only">' . $preview . '</div>'
-            )
         ));
 
         $fields->fieldByName('Root.EmailContent')->setTitle(_t('UserDefinedForm_EmailRecipient.EMAILCONTENTTAB', 'Email Content'));
@@ -420,7 +417,10 @@ class UserDefinedForm_EmailRecipient extends DataObject
      */
     public function getEmailBodyContent()
     {
-        return $this->SendPlain ? $this->EmailBody : $this->EmailBodyHtml;
+        if ($this->SendPlain) {
+            return DBField::create_field('HTMLText', $this->EmailBody)->NoHTML();
+        }
+        return DBField::create_field('HTMLText', $this->EmailBodyHtml)->RAW();
     }
 
     /**

css/UserForm_cms.css

@@ -1,14 +1,6 @@
 /**
  * Animations
  */
-@keyframes rowSlide {
-  0% {
-    top: 20%;
-  }
-  100% {
-    top: 80%;
-  }
-}
 @keyframes flashBackground {
   0% {
     background-color: white;
@@ -42,10 +34,6 @@
 .cms .uf-field-editor table.ss-gridfield-table .ss-gridfield-item .handle {
   min-height: 46px;
 }
-.cms .uf-field-editor table.ss-gridfield-table .ss-gridfield-item.newField {
-  position: fixed;
-  animation: rowSlide .5s ease forwards;
-}
 .cms .uf-field-editor table.ss-gridfield-table .ss-gridfield-item.flashBackground {
   animation: flashBackground 2s linear;
 }

javascript/FieldEditor.js

@@ -92,19 +92,11 @@
 							$newField.find('.col-Title input').focus();
 						}
 
-						// animate the row positioning (add the first class)
+						$newField.addClass('flashBackground');
-						if (document.createElement('div').style.animationName !== void 0) {
+						$(".cms-content-fields").scrollTop($(".cms-content-fields")[0].scrollHeight);
-							$newField.addClass('newField');
+						if($groupEnd) {
+							$groupEnd.css('visibility', 'visible');
 						}
-
-						// Once the animation has completed
-						setTimeout(function () {
-							$newField.removeClass('newField').addClass('flashBackground');
-							$(".cms-content-fields").scrollTop($(".cms-content-fields")[0].scrollHeight);
-							if($groupEnd) {
-								$groupEnd.css('visibility', 'visible');
-							}
-						}, 500);
 					});
 				});
 			},

javascript/Recipient.js

@@ -5,12 +5,11 @@
 (function ($) {
 	$(document).ready(function () {
 
+        var sendPlain = $('input[name="SendPlain"]');
 		var recipient = {
 			// Some fields are only visible when HTML email are being sent.
 			updateFormatSpecificFields: function () {
-				var sendPlainChecked = $('#SendPlain')
+				var sendPlainChecked = sendPlain.is(':checked');
-					.find('input[type="checkbox"]')
-					.is(':checked');
 
 				$(".field.toggle-html-only")[sendPlainChecked ? 'hide' : 'show']();
 				$(".field.toggle-plain-only")[sendPlainChecked ? 'show' : 'hide']();
@@ -27,7 +26,7 @@
 				}
 			});
 
-			$('#SendPlain').entwine({
+			sendPlain.entwine({
 				onchange: function () {
 					recipient.updateFormatSpecificFields();
 				}

scss/UserForm_cms.scss

@@ -2,11 +2,6 @@
  * Animations
  */
 
-@keyframes rowSlide {
-	0% {top: 20%;}
-	100% {top: 80%;}
-}
-
 @keyframes flashBackground {
 	0% {background-color: white;}
 	10% {background-color: #dcfedd;}
@@ -44,11 +39,6 @@
 					min-height: 46px;
 				}
 
-				&.newField {
-					position: fixed;
-					animation: rowSlide .5s ease forwards;
-				}
-
 				&.flashBackground {
 					animation: flashBackground 2s linear;
 				}

tests/model/recipients/UserDefinedForm_EmailRecipientTest.php

@@ -0,0 +1,24 @@
+<?php
+
+class UserDefinedForm_EmailRecipientTest extends SapphireTest
+{
+    protected static $fixture_file = 'UserDefinedForm_EmailRecipientTest.yml';
+
+    public function testShortcodesAreRenderedInEmailPreviewContent()
+    {
+        $page = $this->objFromFixture('SiteTree', 'about_us');
+
+        $recipient = UserDefinedForm_EmailRecipient::create();
+        $recipient->SendPlain = false;
+        $recipient->EmailBodyHtml = '<p>Some email content. About us: [sitetree_link,id=' . $page->ID . '].</p>';
+
+        $result = $recipient->getEmailBodyContent();
+        $this->assertContains('/about-us/', $result);
+
+        $recipient->SendPlain = true;
+        $recipient->EmailBody = 'Some email content. About us: [sitetree_link,id=' . $page->ID . '].';
+
+        $result = $recipient->getEmailBodyContent();
+        $this->assertContains('/about-us/', $result);
+    }
+}

tests/model/recipients/UserDefinedForm_EmailRecipientTest.yml

@@ -0,0 +1,4 @@
+SiteTree:
+  about_us:
+    Title: About Us
+    URLSegment: about-us