Changeset 2271 for FCKpackager/trunk

Show
Ignore:
Timestamp:
2008-07-23 14:51:03 (6 months ago)
Author:
fredck
Message:

The compressor was renaming the declaration of constants defined as properties (like CKEDITOR.SELECTION_TEXT).

Location:
FCKpackager/trunk
Files:
6 modified

Legend:

Unmodified
Added
Removed

  • FCKpackager/trunk/fckpackager.php

    r2268 r2271  
    167167 
    168168                $output = preg_replace_callback( 
    169                         '/(?<!(var |...\.))(?:' . $this->_ContantsRegexPart . ')(?!\\w)/', 
     169                        '/(?<!(var |...\.))(?:' . $this->_ContantsRegexPart . ')(?!(?:\s*=)|\w)/', 
    170170                        array( &$this, '_Contant_Replace_Evaluator' ), $output ) ; 
    171171 

  • FCKpackager/trunk/_samples/basic/basic_sample_compressed.js

    r335 r2271  
    33 */ 
    44 
    5 var MyObject={};var _Html='<div>\n      <i>\n           Some text\n     </i>\n</div>';MyObject.GetColorName=function(A,B){var C;switch (A){case 1:C='Red';case 2:C='Blue';case 3:C='White';default:C='Unknown color id'+" (double quotes too)";};return B?C.toUpperCase():C;};MyObject.GetArray=function(B,C,D,E){var F=[];var A='Let\'s see if the name "A" will cause conflict';F.push(B);F.push(C);F.push(D);F.push(E);return F;}; 
     5var BASIC_COLOR_RED=1;var BASIC_COLOR_BLUE=2;var BASIC_COLOR_WHITE=3;var MyObject={};MyObject.CONST=1;var _Html='<div>\n        <i>\n           Some text\n     </i>\n</div>';MyObject.GetColorName=function(A,B){var C;if (!A) A=1;switch (A){case 1:C='Red';case 2:C='Blue';case 3:C='White';default:C='Unknown color id'+" (double quotes too)";};return B?C.toUpperCase():C;};MyObject.GetArray=function(B,C,D,E){var F=[];var A='Let\'s see if the name "A" will cause conflict';F.push(B);F.push(C);F.push(D);F.push(E);MyDebugFunction(F);return F;};function DebugIt(A){alert(A);}; 

  • FCKpackager/trunk/_samples/basic/basic_sample.js

    r156 r2271  
    2020// Create the global "MyObject". 
    2121var MyObject = new Object() ; 
     22MyObject.CONST = 1 ; 
    2223 
    2324var _Html =  
    … …  
    3233{ 
    3334        var name ; 
    34          
     35 
     36        if ( !colorId ) 
     37                colorId = MyObject.CONST ; 
     38 
    3539        switch ( colorId ) 
    3640        { 

  • FCKpackager/trunk/_source/includes/fckcontantprocessor.inc

    r2078 r2271  
    6868 
    6969                $output = preg_replace_callback( 
    70                         '/(?<!(var |...\.))(?:' . $this->_ContantsRegexPart . ')(?!\\w)/', 
     70                        '/(?<!(var |...\.))(?:' . $this->_ContantsRegexPart . ')(?!(?:\s*=)|\w)/', 
    7171                        array( &$this, '_Contant_Replace_Evaluator' ), $output ) ; 
    7272 

  • FCKpackager/trunk/web/javascriptcompressor.php

    r2071 r2271  
    2020$constProcessor->AddConstant( 'BASIC_COLOR_BLUE', '2' ) ; 
    2121$constProcessor->AddConstant( 'BASIC_COLOR_WHITE', '3' ) ; 
     22$constProcessor->AddConstant( 'MyObject.CONST', '1' ) ; 
    2223 
    2324$outputData = FCKJavaScriptCompressor::Compress( $inputData, $constProcessor ) ;