flynx/pWiki
1
1
Fork 0
mirror of https://github.com/flynx/pWiki.git synced 2025-10-29 01:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

more bug fixes...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2022-05-19 04:07:11 +03:00
parent 3c0e6e0147
commit 1d9e0e0425
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pwiki2.js
View File

@ -92,6 +92,8 @@ module.path = {
'array'
: 'string')
: format
var root = path[0] == ''
|| path[0] == '/'
path = (path instanceof Array ?
path
// NOTE: this will also trim the path elements...
@ -116,8 +118,10 @@ module.path = {
: res.push(e)
return res }, [])
return format == 'string' ?
// special case: [''] -> '/'
((path.length == 1 && path[0] == '') ?
// special case: root -> keep '/'
((root
&& path.length == 1
&& path[0] == '') ?
('/'+ path.join('/'))
: path.join('/'))
: path },
@ -127,14 +131,17 @@ module.path = {
'array'
: 'string')
: format
path = this.normalize(path, 'array')
// root path...
if(path[0] == ''){
return format == 'string' ?
path.join('/')
: path }
parent = this.normalize(parent, 'array')
return this.normalize(parent.concat(path), format) },
if(path[0] == '' || path[0] == '/'){
return this.normalize(path, format) }
// unify parent/path types...
parent = parent instanceof Array ?
parent
: parent.split(/\s*[\\\/]+\s*/)
path = path instanceof Array ?
path
: path.split(/\s*[\\\/]+\s*/)
return this.normalize([...parent, ...path], format) },
paths: function*(path='/'){
path = this.normalize(path, 'array')