Merge pull request #7885 from le717/remove-abortquit-check

redmunds · redmunds · commit 2f13054bb451 · 2014-05-21T15:06:27.000-07:00
Remove `brackets.app.abortQuit` checks
diff --git a/src/document/DocumentCommandHandlers.js b/src/document/DocumentCommandHandlers.js
@@ -1280,10 +1280,7 @@ define(function (require, exports, module) {
             },
             function () {
                 // if fail, tell the app to abort any pending quit operation.
-                // TODO: remove this if statement when we move to the new CEF3 shell
-                if (brackets.app.abortQuit) {
-                    brackets.app.abortQuit();
-                }
+                brackets.app.abortQuit();
             }
         );
     }
@@ -1311,10 +1308,7 @@ define(function (require, exports, module) {
             },
             function () {
                 // if fail, don't exit: user canceled (or asked us to save changes first, but we failed to do so)
-                // TODO: remove this if statement when we move to the new CEF3 shell
-                if (brackets.app.abortQuit) {
-                    brackets.app.abortQuit();
-                }
+                brackets.app.abortQuit();
             }
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -1280,10 +1280,7 @@ define(function (require, exports, module) {`
`1280`	`1280`	`},`
`1281`	`1281`	`function () {`
`1282`	`1282`	`// if fail, tell the app to abort any pending quit operation.`
`1283`		`- // TODO: remove this if statement when we move to the new CEF3 shell`
`1284`		`- if (brackets.app.abortQuit) {`
`1285`		`- brackets.app.abortQuit();`
`1286`		`- }`
	`1283`	`+ brackets.app.abortQuit();`
`1287`	`1284`	`}`
`1288`	`1285`	`);`
`1289`	`1286`	`}`
`@@ -1311,10 +1308,7 @@ define(function (require, exports, module) {`
`1311`	`1308`	`},`
`1312`	`1309`	`function () {`
`1313`	`1310`	`// if fail, don't exit: user canceled (or asked us to save changes first, but we failed to do so)`
`1314`		`- // TODO: remove this if statement when we move to the new CEF3 shell`
`1315`		`- if (brackets.app.abortQuit) {`
`1316`		`- brackets.app.abortQuit();`
`1317`		`- }`
	`1311`	`+ brackets.app.abortQuit();`
`1318`	`1312`	`}`
`1319`	`1313`	`);`
`1320`	`1314`	`}`