From 071c876d412417191219771410d19f000473f720 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Fri, 12 Oct 2012 19:01:35 +0100 Subject: [PATCH] tw5dropbox updates --- tw5dropbox/appwiki/wiki/index.template.html.tid | 12 ------------ tw5dropbox/appwiki/wiki/tw5dropbox.template.js.tid | 2 ++ tw5dropbox/plugins/dropbox.js | 10 +++++++--- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/tw5dropbox/appwiki/wiki/index.template.html.tid b/tw5dropbox/appwiki/wiki/index.template.html.tid index 946896b37..393f04adc 100644 --- a/tw5dropbox/appwiki/wiki/index.template.html.tid +++ b/tw5dropbox/appwiki/wiki/index.template.html.tid @@ -15,22 +15,10 @@ type: text/x-tiddlywiki-html <> " /> <<tiddler "$:/core/wiki/title">> - - - <> - - - - - diff --git a/tw5dropbox/appwiki/wiki/tw5dropbox.template.js.tid b/tw5dropbox/appwiki/wiki/tw5dropbox.template.js.tid index 24da31ebf..a6692f220 100644 --- a/tw5dropbox/appwiki/wiki/tw5dropbox.template.js.tid +++ b/tw5dropbox/appwiki/wiki/tw5dropbox.template.js.tid @@ -3,5 +3,7 @@ type: text/x-tiddlywiki-html <> <> +<> <> <> + diff --git a/tw5dropbox/plugins/dropbox.js b/tw5dropbox/plugins/dropbox.js index 4208a6f9c..2cc06667e 100644 --- a/tw5dropbox/plugins/dropbox.js +++ b/tw5dropbox/plugins/dropbox.js @@ -229,7 +229,7 @@ $tw.plugins.dropbox.forceLogin = function() { // Create a new empty TiddlyWiki $tw.plugins.dropbox.createWiki = function(wikiName) { // Remove any dodgy characters from the wiki name - wikiName = wikiName.replace(/[\$\:\?\#\/\\]/g,""); + wikiName = wikiName.replace(/[\!\@\€\£\%\^\*\+\$\:\?\#\/\\\<\>\|\"\'\`\~\=]/g,""); // Check that the name isn't now empty if(wikiName.length === 0) { return alert("Bad wiki name"); @@ -261,8 +261,12 @@ $tw.plugins.dropbox.createWiki = function(wikiName) { } ], // optional callback - function(err,results) { - alert("Created wiki " + wikiName + " error " + err); + function(error,results) { + if(error) { + $tw.plugins.dropbox.showError(error); + } else { + alert("Created wiki " + wikiName); + } }); };