Skip to content
Toggle navigation
Toggle navigation
This project
Loading...
Sign in
brainfood
/
rivets
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Graphs
Network
Create a new issue
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
ca78db6c
authored
2012-07-30 18:42:25 -0700
by
Michael Richards
Browse Files
Options
Browse Files
Tag
Download
Plain Diff
Merge branch 'model-formatter-precedence'
2 parents
2a04d617
08b5320f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
src/rivets.coffee
src/rivets.coffee
View file @
ca78db6
...
...
@@ -32,10 +32,10 @@ class Rivets.Binding
for
formatter
in
@
formatters
args
=
formatter
.
split
/\s+/
id
=
args
.
shift
()
value
=
if
Rivets
.
config
.
formatters
&&
Rivets
.
config
.
formatters
[
id
]
Rivets
.
config
.
formatters
[
id
]
value
,
args
...
else
value
=
if
@
model
[
id
]
instanceof
Function
@
model
[
id
]
value
,
args
...
else
if
Rivets
.
config
.
formatters
[
id
]
Rivets
.
config
.
formatters
[
id
]
value
,
args
...
value
...
...
@@ -194,6 +194,7 @@ Rivets.routines =
# Default configuration.
Rivets
.
config
=
preloadData
:
true
formatters
:
{}
# The rivets module. This is the public interface that gets exported.
rivets
=
...
...
Please
register
or
sign in
to post a comment