Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Force startup-wrapper logic to run less times #1848

Merged
merged 2 commits into from
Dec 27, 2021
Merged

Force startup-wrapper logic to run less times #1848

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4421bca
Force startup-wrapper logic to run less times.
RobbieTheWagner Dec 16, 2021
ce7571c
Update startup-wrapper.js
RobbieTheWagner Dec 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 12 additions & 20 deletions ember_debug/vendor/startup-wrapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
let Ember;
try {
Ember = requireModule('ember')['default'];
} catch {
Ember = window.Ember;
}

/* eslint camelcase:0 */
/**
Expand Down Expand Up @@ -59,7 +54,11 @@ var EMBER_VERSIONS_SUPPORTED = {{EMBER_VERSIONS_SUPPORTED}};
};
});

window.EmberInspector = requireModule('ember-debug/main')['default'];
let emberDebugMainModule = requireModule('ember-debug/main');
if (!emberDebugMainModule['default']) {
return;
}
window.EmberInspector = emberDebugMainModule['default'];
window.EmberInspector.Adapter = requireModule('ember-debug/adapters/' + adapter)['default'];

onApplicationStart(function appStarted(instance) {
Expand Down Expand Up @@ -111,11 +110,12 @@ var EMBER_VERSIONS_SUPPORTED = {{EMBER_VERSIONS_SUPPORTED}};
return;
}

let Ember;
try {
Ember = requireModule('ember')['default'];
} catch {
Ember = window.Ember;
if (!Ember) {
try {
Ember = requireModule('ember')['default'];
} catch {
Ember = window.Ember;
}
}

if (!Ember) {
Expand All @@ -131,15 +131,7 @@ var EMBER_VERSIONS_SUPPORTED = {{EMBER_VERSIONS_SUPPORTED}};
};

// Newest Ember versions >= 1.10
window.addEventListener('Ember', triggerOnce, false);
// Old Ember versions
window.addEventListener('Ember.Application', function() {
if (Ember && Ember.VERSION && compareVersion(Ember.VERSION, '1.10.0') === 1) {
// Ember >= 1.10 should be handled by `Ember` load hook instead.
return;
}
triggerOnce();
}, false);
window.addEventListener('Ember', triggerOnce, { once: true });
// Oldest Ember versions or if this was injected after Ember has loaded.
onReady(triggerOnce);
}
Expand Down