mirror of
https://github.com/flynx/pWiki.git
synced 2025-10-29 18:10:09 +00:00
bugfix... still needs cleanup...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
parent
84af4dcf95
commit
3c0e6e0147
@ -109,12 +109,17 @@ module.path = {
|
|||||||
undefined
|
undefined
|
||||||
: e == '..'
|
: e == '..'
|
||||||
|| res[res.length-1] == '>>' ?
|
|| res[res.length-1] == '>>' ?
|
||||||
res.pop()
|
((res.length > 1
|
||||||
|
|| res[0] != '')
|
||||||
|
&& res.pop())
|
||||||
// NOTE: the last '>>' will be retained...
|
// NOTE: the last '>>' will be retained...
|
||||||
: res.push(e)
|
: res.push(e)
|
||||||
return res }, [])
|
return res }, [])
|
||||||
return format == 'string' ?
|
return format == 'string' ?
|
||||||
path.join('/')
|
// special case: [''] -> '/'
|
||||||
|
((path.length == 1 && path[0] == '') ?
|
||||||
|
('/'+ path.join('/'))
|
||||||
|
: path.join('/'))
|
||||||
: path },
|
: path },
|
||||||
relative: function(parent, path, format='auto'){
|
relative: function(parent, path, format='auto'){
|
||||||
format = format == 'auto' ?
|
format = format == 'auto' ?
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user