mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-27 03:57:21 +00:00
Code Issues Releases Wiki Activity

Update importing so we don't open every imported tiddler

Browse Source 
Instead we just display a report with links to each imported tiddler.
Should make importing much faster.
This commit is contained in:
Jermolene 2014-02-21 18:15:18 +00:00
parent 38ef4fa609
commit 31975e0042
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
core/modules/widgets/navigator.js
View File

@ -358,9 +358,6 @@ NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) {
// Import JSON tiddlers
NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) {
var self = this;
// Get the story and history details
var storyList = this.getStoryList();
var history = [];
// Get the tiddlers
var tiddlers = [];
try {
@ -368,6 +365,7 @@ NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) {
} catch(e) {
}
// Process each tiddler
var importedTiddlers = [];
$tw.utils.each(tiddlers,function(tiddlerFields) {
var title = tiddlerFields.title;
// Add it to the store
@ -377,14 +375,28 @@ NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) {
tiddlerFields
));
if(imported) {
// Add it to the story
if(storyList.indexOf(title) === -1) {
storyList.unshift(title);
}
// And to history
history.push(title);
importedTiddlers.push(title);
}
});
// Get the story and history details
var storyList = this.getStoryList(),
history = [];
// Create the import report tiddler
var tiddlerFields = {
title: this.wiki.generateNewTitle("$:/temp/Import Report"),
text: "# [[" + importedTiddlers.join("]]\n# [[") + "]]\n"
};
this.wiki.addTiddler(new $tw.Tiddler(
self.wiki.getCreationFields(),
tiddlerFields,
self.wiki.getModificationFields()
));
// Add it to the story
if(storyList.indexOf(tiddlerFields.title) === -1) {
storyList.unshift(tiddlerFields.title);
}
// And to history
history.push(tiddlerFields.title);
// Save the updated story and history
this.saveStoryList(storyList);
this.addToHistory(history);