Indefero Commit Details

Date:

2011-10-08 19:13:49 (14 years 1 month ago)

Author:

Thomas Keller

Branch:

develop, feature.diff-whitespace, feature.wiki-default-page, release-1.2, release-1.3

Commit:

4fb15ccb7d4d212003241de70b7535ea77a59831

Parents:

234b70845c015b6b4b590f29b26c175543efff82

Message:

6abd0b6f made problems in reviews, need to be reworked anyways in a few.

Changes:

File differences

-245
246 246
247 247
248 
248
249 249
250 250
251 251
... ...
361 361
362 362
363 363
364 
364
365 365
366 366
367 367
+     */␊
    public function fileCompare($orig, $chunks, $filename, $context=10)␊
    {␊
        $orig_lines = self::splitIntoLines($orig);␊
        $orig_lines = IDF_FileUtil::splitIntoLines($orig);␊
        $new_chunks = $this->mergeChunks($orig_lines, $chunks, $context);␊
        return $this->renderCompared($new_chunks, $filename);␊
    }␊

            foreach ($chunk as $line) {␊
                $line1 = '&nbsp;';␊
                $line2 = '&nbsp;';␊
                $line[2] = (strlen($line[2])) ? self::padLine(Pluf_esc($line[2])) : '&nbsp;';␊
                $line[2] = (strlen($line[2])) ? IDF_FileUtil::emphasizeControlCharacters(Pluf_esc($line[2])) : '&nbsp;';␊
                if ($line[0] and $line[1]) {␊
                    $class = 'diff-c';␊
                    $line1 = $line2 = $line[2];␊
 ...
      */␊
     public function fileCompare($orig, $chunks, $filename, $context=10)␊
     {␊
-        $orig_lines = self::splitIntoLines($orig);␊
+        $orig_lines = IDF_FileUtil::splitIntoLines($orig);␊
         $new_chunks = $this->mergeChunks($orig_lines, $chunks, $context);␊
         return $this->renderCompared($new_chunks, $filename);␊
     }␊
             foreach ($chunk as $line) {␊
                 $line1 = '&nbsp;';␊
                 $line2 = '&nbsp;';␊
-                $line[2] = (strlen($line[2])) ? self::padLine(Pluf_esc($line[2])) : '&nbsp;';␊
+                $line[2] = (strlen($line[2])) ? IDF_FileUtil::emphasizeControlCharacters(Pluf_esc($line[2])) : '&nbsp;';␊
                 if ($line[0] and $line[1]) {␊
                     $class = 'diff-c';␊
                     $line1 = $line2 = $line[2];␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags