[Rt-commit] rt branch, 4.2/message-box-type, repushed

[? sunnavy]

The branch 4.2/message-box-type was deleted and repushed:
       was e2bdb73a57166af38f24ece0eb34afe7d3e2582c
       now c1c91d2a1d65153a555a52698660f9db85670149

-:  ------- > 1:  0161dbb allow to include js files from directories other than /static/js
1:  e2bdb73 ! 2:  c1c91d2 add $Type to %ARGS so we can specify the type of the textarea in the caller
    @@ -3,8 +3,8 @@
         add $Type to %ARGS so we can specify the type of the textarea in the caller
         
         by default, the type is controlled by the system config($MessageBoxRichText)
    -    and user perferences. however, sometimes we want to explicitly set the type no
    -    matter what system config or the user perference is.
    +    and user preferences. however, sometimes we want to explicitly set the type no
    +    matter what system config or the user preference is.
         
         this is initially for the IPs and Addresses textareas in RTIR's ScriptedAction
         tool page(/RTIR/Tools/ScriptedAction.html), where rich texts are not useful at
    @@ -32,19 +32,6 @@
      }
      
      =head2 ClearSquished
    -
    -diff --git a/lib/RT/Squish/JS.pm b/lib/RT/Squish/JS.pm
    ---- a/lib/RT/Squish/JS.pm
    -+++ b/lib/RT/Squish/JS.pm
    -@@
    -     my $content = "";
    - 
    -     for my $file ( RT::Interface::Web->JSFiles ) {
    --        my $uri = "/static/js/$file";
    -+        my $uri = $file =~ m{^/} ? $file : "/static/js/$file";
    -         my $res = RT::Interface::Web::Handler->GetStatic($uri);
    - 
    -         if ($res->is_success) {
     
     diff --git a/share/html/Elements/HeaderJavascript b/share/html/Elements/HeaderJavascript
     --- a/share/html/Elements/HeaderJavascript
    @@ -74,12 +61,6 @@
      <%INIT>
      
      my @js_files;
    - if ( RT->Config->Get('DevelMode') ) {
    --    @js_files = map { "/static/js/$_" } RT::Interface::Web->JSFiles();
    -+    @js_files = map { $_ =~ m{^/} ? $_ : "/static/js/$_" } RT::Interface::Web->JSFiles();
    - }
    - else {
    -     my $key = RT::Interface::Web::SquishedJS()->Key;
     
     diff --git a/share/html/Elements/MessageBox b/share/html/Elements/MessageBox
     --- a/share/html/Elements/MessageBox
    @@ -102,7 +83,6 @@
      <%INIT>
      
     -my $type = RT->Config->Get('MessageBoxRichText',  $session{'CurrentUser'}) ? 'text/html' : 'text/plain';
    -+$Type ||= RT->Config->Get('MessageBoxRichText',  $session{'CurrentUser'}) ? 'text/html' : 'text/plain';
      my $message = '';
      
      if ( $QuoteTransaction ) {