blogger
Revisão | b7779f74582ed06ce8d3b88eb60d94cf6a04b9db (tree) |
---|---|
Hora | 2017-08-17 23:25:29 |
Autor | umorigu <umorigu@gmai...> |
Commiter | umorigu |
BugTrack/2188 Replace list-margin px with indent-level calc
* Remove px calclation of List margin and padding
* Calc indent-level of nected list. That is used as list-indentN class
@@ -38,6 +38,7 @@ $_ol_left_margin = 0; // Must be 0 | ||
38 | 38 | $_ol_margin = 1; // Must be 1 |
39 | 39 | $_dl_left_margin = 0; // Must be 0 |
40 | 40 | $_dl_margin = 1; // Must be 1 |
41 | +// Use pkwk_list_attrs_template() instead | |
41 | 42 | $_list_pad_str = ' class="list%d list-indent%d"'; |
42 | 43 | |
43 | 44 | ///////////////////////////////////////////////// |
@@ -38,6 +38,7 @@ $_ol_left_margin = 0; // Must be 0 | ||
38 | 38 | $_ol_margin = 1; // Must be 1 |
39 | 39 | $_dl_left_margin = 0; // Must be 0 |
40 | 40 | $_dl_margin = 1; // Must be 1 |
41 | +// Use pkwk_list_attrs_template() instead | |
41 | 42 | $_list_pad_str = ''; |
42 | 43 | |
43 | 44 | ///////////////////////////////////////////////// |
@@ -310,8 +310,6 @@ class ListContainer extends Element | ||
310 | 310 | var $tag2; |
311 | 311 | var $level; |
312 | 312 | var $style; |
313 | - var $margin; | |
314 | - var $left_margin; | |
315 | 313 | |
316 | 314 | function ListContainer($tag, $tag2, $head, $text) |
317 | 315 | { |
@@ -321,13 +319,6 @@ class ListContainer extends Element | ||
321 | 319 | { |
322 | 320 | parent::__construct(); |
323 | 321 | |
324 | - $var_margin = '_' . $tag . '_margin'; | |
325 | - $var_left_margin = '_' . $tag . '_left_margin'; | |
326 | - global $$var_margin, $$var_left_margin; | |
327 | - | |
328 | - $this->margin = $$var_margin; | |
329 | - $this->left_margin = $$var_left_margin; | |
330 | - | |
331 | 322 | $this->tag = $tag; |
332 | 323 | $this->tag2 = $tag2; |
333 | 324 | $this->level = min(3, strspn($text, $head)); |
@@ -346,19 +337,13 @@ class ListContainer extends Element | ||
346 | 337 | |
347 | 338 | function setParent(& $parent) |
348 | 339 | { |
349 | - global $_list_pad_str; | |
350 | - | |
351 | 340 | parent::setParent($parent); |
352 | 341 | |
353 | 342 | $step = $this->level; |
354 | 343 | if (isset($parent->parent) && is_a($parent->parent, 'ListContainer')) |
355 | 344 | $step -= $parent->parent->level; |
356 | 345 | |
357 | - $margin = $this->margin * $step; | |
358 | - if ($step == $this->level) | |
359 | - $margin += $this->left_margin; | |
360 | - | |
361 | - $this->style = sprintf($_list_pad_str, $this->level, $margin, $margin); | |
346 | + $this->style = sprintf(pkwk_list_attrs_template(), $this->level, $step); | |
362 | 347 | } |
363 | 348 | |
364 | 349 | function & insert(& $obj) |
@@ -1067,16 +1052,12 @@ class Contents_UList extends ListContainer | ||
1067 | 1052 | |
1068 | 1053 | function setParent(& $parent) |
1069 | 1054 | { |
1070 | - global $_list_pad_str; | |
1071 | - | |
1072 | 1055 | parent::setParent($parent); |
1073 | 1056 | $step = $this->level; |
1074 | - $margin = $this->left_margin; | |
1075 | 1057 | if (isset($parent->parent) && is_a($parent->parent, 'ListContainer')) { |
1076 | 1058 | $step -= $parent->parent->level; |
1077 | - $margin = 0; | |
1078 | 1059 | } |
1079 | - $margin += $this->margin * ($step == $this->level ? 1 : $step); | |
1080 | - $this->style = sprintf($_list_pad_str, $this->level, $margin, $margin); | |
1060 | + $indent_level = ($step == $this->level ? 1 : $step); | |
1061 | + $this->style = sprintf(pkwk_list_attrs_template(), $this->level, $indent_level); | |
1081 | 1062 | } |
1082 | 1063 | } |
@@ -380,7 +380,6 @@ EOD; | ||
380 | 380 | function make_related($page, $tag = '') |
381 | 381 | { |
382 | 382 | global $script, $vars, $rule_related_str, $related_str; |
383 | - global $_ul_left_margin, $_ul_margin, $_list_pad_str; | |
384 | 383 | |
385 | 384 | prepare_links_related($page); |
386 | 385 | $links = links_get_related($page); |
@@ -407,8 +406,7 @@ function make_related($page, $tag = '') | ||
407 | 406 | if (empty($_links)) return ''; // Nothing |
408 | 407 | |
409 | 408 | if ($tag == 'p') { // From the line-head |
410 | - $margin = $_ul_left_margin + $_ul_margin; | |
411 | - $style = sprintf($_list_pad_str, 1, $margin, $margin); | |
409 | + $style = sprintf(pkwk_list_attrs_template(), 1, 1); | |
412 | 410 | $retval = "\n" . '<ul' . $style . '>' . "\n" . |
413 | 411 | '<li>' . join($rule_related_str, $_links) . '</li>' . "\n" . |
414 | 412 | '</ul>' . "\n"; |
@@ -645,3 +643,10 @@ function pkwk_output_dtd($pkwk_dtd = PKWK_DTD_XHTML_1_1, $charset = CONTENT_CHAR | ||
645 | 643 | return '<meta http-equiv="content-type" content="text/html; charset=' . $charset . '" />' . "\n"; |
646 | 644 | } |
647 | 645 | } |
646 | + | |
647 | +/** | |
648 | + * Get template of List (ul, ol, dl) attributes | |
649 | + */ | |
650 | +function pkwk_list_attrs_template() { | |
651 | + return ' class="list%d list-indent%d"'; | |
652 | +} |
@@ -1,8 +1,8 @@ | ||
1 | 1 | <?php |
2 | 2 | // PukiWiki - Yet another WikiWikiWeb clone. |
3 | -// $Id: ls2.inc.php,v 1.30 2011/01/25 15:01:01 henoheno Exp $ | |
4 | -// Copyright (C) | |
5 | -// 2002-2004, 2006-2007 PukiWiki Developers Team | |
3 | +// ls2.inc.php | |
4 | +// Copyright | |
5 | +// 2002-2017 PukiWiki Development Team | |
6 | 6 | // 2002 panda http://home.arino.jp/?ls2.inc.php |
7 | 7 | // 2002 Y.MASUI GPL2 http://masui.net/pukiwiki/ masui@masui.net (ls.inc.php) |
8 | 8 | // License: GPL version 2 |
@@ -167,8 +167,6 @@ function plugin_ls2_get_headings($page, & $params, $level, $include = FALSE) | ||
167 | 167 | //リスト構造を構築する |
168 | 168 | function plugin_ls2_list_push(& $params, $level) |
169 | 169 | { |
170 | - global $_ul_left_margin, $_ul_margin, $_list_pad_str; | |
171 | - | |
172 | 170 | $result = & $params['result']; |
173 | 171 | $saved = & $params['saved']; |
174 | 172 | $cont = TRUE; |
@@ -187,14 +185,14 @@ function plugin_ls2_list_push(& $params, $level) | ||
187 | 185 | $cont = FALSE; |
188 | 186 | array_unshift($saved, $close); |
189 | 187 | |
190 | - $left = ($level == $margin) ? $_ul_left_margin : 0; | |
188 | + $left = 0; | |
191 | 189 | if ($params['compact']) { |
192 | - $left += $_ul_margin; // マージンを固定 | |
190 | + $left = 1; // マージンを固定 | |
193 | 191 | $level -= ($margin - 1); // レベルを修正 |
194 | 192 | } else { |
195 | - $left += $margin * $_ul_margin; | |
193 | + $left = $margin; | |
196 | 194 | } |
197 | - $str = sprintf($_list_pad_str, $level, $left, $left); | |
195 | + $str = sprintf(pkwk_list_attrs_template(), $level, $left); | |
198 | 196 | array_push($result, sprintf($open, $str)); |
199 | 197 | } |
200 | 198 |
@@ -222,4 +220,3 @@ function plugin_ls2_check_arg($value, & $params) | ||
222 | 220 | |
223 | 221 | $params['_args'][] = htmlsc($value); // Link title |
224 | 222 | } |
225 | -?> |