Compare commits

..

No commits in common. "74b12207102a30b91865c6ec02cbeeaffd41ad44" and "67af38f785b522a43b02c640b812c9839eac93b8" have entirely different histories.

6 changed files with 7 additions and 37 deletions

View File

@ -1,8 +1,6 @@
import $ from 'jquery'
import 'jquery-contextmenu'
import copy from 'copy-text-to-clipboard'
import axios from "axios";
import qs from "querystring";
function renderTree(tree) {
if (!tree) return []
@ -24,17 +22,7 @@ function connectContextMenu(editor) {
createNewPage: {
name: 'Create page from item',
callback: function (key, opt) {
console.log('Create page from item')
editor.flat(this, {base: true}).then(result => {
let data = {
'json': 1,
'p': result.title,
'summary': "",
'content': JSON.stringify(result.children),
};
console.log(data)
return axios.post('/save/', qs.encode(data))
}).then()
console.log('Create page from item', key, opt)
},
className: 'action-new-page'
},

View File

@ -69,7 +69,7 @@ Plugin.prototype.render = function (tokens, id, options, env) {
return '<input type="checkbox" class="checkbox" checked>';
}
}
return '<a href="'+this.options.relativeBaseURL+encodeURIComponent(link.replace(/ +/g, '_')) + '" class="wiki-link">' + (tag ? '#' : '') + link + '</a>';
return '<a href="'+this.options.relativeBaseURL+encodeURIComponent(link.replace(' ', '_')) + '" class="wiki-link">' + (tag ? '#' : '') + link + '</a>';
}
export default (options) => {

View File

@ -65,6 +65,6 @@ describe('MD', function () {
})
it('parseLinks double url', function () {
assert.deepStrictEqual(MD.renderInline("[[test [[link]] test2]]"), '<a href="/edit/test_%5B%5Blink%5D%5D_test2" class="wiki-link">test [[link]] test2</a>')
assert.deepStrictEqual(MD.renderInline("[[test [[link]] test2]]"), '<a href="/edit/test_%5B%5Blink%5D%5D%20test2" class="wiki-link">test [[link]] test2</a>')
})
})

View File

@ -111,13 +111,12 @@ function editor(root, inputData, options) {
});
}
function flat(element, opt) {
opt = opt || {}
function flat(element) {
let item = $(element).parents('.list-item')
let id = item.attr('data-id')
return new Promise(function (resolve, reject) {
resolve(store.flat(id, opt));
resolve(store.flat(id));
});
}

View File

@ -365,23 +365,8 @@ function Store(inputData) {
return [values[from], ..._.takeWhile(items, item => item.indented > values[from].indented)]
}
function flat(from, opt) {
opt = opt || {}
let result = selectItemsFrom(from)
if (opt.base && result.length > 0) {
const first = result[0]
let children = _.map(result.slice(1), (item) => {
let newItem = _.clone(item)
newItem.indented -= first.indented+1
newItem.id = ID()
return newItem
})
return {
title: first.text,
children
}
}
return result
function flat(from) {
return selectItemsFrom(from)
}
/**

View File

@ -28,7 +28,6 @@ import (
"html/template"
"io"
"log"
"math/rand"
"net/http"
"net/url"
"os"
@ -45,7 +44,6 @@ import (
func init() {
log.SetFlags(log.Lshortfile)
rand.Seed(time.Now().UnixNano())
}
type authorizedKey string