resond to comments

netconstructor · Mar 29, 2012 · 0c24e27 · 0c24e27
1 parent ee81a2d
commit 0c24e27
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 19 deletions.
diff --git a/bin/mac/Brackets.app/Contents/MacOS/Brackets b/bin/mac/Brackets.app/Contents/MacOS/Brackets
diff --git a/bin/mac/Brackets.app/Contents/Resources/brackets_extensions.js b/bin/mac/Brackets.app/Contents/Resources/brackets_extensions.js
@@ -308,6 +308,7 @@ if (!brackets.app) {
      *          NO_ERROR
      *          ERR_INVALID_PARAMS - invalid parameters
      *          ERR_UNKNOWN - unable to launch the browser
+     *          ERR_NOT_FOUND - unable to find a browers to launch
      *
      * @return None. This is an asynchronous call that sends all return information to the callback.
      */
@@ -321,8 +322,8 @@ if (!brackets.app) {
 
     /**
      * Attempts to close the live browser. The browser can still give the user a chance to override
-     * the close attempt if there is a page with unsaved changes. This function does not wait to see
-     * if the browser actually closed or not.
+     * the close attempt if there is a page with unsaved changes. This function will fire the
+     * callback when the browser is closed (No_ERROR) or after a three minute timeout (ERR_UNKNOWN). 
      *
      * @param {function(err)} callback Asynchronous callback function with one argument (the error)
      *        Possible error values:

diff --git a/src/mac/Resources/brackets_extensions.js b/src/mac/Resources/brackets_extensions.js
@@ -322,8 +322,8 @@ if (!brackets.app) {
 
     /**
      * Attempts to close the live browser. The browser can still give the user a chance to override
-     * the close attempt if there is a page with unsaved changes. This function does not wait to see
-     * if the browser actually closed or not.
+     * the close attempt if there is a page with unsaved changes. This function will fire the
+     * callback when the browser is closed (No_ERROR) or after a three minute timeout (ERR_UNKNOWN). 
      *
      * @param {function(err)} callback Asynchronous callback function with one argument (the error)
      *        Possible error values:

diff --git a/src/mac/cefclient/brackets_extensions.mm b/src/mac/cefclient/brackets_extensions.mm
@@ -41,18 +41,7 @@ - (void)timeoutTimer:(NSTimer*)timer;
     }
 
     virtual ~BracketsExtensionHandler() {
-        if (m_chromeTerminateObserver) {
-            [[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:m_chromeTerminateObserver];
-            [m_chromeTerminateObserver release];
-            m_chromeTerminateObserver = nil;
-        }
-
-        if (m_closeLiveBrowserTimeoutTimer) {
-            [m_closeLiveBrowserTimeoutTimer invalidate];
-            [m_closeLiveBrowserTimeoutTimer release];
-            m_closeLiveBrowserTimeoutTimer = nil;
-        }
-
+        CloseLiveBrowserKillTimers();        
         s_instance = nil;
     }
 

diff --git a/src/win/cefclient/res/brackets_extensions.js b/src/win/cefclient/res/brackets_extensions.js
@@ -322,8 +322,8 @@ if (!brackets.app) {
 
     /**
      * Attempts to close the live browser. The browser can still give the user a chance to override
-     * the close attempt if there is a page with unsaved changes. This function does not wait to see
-     * if the browser actually closed or not.
+     * the close attempt if there is a page with unsaved changes. This function will fire the
+     * callback when the browser is closed (No_ERROR) or after a three minute timeout (ERR_UNKNOWN). 
      *
      * @param {function(err)} callback Asynchronous callback function with one argument (the error)
      *        Possible error values:
@@ -338,4 +338,4 @@ if (!brackets.app) {
         CloseLiveBrowser(callback);
     };
 
-})();;
+})();