[Rt-commit] rt branch, 4.2/remove-message-box-wrap, created. rt-4.1.5-59-gd83cd97

[Thomas Sibley]

The branch, 4.2/remove-message-box-wrap has been created
        at  d83cd97ffcc063918f66d35de268e899b6c9c02c (commit)

- Log -----------------------------------------------------------------
commit d83cd97ffcc063918f66d35de268e899b6c9c02c
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Tue Dec 18 10:41:28 2012 -0800

    Remove the $MessageBoxWrap option and always use soft line breaks
    
    Hard wrapping is generally never desired these days, and hard line
    breaks may still be entered manually.  Simplifying the user options
    available is a step in the right direction.

diff --git a/docs/UPGRADING-4.2 b/docs/UPGRADING-4.2
index 43a9305..60954c5 100644
--- a/docs/UPGRADING-4.2
+++ b/docs/UPGRADING-4.2
@@ -22,3 +22,6 @@ UPGRADING FROM RT 4.0.0 and greater
 * MakeClicky handlers added via a callback are now passed an "object" key in
   the parameter hash instead of "ticket".  The object may be any RT::Record
   subclass.
+
+* $MessageBoxWrap was removed.  Wrapping is now always SOFT.  If you want hard
+  line breaks, enter them manually.
diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
index c164d15..3228124 100755
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in
@@ -1481,15 +1481,6 @@ for Rich Text settings.
 Set($MessageBoxWidth, undef);
 Set($MessageBoxHeight, 15);
 
-=item C<$MessageBoxWrap>
-
-Wrapping is disabled when using MessageBoxRichText because of a bad
-interaction between IE and wrapping with the Rich Text Editor.
-
-=cut
-
-Set($MessageBoxWrap, "SOFT");
-
 =item C<$MessageBoxRichText>
 
 Should "rich text" editing be enabled? This option lets your users
diff --git a/lib/RT/Config.pm b/lib/RT/Config.pm
index a4cdef9..e54cecc 100644
--- a/lib/RT/Config.pm
+++ b/lib/RT/Config.pm
@@ -275,17 +275,6 @@ our %META = (
             Description => 'Message box height',          #loc
         },
     },
-    MessageBoxWrap => {
-        Section         => 'Ticket composition',                #loc
-        Overridable     => 1,
-        SortOrder       => 8.1,
-        Widget          => '/Widgets/Form/Select',
-        WidgetArguments => {
-            Description => 'Message box wrapping',   #loc
-            Values => [qw(SOFT HARD)],
-            Hints => "When the WYSIWYG editor is not enabled, this setting determines whether automatic line wraps in the ticket message box are sent to RT or not.",              # loc
-        },
-    },
     DefaultTimeUnitsToHours => {
         Section         => 'Ticket composition', #loc
         Overridable     => 1,
diff --git a/share/html/Elements/MessageBox b/share/html/Elements/MessageBox
index 69227bf..5a17f32 100644
--- a/share/html/Elements/MessageBox
+++ b/share/html/Elements/MessageBox
@@ -68,7 +68,7 @@ if ( $IncludeSignature and my $text = $session{'CurrentUser'}->UserObj->Signatur
 # wrap="something" seems to really break IE + richtext
 my $wrap_type = '';
 if ( not RT->Config->Get('MessageBoxRichText',  $session{'CurrentUser'}) ) {
-    $wrap_type = 'wrap="' . $m->interp->apply_escapes($Wrap, 'h') . '"';
+    $wrap_type = 'wrap="soft"';
 }
 
 # If there's no cols specified, we want to set the width to 100% in CSS
@@ -87,7 +87,6 @@ $Name             => 'Content'
 $Default          => ''
 $Width            => RT->Config->Get('MessageBoxWidth', $session{'CurrentUser'} )
 $Height           => RT->Config->Get('MessageBoxHeight', $session{'CurrentUser'} ) || 15
-$Wrap             => RT->Config->Get('MessageBoxWrap', $session{'CurrentUser'} ) || 'SOFT'
 $IncludeSignature => RT->Config->Get('MessageBoxIncludeSignature');
 $IncludeArticle   => 1;
 </%ARGS>

-----------------------------------------------------------------------