Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

resond to comments

  • Loading branch information...
commit 0c24e27b118f30c49131b266777d209d28ea2bf1 1 parent ee81a2d
@chrisbank chrisbank authored
View
BIN  bin/mac/Brackets.app/Contents/MacOS/Brackets
Binary file not shown
View
5 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:
View
4 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:
View
13 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;
}
View
6 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);
};
-})();;
+})();
Please sign in to comment.
Something went wrong with that request. Please try again.