Resolve the issue with the default scope being overriden #9047

Merged
merged 2 commits into from Sep 15, 2014

Projects

None yet

2 participants

@busykai
Member
busykai commented Sep 10, 2014

The default's scope load() was executing after the scope was already filled out with preferences.

Also, re-work adding to scope using explicit shadow entry state tracking (instead of promises).

cc: @redmunds

@redmunds redmunds self-assigned this Sep 10, 2014
@redmunds redmunds commented on the diff Sep 15, 2014
src/preferences/PreferencesBase.js
@@ -1613,12 +1605,12 @@ define(function (require, exports, module) {
this._nextSave = {};
Async.doInParallel(_.values(this._scopes), function (scope) {
- if (scope) {
- return scope.save();
- } else {
- return Promise.resolve();
- }
- }.bind(this))
+ if (scope) {
+ return scope.save();
+ } else {
+ return Promise.resolve();
+ }
+ })
@redmunds
redmunds Sep 15, 2014 Contributor

JSLlint is complaining about this block being indented.

@redmunds redmunds commented on the diff Sep 15, 2014
src/brackets.js
@@ -216,7 +216,6 @@ define(function (require, exports, module) {
* Setup Brackets
*/
function _onReady() {
-window.alert("brackets.js _onReady()");
@redmunds
redmunds Sep 15, 2014 Contributor

Ooops! :)

@redmunds
Contributor

Thanks. I'm going to merge and fix the JSLint errors. I'm also seeing a weird problem with Recent Project dropdown, but I suspect this branch just needs to be merged with master.

@redmunds redmunds merged commit 4aa4f2a into promises-upgrade Sep 15, 2014
@redmunds redmunds deleted the kai/promises-upgrade branch Sep 15, 2014
@busykai
Member
busykai commented Sep 16, 2014

Yeah, I need to get to multiple linters ASAP... Switching between linters is something I always forget to do. Sorry!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment