Changeset 1978 for FCKeditor/trunk


Ignore:
Timestamp:
05/09/2008 06:21:46 PM (7 years ago)
Author:
fredck
Message:

Fixed #1239 and #2185 : No semicolon is appended after closing curly brackets it followed by "finally", "while", "'", ";" or ")".

File:
1 edited

Legend:

Unmodified
Added
Removed
  • FCKeditor/trunk/_dev/releaser/fckreleaser.php

    r1565 r1978  
    1 #!/usr/bin/php -q
     1#!/usr/bin/php -q
    22<?php
    33/*
     
    128128class FCKReleaser
    129129{
    130         var $_PreProcessExtensions = array( 'js','html','asp','aspx','cfc','cfm','jsp','css','xml','txt','java','php','cgi','pl','lasso','py' ) ;
     130        var $_PreProcessExtensions = array( 'js','html','asp','aspx','ascx','cfc','cfm','jsp','css','xml','txt','java','php','cgi','pl','lasso','py','config' ) ;
    131131
    132132        var $SourcesDir ;
     
    627627                        ' ', $script ) ;
    628628
    629                 // Concatenate lines that end with "}" using a ";" (except for "else" and "catch" cases).
     629                // Concatenate lines that end with "}" using a ";", except for "else",
     630                // "while", "catch" and "finally" cases, or when followed by, "'", ";",
     631                // "}" or ")".
    630632                $script = preg_replace(
    631                         '/\s*}\s*[\n\r]+\s*(?!\s*(else|catch|}))/s',
     633                        '/\s*}\s*[\n\r]+\s*(?!\s*(else|catch|finally|while|[}\),;]))/s',
    632634                        '};', $script ) ;
    633635
Note: See TracChangeset for help on using the changeset viewer.
© 2003 – 2012 CKSource – Frederico Knabben. All rights reserved. | Terms of use | Privacy policy