mirror of
https://github.com/kbparagua/paloma
synced 2023-03-27 23:21:17 -04:00
Working with fucking filters
This commit is contained in:
parent
55228d2ec3
commit
ba200271f3
2 changed files with 3 additions and 3 deletions
|
@ -151,7 +151,7 @@ describe 'Paloma.FilterScope', :type => :feature, :js => true do
|
||||||
include_examples 'filters', false # non-namespaced filters
|
include_examples 'filters', false # non-namespaced filters
|
||||||
include_examples 'filters', true # namespaced filters
|
include_examples 'filters', true # namespaced filters
|
||||||
|
|
||||||
#include_examples 'skip filters', 'before'
|
include_examples 'skip filters', 'before'
|
||||||
#include_examples 'skip filters', 'after'
|
#include_examples 'skip filters', 'after'
|
||||||
#include_examples 'skip filters', 'around'
|
#include_examples 'skip filters', 'around'
|
||||||
end
|
end
|
||||||
|
|
4
vendor/assets/javascripts/paloma_core.js
vendored
4
vendor/assets/javascripts/paloma_core.js
vendored
|
@ -61,7 +61,7 @@ Paloma._getOrderedFilters = function(before_or_after, namespace, controller, act
|
||||||
|
|
||||||
if (controllerFilters !== undefined){
|
if (controllerFilters !== undefined){
|
||||||
controllerFilters = controllerFilters.concat(Paloma._filters['around'][controller] || []);
|
controllerFilters = controllerFilters.concat(Paloma._filters['around'][controller] || []);
|
||||||
|
|
||||||
// Select applicable filters for the passed action
|
// Select applicable filters for the passed action
|
||||||
for (var i = 0, n = controllerFilters.length; i < n; i++){
|
for (var i = 0, n = controllerFilters.length; i < n; i++){
|
||||||
var filter = controllerFilters[i];
|
var filter = controllerFilters[i];
|
||||||
|
@ -87,7 +87,7 @@ Paloma.FilterScope = function(name){
|
||||||
this.skipFilters = [];
|
this.skipFilters = [];
|
||||||
this.skipFilterType = undefined;
|
this.skipFilterType = undefined;
|
||||||
this.skipType = 'all';
|
this.skipType = 'all';
|
||||||
|
|
||||||
Paloma._scopes[name] = this;
|
Paloma._scopes[name] = this;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue