Merge pull request TryGhost#2168 from halfdan/deregister

Rename unregisterFilter to deregisterFilter
kennym · Feb 10, 2014 · 6b4a1ff · 6b4a1ff
2 parents 0dea6a2 + 3993b67
commit 6b4a1ff
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/core/server/apps/proxy.js b/core/server/apps/proxy.js
@@ -7,7 +7,7 @@ var proxy = {
 
     filters: {
         register: filters.registerFilter.bind(filters),
-        unregister: filters.unregisterFilter.bind(filters)
+        deregister: filters.deregisterFilter.bind(filters)
     },
     helpers: {
         register: helpers.registerThemeHelper.bind(helpers),

diff --git a/core/server/filters.js b/core/server/filters.js
@@ -38,7 +38,7 @@ Filters.prototype.registerFilter = function (name, priority, fn) {
 };
 
 // Unregister a filter callback function
-Filters.prototype.unregisterFilter = function (name, priority, fn) {
+Filters.prototype.deregisterFilter = function (name, priority, fn) {
     // Curry the priority optional parameter to a default of 5
     if (_.isFunction(priority)) {
         fn = priority;
@@ -80,4 +80,4 @@ Filters.prototype.doFilter = function (name, args) {
 };
 
 module.exports = new Filters();
-module.exports.Filters = Filters;
+module.exports.Filters = Filters;
diff --git a/core/test/unit/apps_spec.js b/core/test/unit/apps_spec.js
@@ -57,7 +57,7 @@ describe('Apps', function () {
         it('creates a ghost proxy', function () {
             should.exist(appProxy.filters);
             should.exist(appProxy.filters.register);
-            should.exist(appProxy.filters.unregister);
+            should.exist(appProxy.filters.deregister);
 
             should.exist(appProxy.helpers);
             should.exist(appProxy.helpers.register);