Skip to content
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

Jump to bottom

visible scope and callback as string #31

Merged
merged 1 commit into from
Dec 14, 2012
Merged

visible scope and callback as string #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions backbone.stickit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
// view element.
if (config.visible) {
visibleCb = function() {
updateVisibleBindEl($el, getVal(model, modelAttr, config, self), modelAttr, config, this);
updateVisibleBindEl($el, getVal(model, modelAttr, config, self), modelAttr, config, self);
};
observeModelEvent('change:' + modelAttr, visibleCb);
visibleCb();
Expand Down Expand Up @@ -231,7 +231,7 @@
var visible = config.visible, visibleFn = config.visibleFn, isVisible = !!val;

// If `visible` is a function then it should return a boolean result to show/hide.
if (_.isFunction(visible)) isVisible = applyViewFn(context, visible, val, attrName);
if (_.isFunction(visible) || _.isString(visible)) isVisible = applyViewFn(context, visible, val, attrName);

// Either use the custom `visibleFn`, if provided, or execute a standard jQuery show/hide.
if (visibleFn) applyViewFn(context, visibleFn, $el, isVisible, attrName);
Expand Down