diff --git a/core/modules/widgets/action-confirm.js b/core/modules/widgets/action-confirm.js index eb762f050..5ad798663 100644 --- a/core/modules/widgets/action-confirm.js +++ b/core/modules/widgets/action-confirm.js @@ -58,9 +58,10 @@ Invoke the action associated with this widget */ ConfirmWidget.prototype.invokeAction = function(triggeringWidget,event) { var invokeActions = true, - handled = true; + handled = true, + win = event.event && event.event.view ? event.event.view : window; if(this.prompt) { - invokeActions = confirm(this.message); + invokeActions = win.confirm(this.message); } if(invokeActions) { handled = this.invokeActions(triggeringWidget,event); @@ -74,4 +75,4 @@ ConfirmWidget.prototype.allowActionPropagation = function() { exports["action-confirm"] = ConfirmWidget; -})(); \ No newline at end of file +})(); diff --git a/core/modules/widgets/navigator.js b/core/modules/widgets/navigator.js index 9df76acc4..6991d26e2 100755 --- a/core/modules/widgets/navigator.js +++ b/core/modules/widgets/navigator.js @@ -183,7 +183,8 @@ NavigatorWidget.prototype.handleCloseOtherTiddlersEvent = function(event) { // Place a tiddler in edit mode 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) { return false; } @@ -192,7 +193,7 @@ NavigatorWidget.prototype.handleEditTiddlerEvent = function(event) { return self.wiki.isShadowTiddler(title) && !self.wiki.tiddlerExists(title); } function confirmEditShadow(title) { - return confirm($tw.language.getString( + return win.confirm($tw.language.getString( "ConfirmEditShadowTiddler", {variables: {title: title} @@ -225,7 +226,8 @@ NavigatorWidget.prototype.handleDeleteTiddlerEvent = function(event) { storyList = this.getStoryList(), originalTitle = tiddler ? tiddler.fields["draft.of"] : "", originalTiddler = originalTitle ? this.wiki.getTiddler(originalTitle) : undefined, - confirmationTitle; + confirmationTitle, + win = event.event && event.event.view ? event.event.view : window; if(!tiddler) { return false; } @@ -238,7 +240,7 @@ NavigatorWidget.prototype.handleDeleteTiddlerEvent = function(event) { confirmationTitle = title; } // 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", {variables: {title: confirmationTitle} @@ -304,7 +306,8 @@ NavigatorWidget.prototype.generateDraftTitle = function(title) { NavigatorWidget.prototype.handleSaveTiddlerEvent = function(event) { var title = event.param || event.tiddlerTitle, 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 if(tiddler) { var draftTitle = (tiddler.fields["draft.title"] || "").trim(), @@ -313,7 +316,7 @@ NavigatorWidget.prototype.handleSaveTiddlerEvent = function(event) { var isRename = draftOf !== draftTitle, isConfirmed = true; if(isRename && this.wiki.tiddlerExists(draftTitle)) { - isConfirmed = confirm($tw.language.getString( + isConfirmed = win.confirm($tw.language.getString( "ConfirmOverwriteTiddler", {variables: {title: draftTitle} @@ -362,6 +365,7 @@ NavigatorWidget.prototype.handleSaveTiddlerEvent = function(event) { // Take a tiddler out of edit mode without saving the changes NavigatorWidget.prototype.handleCancelTiddlerEvent = function(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 var draftTitle = event.param || event.tiddlerTitle, draftTiddler = this.wiki.getTiddler(draftTitle), @@ -372,7 +376,7 @@ NavigatorWidget.prototype.handleCancelTiddlerEvent = function(event) { originalTiddler = this.wiki.getTiddler(originalTitle), storyList = this.getStoryList(); if(this.wiki.isDraftModified(draftTitle)) { - isConfirmed = confirm($tw.language.getString( + isConfirmed = win.confirm($tw.language.getString( "ConfirmCancelTiddler", {variables: {title: draftTitle}