| Index: trunk/extensions/wikihiero/SpecialHieroglyphs.php |
| — | — | @@ -25,11 +25,11 @@ |
| 26 | 26 | private $syntaxHelp = array( |
| 27 | 27 | array( 'code' => '-', 'message' => 'wikihiero-separator', 'example' => 'A1 - B1' ), |
| 28 | 28 | array( 'code' => ':', 'message' => 'wikihiero-superposition', 'example' => 'p:t' ), |
| 29 | | - array( 'code' => ':', 'message' => 'wikihiero-juxtaposition', 'example' => 'p*t' ), |
| | 29 | + array( 'code' => '*', 'message' => 'wikihiero-juxtaposition', 'example' => 'p*t' ), |
| 30 | 30 | array( 'code' => '!', 'message' => 'wikihiero-eol', 'example' => 'A1-B1 ! C1-D1' ), |
| 31 | 31 | array( 'code' => '\\', 'message' => 'wikihiero-mirror', 'example' => 'A1\-A1' ), |
| 32 | 32 | array( 'code' => '..', 'message' => 'wikihiero-void', 'example' => 'A1 .. B1' ), |
| 33 | | - array( 'code' => '..', 'message' => 'wikihiero-half-void', 'example' => 'A1 . B1' ), |
| | 33 | + array( 'code' => '.', 'message' => 'wikihiero-half-void', 'example' => 'A1 . B1' ), |
| 34 | 34 | array( 'code' => '<!-- -->', 'message' => 'wikihiero-comment', 'example' => 'A<!-- B1 -->1' ), |
| 35 | 35 | ); |
| 36 | 36 | private $helpColumns = array( |
| — | — | @@ -57,8 +57,8 @@ |
| 58 | 58 | $out->addHTML( '<table class="wikitable">' |
| 59 | 59 | . '<tr><th>' . wfMsg( 'wikihiero-input' ) . '</th><th>' |
| 60 | 60 | . wfMsg( 'wikihiero-result' ) . '</th></tr>' |
| 61 | | - . '<tr><td><code><hiero>' . htmlspecialchars( $text ) . '</hiero></code></td>' |
| 62 | | - . "<td>{$hiero->render( $text )}</td></tr></table>" |
| | 61 | + . '<tr><td><code><hiero>' . nl2br( htmlspecialchars( $text ) ) |
| | 62 | + . "</hiero></code></td><td>{$hiero->render( $text )}</td></tr></table>" |
| 63 | 63 | ); |
| 64 | 64 | } |
| 65 | 65 | |
| Index: trunk/extensions/wikihiero/modules/ext.wikihiero.Special.js |
| — | — | @@ -30,7 +30,7 @@ |
| 31 | 31 | var html = '<table class="wikitable">' |
| 32 | 32 | + '<tr><th>' + mw.msg( 'wikihiero-input' ) + '</th><th>' |
| 33 | 33 | + mw.msg( 'wikihiero-result' ) + '</th></tr>' |
| 34 | | - + '<tr><td><code><hiero>' + mw.html.escape( text ) + '</hiero></code></td>' |
| | 34 | + + '<tr><td><code><hiero>' + mw.html.escape( text ).replace( '\n', '<br/>' ) + '</hiero></code></td>' |
| 35 | 35 | + '<td>' + data.parse.text['*'] + '</td></tr></table>'; |
| 36 | 36 | $.removeSpinner( 'hiero' ); |
| 37 | 37 | $result.html( html ); |