Skip to content

Enabled firebase to be called as function, thus enabling patterns where Firebase ref's are stored in root component #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Sep 9, 2016
Merged

Enabled firebase to be called as function, thus enabling patterns where Firebase ref's are stored in root component #25

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5f52e88
Enabled firebase to be called as function
DaBs Aug 10, 2016
852cd5b
Added basic test case for ability to run as function
Aug 11, 2016
327203a
Deleted compiled files
Aug 11, 2016
a11bedd
Revert "Deleted compiled files"
posva Jul 29, 2016
f9c7112
Revert "Revert "Deleted compiled files""
DaBs Aug 11, 2016
530dfef
Revert "Deleted compiled files"
DaBs Aug 11, 2016
3e67330
Changes to test spec
DaBs Aug 11, 2016
8af7c23
Updated test to be more simple
DaBs Aug 14, 2016
9846ea9
Removed regex from throw, added Sinon spy to call
DaBs Aug 22, 2016
5c5acc6
Changed line order of check
DaBs Aug 23, 2016
5c39b0e
Moved the correct line :P
DaBs Aug 23, 2016
80c24fc
Reverted changes to dist files
DaBs Aug 30, 2016
46e7003
Merge branch 'master' of github.com:DaBs/vuefire
DaBs Aug 30, 2016
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
1 change: 1 addition & 0 deletions dist/vuefire.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ return /******/ (function(modules) { // webpackBootstrap
var init = function () {
var bindings = this.$options.firebase
if (!bindings) return
if (typeof bindings === 'function') bindings = bindings.call(this)
ensureRefs(this)
for (var key in bindings) {
bind(this, key, bindings[key])
Expand Down
2 changes: 1 addition & 1 deletion dist/vuefire.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion src/vuefire.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,9 @@ function ensureRefs (vm) {
}

var init = function () {
if (!this.$options.firebase) return
Copy link
Member

Choose a reason for hiding this comment

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

I wasn't clear about this, sorry. I was thinking about this:

var bindings = this.$options.firebase
if (typeof bindings === 'function') bindings = bindings.call(this)
if (!bindings) return

var bindings = this.$options.firebase
if (!bindings) return
if (typeof bindings === 'function') bindings = bindings.call(this)
ensureRefs(this)
for (var key in bindings) {
bind(this, key, bindings[key])
Expand Down
13 changes: 13 additions & 0 deletions tests/vuefire.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,19 @@ describe('VueFire', function () {
})
})

describe('support Function options', function () {
it('option is callable as function', function (done) {
var spy = sinon.spy()
expect(function () {
new Vue({
firebase: spy
}).$mount()
}).to.not.throw()
expect(spy.calledOnce).to.be.true
done()
})
})

describe('bind as Array', function () {
it('throws error for invalid firebase ref', function () {
helpers.invalidFirebaseRefs.forEach(function (ref) {
Expand Down