bump version to 3.1.1

load contented without jquery, but it's present by the callback
doc: changelog update
2017-10-15 20:01:59 +13:00 · 2017-10-15 20:00:04 +13:00 · 2017-10-15 19:58:04 +13:00 · 2017-10-15 19:56:03 +13:00
3 changed files with 6 additions and 4 deletions
--- a/2
+++ b/2
@@ -2,7 +2,7 @@
 # Makefile for YATWiki3
 #

-VERSION:=3.1.0
+VERSION:=3.1.1

 SOURCES:=Makefile \
 	static \
--- a/_dist/README.txt
+++ b/_dist/README.txt
@@ -36,6 +36,9 @@ This package can be installed via go get: `go get code.ivysaur.me/yatwiki`

 =CHANGELOG=

+2017-10-15 3.1.1
+- Update `contented` integration (requires `contented` >= 1.1.0)
+
 2017-10-08 3.1.0
 - Feature: Support content upload to a `contented` server

--- a/rModify.go
+++ b/rModify.go
@@ -52,14 +52,13 @@ func (this *WikiServer) routeModify(w http.ResponseWriter, r *http.Request, arti
 `
 	if len(this.opts.ContentedServer) > 0 {
 		content += `
-<script type="text/javascript" src="` + this.opts.ContentedServer + `jquery-1.12.4.min.js"></script>
 <script type="text/javascript" src="` + this.opts.ContentedServer + `sdk.js"></script>
 		| <a href="javascript:;" id="open-contented-uploader">upload...</a>
 		<script type="text/javascript">
-			$("#open-contented-uploader").on('click', function() {
+			document.getElementById("open-contented-uploader").addEventListener("click", function() {
 				contented.init("#contentctr", function(items) {
 					for (var i = 0; i < items.length; ++i) {
-						$("#contentctr textarea").append(" " + "` + this.opts.ContentedServer + `get/" + items[i] + " ");
+						$("#contentctr textarea").append(" " + contented.getPreviewURL(items[i]) + " ");
 					}
 				});
 			});
Author	SHA1	Message	Date
mappu	2bc26c5966	bump version to 3.1.1	2017-10-15 20:01:59 +13:00
mappu	f5767db840	load contented without jquery, but it's present by the callback	2017-10-15 20:00:04 +13:00
mappu	edf88d1f31	doc: changelog update	2017-10-15 19:58:04 +13:00
mappu	262c3ba903	contented: update integration to 1.1.0	2017-10-15 19:56:03 +13:00