diff --git a/dbld.sh b/dbld.sh index 17030e79c..70eb235bc 100755 --- a/dbld.sh +++ b/dbld.sh @@ -6,10 +6,10 @@ pushd tw5dropbox/appwiki > /dev/null node ../../core/boot.js \ --verbose \ - --savetiddler $:/core/templates/tw5dropbox.template.js ../../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/tw5dropbox.js text/plain [!is[shadow]] \ - --savetiddler $:/core/templates/index.template.html ../../../../../Apps/TiddlyWiki5/My\ TiddlyWiki/index.html text/plain [!is[shadow]] \ - --savetiddler $:/core/templates/index.template.html ../../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/apptemplate.html text/plain [!is[shadow]] \ - --savetiddler $:/core/templates/styles.template.css ../../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/styles.css text/plain [!is[shadow]] \ + --savetiddler $:/plugins/dropbox/tw5dropbox.template.js ../../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/tw5dropbox.js text/plain [!is[shadow]] \ + --savetiddler $:/plugins/dropbox/index.template.html ../../../../../Apps/TiddlyWiki5/My\ TiddlyWiki/index.html text/plain [!is[shadow]] \ + --savetiddler $:/plugins/dropbox/index.template.html ../../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/apptemplate.html text/plain [!is[shadow]] \ + --savetiddler $:/plugins/dropbox/styles.template.css ../../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/styles.css text/plain [!is[shadow]] \ || exit 1 popd > /dev/null @@ -18,7 +18,7 @@ pushd tw5dropbox/mainwiki > /dev/null node ../../core/boot.js \ --verbose \ - --savetiddler $:/core/templates/index.template.html ../../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/index.html text/plain [!is[shadow]] \ + --savetiddler $:/plugins/dropbox/index.template.html ../../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/index.html text/plain [!is[shadow]] \ || exit 1 popd > /dev/null diff --git a/tw5dropbox/appwiki/plugins/dropbox-app.js b/tw5dropbox/appwiki/plugins/dropbox-app.js index bb6ddd776..2570ab671 100644 --- a/tw5dropbox/appwiki/plugins/dropbox-app.js +++ b/tw5dropbox/appwiki/plugins/dropbox-app.js @@ -28,8 +28,11 @@ exports.startup = function() { $tw.plugins.dropbox.wikiName = wikiName; $tw.wiki.addTiddler({title: titleWikiName, text: $tw.plugins.dropbox.wikiName},true); // Load tiddlers - $tw.plugins.dropbox.loadTiddlerFiles("/" + $tw.plugins.dropbox.wikiName + "/tiddlers",function() { - console.log("Loaded all tiddlers",$tw.wiki.tiddlers); + $tw.plugins.dropbox.loadTiddlerFiles("/" + $tw.plugins.dropbox.wikiName + "/tiddlers",function(fileRevisions) { + // Save the tiddler index + $tw.plugins.dropbox.saveTiddlerIndex("/" + $tw.plugins.dropbox.wikiName + "/index.html",fileRevisions,function(error) { + console.log("Saved tiddler index"); + }); }); } else { alert("This TiddlyWiki file must be in Dropbox"); diff --git a/tw5dropbox/appwiki/wiki/index.template.html.tid b/tw5dropbox/appwiki/wiki/index.template.html.tid index 393f04adc..d33b3d619 100644 --- a/tw5dropbox/appwiki/wiki/index.template.html.tid +++ b/tw5dropbox/appwiki/wiki/index.template.html.tid @@ -1,4 +1,4 @@ -title: $:/core/templates/index.template.html +title: $:/plugins/dropbox/index.template.html type: text/x-tiddlywiki-html @@ -16,9 +16,12 @@ type: text/x-tiddlywiki-html " /> <<tiddler "$:/core/wiki/title">> <> + - + diff --git a/tw5dropbox/appwiki/wiki/styles.template.css.tid b/tw5dropbox/appwiki/wiki/styles.template.css.tid index 4c4cbbbda..6b72ddd0b 100644 --- a/tw5dropbox/appwiki/wiki/styles.template.css.tid +++ b/tw5dropbox/appwiki/wiki/styles.template.css.tid @@ -1,4 +1,4 @@ -title: $:/core/templates/styles.template.css +title: $:/plugins/dropbox/styles.template.css type: text/x-tiddlywiki-html <> diff --git a/tw5dropbox/appwiki/wiki/tw5dropbox.template.js.tid b/tw5dropbox/appwiki/wiki/tw5dropbox.template.js.tid index a6692f220..bf55305db 100644 --- a/tw5dropbox/appwiki/wiki/tw5dropbox.template.js.tid +++ b/tw5dropbox/appwiki/wiki/tw5dropbox.template.js.tid @@ -1,4 +1,4 @@ -title: $:/core/templates/tw5dropbox.template.js +title: $:/plugins/dropbox/tw5dropbox.template.js type: text/x-tiddlywiki-html <> diff --git a/tw5dropbox/mainwiki/wiki/index.template.html.tid b/tw5dropbox/mainwiki/wiki/index.template.html.tid index e4faa51d3..fd798bda8 100644 --- a/tw5dropbox/mainwiki/wiki/index.template.html.tid +++ b/tw5dropbox/mainwiki/wiki/index.template.html.tid @@ -1,4 +1,4 @@ -title: $:/core/templates/index.template.html +title: $:/plugins/dropbox/index.template.html type: text/x-tiddlywiki-html diff --git a/tw5dropbox/plugins/dropbox.js b/tw5dropbox/plugins/dropbox.js index d864273cf..9b754598c 100644 --- a/tw5dropbox/plugins/dropbox.js +++ b/tw5dropbox/plugins/dropbox.js @@ -19,7 +19,9 @@ var apiKey = "m+qwjj8wFRA=|1TSoitGS9Nz2RTwv+jrUJnsAj0yy57NhQJ4TkZ/+Hw=="; var titleIsLoggedIn = "$:/plugins/dropbox/IsLoggedIn", titleUserName = "$:/plugins/dropbox/UserName", titlePublicAppUrl = "$:/plugins/dropbox/PublicAppUrl", - titleAppTemplateHtml = "$:/plugins/dropbox/apptemplate.html"; + titleAppTemplateHtml = "$:/plugins/dropbox/apptemplate.html", + titleTiddlerIndex = "$:/plugins/dropbox/Index", + titleAppIndexTemplate = "$:/plugins/dropbox/index.template.html"; // Query string marker for forcing authentication var queryLoginMarker = "login=true"; @@ -112,7 +114,13 @@ $tw.plugins.dropbox.loadTiddlerFiles = function(path,callback) { $tw.plugins.dropbox.loadTiddlerFile(task.path,task.type,task.stats,callback); }, 2); // Call the callback when we've processed all the files - q.drain = callback; + q.drain = function() { + var fileRevisions = {}; + for(var t=0; t