Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,12 @@ module.exports = function (grunt) {
grunt.registerTask('cover', ['karma:coverage'])
grunt.registerTask('test', ['unit', 'cover', 'casper'])
grunt.registerTask('sauce', ['karma:sauce1', 'karma:sauce2', 'karma:sauce3'])
grunt.registerTask('ci', ['eslint', 'cover', 'codecov', 'build', 'casper', 'sauce'])
grunt.registerTask('default', ['eslint', 'build', 'test'])

// CI
if (process.env.CI_PULL_REQUEST) {
grunt.registerTask('ci', ['eslint', 'cover', 'build', 'casper'])
} else {
grunt.registerTask('ci', ['eslint', 'cover', 'codecov', 'build', 'casper', 'sauce'])
}
}
8 changes: 8 additions & 0 deletions src/filters/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,14 @@ exports.key = function (handler, key) {
// expose keycode hash
exports.key.keyCodes = keyCodes

exports.debounce = function (handler, delay) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This implementation doesn't pass on the arguments the handler gets. In fact you can just use the internal _.debounce to wrap the handler.

if (!handler) return
if (!delay) {
delay = 300
}
return _.debounce(handler, delay)
}

/**
* Install special array filters
*/
Expand Down
2 changes: 1 addition & 1 deletion src/instance/scope.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ exports._initProps = function () {
}
// make sure to convert string selectors into element now
el = options.el = _.query(el)
this._propsUnlinkFn = el && props
this._propsUnlinkFn = el && el.nodeType === 1 && props
? compiler.compileAndLinkProps(
this, el, props
)
Expand Down
7 changes: 4 additions & 3 deletions src/parsers/directive.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var _ = require('../util')
var Cache = require('../cache')
var cache = new Cache(1000)
var argRE = /^[^\{\?]+$|^'[^']*'$|^"[^"]*"$/
var filterTokenRE = /[^\s'"]+|'[^']+'|"[^"]+"/g
var filterTokenRE = /[^\s'"]+|'[^']*'|"[^"]*"/g
var reservedArgRE = /^in$|^-?\d+/

/**
Expand Down Expand Up @@ -71,9 +71,10 @@ function processFilterArg (arg) {
var stripped = reservedArgRE.test(arg)
? arg
: _.stripQuotes(arg)
var dynamic = stripped === false
return {
value: stripped || arg,
dynamic: !stripped
value: dynamic ? arg : stripped,
dynamic: dynamic
}
}

Expand Down
25 changes: 25 additions & 0 deletions test/unit/specs/filters/filters_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,31 @@ describe('Filters', function () {
expect(spy).toHaveBeenCalled()
})

it('debounce', function (done) {
var filter = filters.debounce
expect(filter(null)).toBeUndefined()
var spy = jasmine.createSpy('filter:debounce')
var handler = filter(spy)
handler()
expect(spy).not.toHaveBeenCalled()
handler = filter(spy)
handler()
setTimeout(function () {
expect(spy).toHaveBeenCalled()
}, 400)
var spy2 = jasmine.createSpy('filter:debounce')
handler = filter(spy2, 450)
handler()
handler()
setTimeout(function () {
expect(spy2).not.toHaveBeenCalled()
}, 400)
setTimeout(function () {
expect(spy2.calls.count()).toBe(1)
done()
}, 500)
})

it('filterBy', function () {
var filter = filters.filterBy
var arr = [
Expand Down
8 changes: 5 additions & 3 deletions test/unit/specs/parsers/directive_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,20 @@ describe('Directive Parser', function () {
})

it('with filters', function () {
var res = parse(' arg : exp | abc de \'ok\' | bcd')
var res = parse(' arg : exp | abc de \'ok\' \'\' | bcd')
expect(res.length).toBe(1)
expect(res[0].expression).toBe('exp')
expect(res[0].arg).toBe('arg')
expect(res[0].raw).toBe('arg : exp | abc de \'ok\' | bcd')
expect(res[0].raw).toBe('arg : exp | abc de \'ok\' \'\' | bcd')
expect(res[0].filters.length).toBe(2)
expect(res[0].filters[0].name).toBe('abc')
expect(res[0].filters[0].args.length).toBe(2)
expect(res[0].filters[0].args.length).toBe(3)
expect(res[0].filters[0].args[0].value).toBe('de')
expect(res[0].filters[0].args[0].dynamic).toBe(true)
expect(res[0].filters[0].args[1].value).toBe('ok')
expect(res[0].filters[0].args[1].dynamic).toBe(false)
expect(res[0].filters[0].args[2].value).toBe('')
expect(res[0].filters[0].args[2].dynamic).toBe(false)
expect(res[0].filters[1].name).toBe('bcd')
expect(res[0].filters[1].args).toBeUndefined()
})
Expand Down