[Rt-commit] rt branch, 4.0/ckeditor-escaping, repushed

[Alex Vandiver]

The branch 4.0/ckeditor-escaping was deleted and repushed:
       was b5be510c9ed7d393a3d5c668cce6210713c63067
       now 079047443f623285cf9efb7550b54f599f9604d5

1:  aa1589f ! 1:  1940eba Make CKeditor work with the back button
    @@ -23,12 +23,12 @@
     @@
      % }
      
    - % if ( RT->Config->Get('MessageBoxRichText',  $session{'CurrentUser'})) {
    --    jQuery().ready(function ()  { ReplaceAllTextareas('<%$m->request_args->{'CKeditorEncoded'} || 0 %>') });
    + % if ( $RichText and RT->Config->Get('MessageBoxRichText',  $session{'CurrentUser'})) {
    +-    jQuery().ready(function ()  { ReplaceAllTextareas(<%$DECODED_ARGS->{'CKeditorEncoded'} || 0 |n,j%>) });
     +    jQuery().ready(function ()  { ReplaceAllTextareas() });
      % }
      --></script>
    - 
    + <%ARGS>
     
     diff --git a/share/html/Elements/MessageBox b/share/html/Elements/MessageBox
     --- a/share/html/Elements/MessageBox
    @@ -82,6 +82,6 @@
     +            // Set the type
     +            type.val("text/html");
      
    -             CKEDITOR.replace(textArea.name,{width:'100%',height:'<% RT->Config->Get('MessageBoxRichTextHeight') %>'});
    -             CKEDITOR.basePath = "<%RT->Config->Get('WebPath')%>/NoAuth/RichText/";
    +             CKEDITOR.replace(textArea.name,{width:'100%',height:<% RT->Config->Get('MessageBoxRichTextHeight') |n,j%>});
    +             CKEDITOR.basePath = <%RT->Config->Get('WebPath')|n,j%>+"/NoAuth/RichText/";
     
2:  b5be510 ! 2:  0790474 Make empty-message-detection happen client-side for CKeditor
    @@ -62,12 +62,12 @@
                  // Set the type
                  type.val("text/html");
      
    --            CKEDITOR.replace(textArea.name,{width:'100%',height:'<% RT->Config->Get('MessageBoxRichTextHeight') %>'});
    -+            var editor = CKEDITOR.replace(textArea.name,{width:'100%',height:'<% RT->Config->Get('MessageBoxRichTextHeight') %>'});
    -             CKEDITOR.basePath = "<%RT->Config->Get('WebPath')%>/NoAuth/RichText/";
    +-            CKEDITOR.replace(textArea.name,{width:'100%',height:<% RT->Config->Get('MessageBoxRichTextHeight') |n,j%>});
    ++            var editor = CKEDITOR.replace(textArea.name,{width:'100%',height:<% RT->Config->Get('MessageBoxRichTextHeight') |n,j%>});
    +             CKEDITOR.basePath = <%RT->Config->Get('WebPath')|n,j%>+"/NoAuth/RichText/";
      
     +            // When submitting, clear it out if they didn't change it from the initial sig
    -+            jQuery(window).unload(function(){
    ++            jQuery(textArea).closest('form').submit(function(){
     +                if ( !editor.checkDirty() )
     +                    editor.setData('');
     +            });