Skip to content

Commit

Permalink
Revert "Merge branch 'master' of git://github.com/keeyip/backgrid-fil…
Browse files Browse the repository at this point in the history
…ter into keeyip-master"

This reverts commit f8ac4fe, reversing
changes made to 408f4f7.

Conflicts:
	AbstractFilter.js
  • Loading branch information
wyuenho committed Jul 28, 2013
1 parent e29e91c commit dcb6bb8
Show file tree
Hide file tree
Showing 7 changed files with 444 additions and 559 deletions.
148 changes: 0 additions & 148 deletions AbstractFilter.js

This file was deleted.

153 changes: 0 additions & 153 deletions ClientSideFilter.js

This file was deleted.

19 changes: 3 additions & 16 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@ module.exports = function (grunt) {
test: {
version: "1.3.1",
src: [
"AbstractFilter.js",
"ServerSideFilter.js",
"ClientSideFilter.js",
"LunrFilter.js",
"backgrid-filter.js"
],
options: {
specs: [
Expand Down Expand Up @@ -65,12 +62,7 @@ module.exports = function (grunt) {
},
jsduck: {
main: {
src: [
"AbstractFilter.js",
"ServerSideFilter.js",
"ClientSideFilter.js",
"LunrFilter.js",
],
src: ["backgrid-filter.js"],
dest: "api",
options: {
"title": "backgrid-filter",
Expand Down Expand Up @@ -107,12 +99,7 @@ module.exports = function (grunt) {
},
"default": {
files: {
"backgrid-filter.min.js": [
"AbstractFilter.js",
"ServerSideFilter.js",
"ClientSideFilter.js",
"LunrFilter.js"
],
"backgrid-filter.min.js": ["backgrid-filter.js"]
}
}
}
Expand Down
Loading

0 comments on commit dcb6bb8

Please sign in to comment.