mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-06-25 23:03:15 +00:00
Code Issues Releases Wiki Activity

Use event.event.view.confirm for confirmation messages in navigator.js and action-confirm.js (#5776)

Browse Source
This commit is contained in:
Simon Huber 2021-06-11 17:56:06 +02:00 committed by GitHub
parent 219beb13cc
commit 6dd1887f0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/modules/widgets/action-confirm.js
View File

@ -58,9 +58,10 @@ Invoke the action associated with this widget
*/ */
ConfirmWidget.prototype.invokeAction = function(triggeringWidget,event) { ConfirmWidget.prototype.invokeAction = function(triggeringWidget,event) {
var invokeActions = true, var invokeActions = true,
handled = true; handled = true,
win = event.event && event.event.view ? event.event.view : window;
if(this.prompt) { if(this.prompt) {
invokeActions = confirm(this.message); invokeActions = win.confirm(this.message);
} }
if(invokeActions) { if(invokeActions) {
handled = this.invokeActions(triggeringWidget,event); handled = this.invokeActions(triggeringWidget,event);
@ -74,4 +75,4 @@ ConfirmWidget.prototype.allowActionPropagation = function() {
exports["action-confirm"] = ConfirmWidget; exports["action-confirm"] = ConfirmWidget;
})(); })();

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

@ -183,7 +183,8 @@ NavigatorWidget.prototype.handleCloseOtherTiddlersEvent = function(event) {
// Place a tiddler in edit mode // Place a tiddler in edit mode
NavigatorWidget.prototype.handleEditTiddlerEvent = function(event) { NavigatorWidget.prototype.handleEditTiddlerEvent = function(event) {
var editTiddler = $tw.hooks.invokeHook("th-editing-tiddler",event); var editTiddler = $tw.hooks.invokeHook("th-editing-tiddler",event),
win = event.event && event.event.view ? event.event.view : window;
if(!editTiddler) { if(!editTiddler) {
return false; return false;
} }
@ -192,7 +193,7 @@ NavigatorWidget.prototype.handleEditTiddlerEvent = function(event) {
return self.wiki.isShadowTiddler(title) && !self.wiki.tiddlerExists(title); return self.wiki.isShadowTiddler(title) && !self.wiki.tiddlerExists(title);
} }
function confirmEditShadow(title) { function confirmEditShadow(title) {
return confirm($tw.language.getString( return win.confirm($tw.language.getString(
"ConfirmEditShadowTiddler", "ConfirmEditShadowTiddler",
{variables: {variables:
{title: title} {title: title}
@ -225,7 +226,8 @@ NavigatorWidget.prototype.handleDeleteTiddlerEvent = function(event) {
storyList = this.getStoryList(), storyList = this.getStoryList(),
originalTitle = tiddler ? tiddler.fields["draft.of"] : "", originalTitle = tiddler ? tiddler.fields["draft.of"] : "",
originalTiddler = originalTitle ? this.wiki.getTiddler(originalTitle) : undefined, originalTiddler = originalTitle ? this.wiki.getTiddler(originalTitle) : undefined,
confirmationTitle; confirmationTitle,
win = event.event && event.event.view ? event.event.view : window;
if(!tiddler) { if(!tiddler) {
return false; return false;
} }
@ -238,7 +240,7 @@ NavigatorWidget.prototype.handleDeleteTiddlerEvent = function(event) {
confirmationTitle = title; confirmationTitle = title;
} }
// Seek confirmation // Seek confirmation
if((this.wiki.getTiddler(originalTitle) || (tiddler.fields.text || "") !== "") && !confirm($tw.language.getString( if((this.wiki.getTiddler(originalTitle) || (tiddler.fields.text || "") !== "") && !win.confirm($tw.language.getString(
"ConfirmDeleteTiddler", "ConfirmDeleteTiddler",
{variables: {variables:
{title: confirmationTitle} {title: confirmationTitle}
@ -304,7 +306,8 @@ NavigatorWidget.prototype.generateDraftTitle = function(title) {
NavigatorWidget.prototype.handleSaveTiddlerEvent = function(event) { NavigatorWidget.prototype.handleSaveTiddlerEvent = function(event) {
var title = event.param || event.tiddlerTitle, var title = event.param || event.tiddlerTitle,
tiddler = this.wiki.getTiddler(title), tiddler = this.wiki.getTiddler(title),
storyList = this.getStoryList(); storyList = this.getStoryList(),
win = event.event && event.event.view ? event.event.view : window;
// Replace the original tiddler with the draft // Replace the original tiddler with the draft
if(tiddler) { if(tiddler) {
var draftTitle = (tiddler.fields["draft.title"] || "").trim(), var draftTitle = (tiddler.fields["draft.title"] || "").trim(),
@ -313,7 +316,7 @@ NavigatorWidget.prototype.handleSaveTiddlerEvent = function(event) {
var isRename = draftOf !== draftTitle, var isRename = draftOf !== draftTitle,
isConfirmed = true; isConfirmed = true;
if(isRename && this.wiki.tiddlerExists(draftTitle)) { if(isRename && this.wiki.tiddlerExists(draftTitle)) {
isConfirmed = confirm($tw.language.getString( isConfirmed = win.confirm($tw.language.getString(
"ConfirmOverwriteTiddler", "ConfirmOverwriteTiddler",
{variables: {variables:
{title: draftTitle} {title: draftTitle}
@ -362,6 +365,7 @@ NavigatorWidget.prototype.handleSaveTiddlerEvent = function(event) {
// Take a tiddler out of edit mode without saving the changes // Take a tiddler out of edit mode without saving the changes
NavigatorWidget.prototype.handleCancelTiddlerEvent = function(event) { NavigatorWidget.prototype.handleCancelTiddlerEvent = function(event) {
event = $tw.hooks.invokeHook("th-cancelling-tiddler", event); event = $tw.hooks.invokeHook("th-cancelling-tiddler", event);
var win = event.event && event.event.view ? event.event.view : window;
// Flip the specified tiddler from draft back to the original // Flip the specified tiddler from draft back to the original
var draftTitle = event.param || event.tiddlerTitle, var draftTitle = event.param || event.tiddlerTitle,
draftTiddler = this.wiki.getTiddler(draftTitle), draftTiddler = this.wiki.getTiddler(draftTitle),
@ -372,7 +376,7 @@ NavigatorWidget.prototype.handleCancelTiddlerEvent = function(event) {
originalTiddler = this.wiki.getTiddler(originalTitle), originalTiddler = this.wiki.getTiddler(originalTitle),
storyList = this.getStoryList(); storyList = this.getStoryList();
if(this.wiki.isDraftModified(draftTitle)) { if(this.wiki.isDraftModified(draftTitle)) {
isConfirmed = confirm($tw.language.getString( isConfirmed = win.confirm($tw.language.getString(
"ConfirmCancelTiddler", "ConfirmCancelTiddler",
{variables: {variables:
{title: draftTitle} {title: draftTitle}