Skip to content

Allow libraries loaded before ember to tie into ember load hooks #1861

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

Merged
merged 1 commit into from
Jan 24, 2013
Merged

Allow libraries loaded before ember to tie into ember load hooks #1861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion packages/ember-runtime/lib/system/lazy_load.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@submodule ember-runtime
*/

var loadHooks = {};
var loadHooks = Ember.ENV.EMBER_LOAD_HOOKS || {};
var loaded = {};

/**
Expand Down
12 changes: 12 additions & 0 deletions packages/ember-runtime/tests/system/lazy_load_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,15 @@ test("if runLoadHooks was already run, it executes newly added hooks immediately

equal(count, 1, "the original object was passed into the load hook");
});

test("hooks in ENV.EMBER_LOAD_HOOKS['hookName'] get executed", function() {

// Note that the necessary code to perform this test is run before
// the Ember lib is loaded in tests/index.html

Ember.run(function() {
Ember.runLoadHooks("__before_ember_test_hook__", 1);
});

equal(window.ENV.__test_hook_count__, 1, "the object was passed into the load hook");
});
8 changes: 8 additions & 0 deletions tests/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,14 @@
}
window.ENV = window.ENV || {};

// Test for "hooks in ENV.EMBER_LOAD_HOOKS['hookName'] get executed"
ENV.EMBER_LOAD_HOOKS = ENV.EMBER_LOAD_HOOKS || {};
ENV.EMBER_LOAD_HOOKS.__before_ember_test_hook__ = ENV.EMBER_LOAD_HOOKS.__before_ember_test_hook__ || [];
ENV.__test_hook_count__ = 0;
ENV.EMBER_LOAD_HOOKS.__before_ember_test_hook__.push(function(object) {
ENV.__test_hook_count__ += object;
});

// Handle extending prototypes
QUnit.config.urlConfig.push('extendprototypes');

Expand Down