From 930a5ff5c77279f7976c8e9bc96589cbc3d58efe Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Thu, 10 Nov 2011 17:13:36 -0800 Subject: [PATCH] making close work --- src/atom/browser.coffee | 4 ++-- src/atom/document.coffee | 1 + src/atom/editor.coffee | 14 +++++++------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/atom/browser.coffee b/src/atom/browser.coffee index d4ef25298..22cc25bd3 100644 --- a/src/atom/browser.coffee +++ b/src/atom/browser.coffee @@ -12,8 +12,8 @@ class Browser extends Document $ "" constructor: (@path) -> - @html.html @iframe() + @html.html @iframe().bind 'load', (e) => + window.setTitle e.target.contentWindow.document.title @show() - atom.trigger 'browser:load', this super() diff --git a/src/atom/document.coffee b/src/atom/document.coffee index d756b109b..0754465d9 100644 --- a/src/atom/document.coffee +++ b/src/atom/document.coffee @@ -26,5 +26,6 @@ class Document extends Pane @constructor is Document.handler path close: -> + window.close() save: -> diff --git a/src/atom/editor.coffee b/src/atom/editor.coffee index d1c9ce26d..57e030e28 100644 --- a/src/atom/editor.coffee +++ b/src/atom/editor.coffee @@ -95,15 +95,15 @@ class Editor extends Document else "An untitled file has changes." - canceled = atom.native.alert "Do you want to save your changes?", + close = atom.native.alert "Do you want to save your changes?", detailedMessage, - "Save": => - # if save modal fails/cancels, consider it cancelled - not @save() - "Cancel": => true - "Don't Save": => false + "Save": => @save() + "Cancel": => false + "Don't Save": => true - return if canceled + return if not close + + super save: -> return @saveAs() if not @path