Page MenuHomePhabricator
Files F15282716

D10044.id24165.diff
No OneTemporary
Actions

D10044.id24165.diff
View Options

diff --git a/src/markup/engine/__tests__/remarkup/list-crazystairs.txt b/src/markup/engine/__tests__/remarkup/list-crazystairs.txt
--- a/src/markup/engine/__tests__/remarkup/list-crazystairs.txt
+++ b/src/markup/engine/__tests__/remarkup/list-crazystairs.txt
@@ -10,7 +10,6 @@
<li class="remarkup-list-item">Banana</li>
</ul>
~~~~~~~~~~
--
1. Fruit
- Apple
- Banana
diff --git a/src/markup/engine/__tests__/remarkup/list-staircase.txt b/src/markup/engine/__tests__/remarkup/list-staircase.txt
--- a/src/markup/engine/__tests__/remarkup/list-staircase.txt
+++ b/src/markup/engine/__tests__/remarkup/list-staircase.txt
@@ -16,10 +16,8 @@
<p>derp</p>
~~~~~~~~~~
-1.
- -
- top
- mid
-2. bot
+1. bot
derp
diff --git a/src/markup/engine/remarkup/blockrule/PhutilRemarkupEngineRemarkupListBlockRule.php b/src/markup/engine/remarkup/blockrule/PhutilRemarkupEngineRemarkupListBlockRule.php
--- a/src/markup/engine/remarkup/blockrule/PhutilRemarkupEngineRemarkupListBlockRule.php
+++ b/src/markup/engine/remarkup/blockrule/PhutilRemarkupEngineRemarkupListBlockRule.php
@@ -407,50 +407,57 @@
$number = 1;
foreach ($tree as $item) {
if ($this->getEngine()->isTextMode()) {
- $out[] = str_repeat(' ', 2 * $level);
- if ($item['mark'] !== null) {
- if ($item['mark']) {
- $out[] = '[X] ';
- } else {
- $out[] = '[ ] ';
- }
+ if ($item['text'] === null) {
+ // Don't render anything.
} else {
- switch ($style) {
- case '#':
- $out[] = $number.'. ';
- $number++;
- break;
- case '-':
- $out[] = '- ';
- break;
+ $out[] = str_repeat(' ', 2 * $level);
+ if ($item['mark'] !== null) {
+ if ($item['mark']) {
+ $out[] = '[X] ';
+ } else {
+ $out[] = '[ ] ';
+ }
+ } else {
+ switch ($style) {
+ case '#':
+ $out[] = $number.'. ';
+ $number++;
+ break;
+ case '-':
+ $out[] = '- ';
+ break;
+ }
}
+ $out[] = $this->applyRules($item['text'])."\n";
}
- $out[] = $this->applyRules($item['text'])."\n";
- } else if ($item['text'] === null) {
- $out[] = hsprintf('<li class="remarkup-list-item phantom-item">');
} else {
- if ($item['mark'] !== null) {
- if ($item['mark'] == true) {
- $out[] = hsprintf(
- '<li class="remarkup-list-item remarkup-checked-item">');
+ if ($item['text'] === null) {
+ $out[] = hsprintf('<li class="remarkup-list-item phantom-item">');
+ } else {
+ if ($item['mark'] !== null) {
+ if ($item['mark'] == true) {
+ $out[] = hsprintf(
+ '<li class="remarkup-list-item remarkup-checked-item">');
+ } else {
+ $out[] = hsprintf(
+ '<li class="remarkup-list-item remarkup-unchecked-item">');
+ }
+ $out[] = phutil_tag(
+ 'input',
+ array(
+ 'type' => 'checkbox',
+ 'checked' => ($item['mark'] ? 'checked' : null),
+ 'disabled' => 'disabled',
+ ));
+ $out[] = ' ';
} else {
- $out[] = hsprintf(
- '<li class="remarkup-list-item remarkup-unchecked-item">');
+ $out[] = hsprintf('<li class="remarkup-list-item">');
}
- $out[] = phutil_tag(
- 'input',
- array(
- 'type' => 'checkbox',
- 'checked' => ($item['mark'] ? 'checked' : null),
- 'disabled' => 'disabled',
- ));
- $out[] = ' ';
- } else {
- $out[] = hsprintf('<li class="remarkup-list-item">');
- }
- $out[] = $this->applyRules($item['text']);
+ $out[] = $this->applyRules($item['text']);
+ }
}
+
if ($item['items']) {
$subitems = $this->renderTree($item['items'], $level + 1, $has_marks);
foreach ($subitems as $i) {

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 5, 1:45 AM (19 h, 24 m ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7223306
Default Alt Text
D10044.id24165.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility