From 19b7ea9a394af6e8366c64faa77badb716d743a5 Mon Sep 17 00:00:00 2001 From: brettp Date: Sat, 12 Mar 2011 21:51:07 +0000 Subject: Fixes #3065, #3089. Merged JS events and hooks to a single system. Updated plugins and core to use it. Added elgg.getURLFragment() and using it elgg.ui.popsUp(). git-svn-id: http://code.elgg.org/elgg/trunk@8671 36083f99-b078-4883-b0ff-0f9b5a30f544 --- js/tests/ElggEventsTest.js | 28 ---------------------------- js/tests/ElggHooksTest.js | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 js/tests/ElggEventsTest.js create mode 100644 js/tests/ElggHooksTest.js (limited to 'js/tests') diff --git a/js/tests/ElggEventsTest.js b/js/tests/ElggEventsTest.js deleted file mode 100644 index 4765878cf..000000000 --- a/js/tests/ElggEventsTest.js +++ /dev/null @@ -1,28 +0,0 @@ -ElggEventsTest = TestCase("ElggEventsTest"); - -ElggEventsTest.prototype.setUp = function() { - elgg.config.events = {}; - elgg.provide('elgg.config.events.all.all'); -}; - -ElggEventsTest.prototype.testEventHandlersMustBeFunctions = function () { - assertException(function() { elgg.register_event_handler('str', 'str', 'oops'); }); -}; - -ElggEventsTest.prototype.testReturnValueDefaultsToTrue = function () { - assertTrue(elgg.trigger_event('fee', 'fum')); - - elgg.register_event_handler('fee', 'fum', elgg.nullFunction); - assertTrue(elgg.trigger_event('fee', 'fum')); -}; - -ElggEventsTest.prototype.testCanGlomEventsWithAll = function () { - elgg.register_event_handler('all', 'bar', elgg.abstractMethod); - assertException("all,bar", function() { elgg.trigger_event('foo', 'bar'); }); - - elgg.register_event_handler('foo', 'all', elgg.abstractMethod); - assertException("foo,all", function() { elgg.trigger_event('foo', 'baz'); }); - - elgg.register_event_handler('all', 'all', elgg.abstractMethod); - assertException("all,all", function() { elgg.trigger_event('pinky', 'winky'); }); -}; \ No newline at end of file diff --git a/js/tests/ElggHooksTest.js b/js/tests/ElggHooksTest.js new file mode 100644 index 000000000..e7a2440e7 --- /dev/null +++ b/js/tests/ElggHooksTest.js @@ -0,0 +1,28 @@ +ElggHooksTest = TestCase("ElggHooksTest"); + +ElggHooksTest.prototype.setUp = function() { + elgg.config.hooks = {}; + elgg.provide('elgg.config.hooks.all.all'); +}; + +ElggHooksTest.prototype.testHookHandlersMustBeFunctions = function () { + assertException(function() { elgg.register_hook_handler('str', 'str', 'oops'); }); +}; + +ElggHooksTest.prototype.testReturnValueDefaultsToTrue = function () { + assertTrue(elgg.trigger_hook('fee', 'fum')); + + elgg.register_hook_handler('fee', 'fum', elgg.nullFunction); + assertTrue(elgg.trigger_hook('fee', 'fum')); +}; + +ElggHooksTest.prototype.testCanGlomHooksWithAll = function () { + elgg.register_hook_handler('all', 'bar', elgg.abstractMethod); + assertException("all,bar", function() { elgg.trigger_hook('foo', 'bar'); }); + + elgg.register_hook_handler('foo', 'all', elgg.abstractMethod); + assertException("foo,all", function() { elgg.trigger_hook('foo', 'baz'); }); + + elgg.register_hook_handler('all', 'all', elgg.abstractMethod); + assertException("all,all", function() { elgg.trigger_hook('pinky', 'winky'); }); +}; \ No newline at end of file -- cgit v1.2.3