y0rune/vimwiki
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some more small cleanups

Browse Source
This commit is contained in:
EinfachToll 2014-01-06 13:54:11 +01:00
parent 9810ff1c55
commit 68ae7d57fb
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
autoload/vimwiki/lst.vim
View File

@ -812,9 +812,8 @@ endfunction "}}}
"Toggles checkbox between [ ] and [X] or creates one "Toggles checkbox between [ ] and [X] or creates one
"in the lines of the given range "in the lines of the given range
function! vimwiki#lst#toggle_cb(line1, line2) "{{{ function! vimwiki#lst#toggle_cb(from_line, to_line) "{{{
let from_item = s:get_corresponding_item(a:line1) let from_item = s:get_corresponding_item(a:from_line)
let to_item = s:get_corresponding_item(a:line2)
if from_item.type == 0 if from_item.type == 0
return return
endif endif
@ -823,9 +822,9 @@ function! vimwiki#lst#toggle_cb(line1, line2) "{{{
if from_item.cb == '' if from_item.cb == ''
"if line1 has no CB, make a CB in every selected line "if from_line has no CB, make a CB in every selected line
let parent_items_of_lines = [] let parent_items_of_lines = []
for cur_ln in range(from_item.lnum, to_item.lnum) for cur_ln in range(from_item.lnum, a:to_line)
let cur_item = s:get_item(cur_ln) let cur_item = s:get_item(cur_ln)
let success = s:create_cb(cur_item) let success = s:create_cb(cur_item)
@ -839,11 +838,11 @@ function! vimwiki#lst#toggle_cb(line1, line2) "{{{
else else
"if line1 has CB, toggle it and set all siblings to the same new state "if from_line has CB, toggle it and set all siblings to the same new state
let rate_first_line = s:get_rate(from_item) let rate_first_line = s:get_rate(from_item)
let new_rate = rate_first_line==100 ? 0 : 100 let new_rate = rate_first_line==100 ? 0 : 100
for cur_ln in range(from_item.lnum, to_item.lnum) for cur_ln in range(from_item.lnum, a:to_line)
let cur_item = s:get_item(cur_ln) let cur_item = s:get_item(cur_ln)
if cur_item.type != 0 && cur_item.cb != '' if cur_item.type != 0 && cur_item.cb != ''
call s:set_state_plus_children(cur_item, new_rate) call s:set_state_plus_children(cur_item, new_rate)
@ -1117,10 +1116,10 @@ function! s:set_new_mrkr(item, new_mrkr) "{{{
endif endif
endfunction "}}} endfunction "}}}
function! vimwiki#lst#change_marker(line1, line2, new_mrkr, mode) "{{{ function! vimwiki#lst#change_marker(from_line, to_line, new_mrkr, mode) "{{{
let cur_col_from_eol = col("$") - (a:mode == "i" ? col("'^") : col('.')) let cur_col_from_eol = col("$") - (a:mode == "i" ? col("'^") : col('.'))
let new_mrkr = a:new_mrkr let new_mrkr = a:new_mrkr
let cur_ln = a:line1 let cur_ln = a:from_line
while 1 while 1
let cur_item = s:get_item(cur_ln) let cur_item = s:get_item(cur_ln)
@ -1165,7 +1164,7 @@ function! vimwiki#lst#change_marker(line1, line2, new_mrkr, mode) "{{{
call s:set_new_mrkr(cur_item, new_mrkr) call s:set_new_mrkr(cur_item, new_mrkr)
call s:adjust_numbered_list(s:get_item(cur_ln), 1, 0) call s:adjust_numbered_list(s:get_item(cur_ln), 1, 0)
if cur_ln >= a:line2 | break | endif if cur_ln >= a:to_line | break | endif
let cur_ln = s:get_next_line(cur_ln, 1) let cur_ln = s:get_next_line(cur_ln, 1)
endwhile endwhile
@ -1187,6 +1186,7 @@ function! vimwiki#lst#change_marker_in_list(new_mrkr) "{{{
call s:adjust_numbered_list(s:get_item(first_item_line), 0, 0) call s:adjust_numbered_list(s:get_item(first_item_line), 0, 0)
endfunction "}}} endfunction "}}}
"sets kind of the item depending on neighbor items and the parent item "sets kind of the item depending on neighbor items and the parent item
function! s:adjust_mrkr(item) "{{{ function! s:adjust_mrkr(item) "{{{
if a:item.type == 0 || VimwikiGet('syntax') == 'media' if a:item.type == 0 || VimwikiGet('syntax') == 'media'