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
0e79195d
authored
2012-07-29 17:18:42 -0700
by
Michael Richards
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
Add support for direct property access on models.
1 parent
7a99780e
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
3 deletions
lib/rivets.js
lib/rivets.min.js
src/rivets.coffee
lib/rivets.js
View file @
0e79195
...
...
@@ -71,10 +71,14 @@
Binding
.
prototype
.
bind
=
function
()
{
var
_ref
;
if
(
this
.
options
.
bypass
)
{
this
.
set
(
this
.
model
[
this
.
keypath
]);
}
else
{
Rivets
.
config
.
adapter
.
subscribe
(
this
.
model
,
this
.
keypath
,
this
.
set
);
if
(
Rivets
.
config
.
preloadData
)
{
this
.
set
(
Rivets
.
config
.
adapter
.
read
(
this
.
model
,
this
.
keypath
));
}
}
if
(
_ref
=
this
.
type
,
__indexOf
.
call
(
this
.
bidirectionals
,
_ref
)
>=
0
)
{
return
bindEvent
(
this
.
el
,
'change'
,
this
.
publish
);
}
...
...
@@ -155,7 +159,7 @@
path
=
pipes
.
shift
().
split
(
/
(\.
|:
)
/
);
options
.
formatters
=
pipes
;
model
=
_this
.
models
[
path
.
shift
()];
path
.
shift
()
;
options
.
bypass
=
path
.
shift
()
===
':'
;
keypath
=
path
.
join
();
if
(
eventRegExp
.
test
(
type
))
{
type
=
type
.
replace
(
eventRegExp
,
''
);
...
...
lib/rivets.min.js
View file @
0e79195
...
...
@@ -2,4 +2,4 @@
// version: 0.2.4
// author: Michael Richards
// license: MIT
(
function
(){
var
a
,
b
,
c
,
d
,
e
,
f
,
g
,
h
=
function
(
a
,
b
){
return
function
(){
return
a
.
apply
(
b
,
arguments
)}},
i
=
[].
slice
,
j
=
[].
indexOf
||
function
(
a
){
for
(
var
b
=
0
,
c
=
this
.
length
;
b
<
c
;
b
++
)
if
(
b
in
this
&&
this
[
b
]
===
a
)
return
b
;
return
-
1
};
a
=
{},
String
.
prototype
.
trim
||
(
String
.
prototype
.
trim
=
function
(){
return
this
.
replace
(
/^
\s
+|
\s
+$/g
,
""
)}),
a
.
Binding
=
function
(){
function
f
(
c
,
e
,
f
,
g
,
i
){
this
.
el
=
c
,
this
.
type
=
e
,
this
.
model
=
f
,
this
.
keypath
=
g
,
this
.
options
=
i
!=
null
?
i
:{},
this
.
unbind
=
h
(
this
.
unbind
,
this
),
this
.
publish
=
h
(
this
.
publish
,
this
),
this
.
bind
=
h
(
this
.
bind
,
this
),
this
.
set
=
h
(
this
.
set
,
this
),
this
.
formattedValue
=
h
(
this
.
formattedValue
,
this
),
this
.
options
.
special
===
"event"
?
this
.
routine
=
d
(
this
.
type
):
this
.
routine
=
a
.
routines
[
this
.
type
]
||
b
(
this
.
type
),
this
.
formatters
=
this
.
options
.
formatters
||
[]}
return
f
.
prototype
.
bidirectionals
=
[
"value"
,
"checked"
,
"unchecked"
],
f
.
prototype
.
formattedValue
=
function
(
b
){
var
c
,
d
,
e
,
f
,
g
,
h
,
j
;
h
=
this
.
formatters
;
for
(
f
=
0
,
g
=
h
.
length
;
f
<
g
;
f
++
)
d
=
h
[
f
],
c
=
d
.
split
(
/
\s
+/
),
e
=
c
.
shift
(),
b
=
(
j
=
a
.
config
.
formatters
)[
e
].
apply
(
j
,[
b
].
concat
(
i
.
call
(
c
)));
return
b
},
f
.
prototype
.
set
=
function
(
a
){
return
a
=
this
.
formattedValue
(
a
),
this
.
options
.
special
===
"event"
?(
this
.
routine
(
this
.
el
,
a
,
this
.
currentListener
),
this
.
currentListener
=
a
):(
a
instanceof
Function
&&
(
a
=
a
()),
this
.
routine
(
this
.
el
,
a
))},
f
.
prototype
.
bind
=
function
(){
var
b
;
a
.
config
.
adapter
.
subscribe
(
this
.
model
,
this
.
keypath
,
this
.
set
),
a
.
config
.
preloadData
&&
this
.
set
(
a
.
config
.
adapter
.
read
(
this
.
model
,
this
.
keypath
));
if
(
b
=
this
.
type
,
j
.
call
(
this
.
bidirectionals
,
b
)
>=
0
)
return
c
(
this
.
el
,
"change"
,
this
.
publish
)},
f
.
prototype
.
publish
=
function
(
b
){
var
c
;
return
c
=
b
.
target
||
b
.
srcElement
,
a
.
config
.
adapter
.
publish
(
this
.
model
,
this
.
keypath
,
e
(
c
))},
f
.
prototype
.
unbind
=
function
(){
var
b
;
a
.
config
.
adapter
.
unsubscribe
(
this
.
model
,
this
.
keypath
,
this
.
set
);
if
(
b
=
this
.
type
,
j
.
call
(
this
.
bidirectionals
,
b
)
>=
0
)
return
this
.
el
.
removeEventListener
(
"change"
,
this
.
publish
)},
f
}(),
a
.
View
=
function
(){
function
b
(
a
,
b
){
this
.
els
=
a
,
this
.
models
=
b
,
this
.
unbind
=
h
(
this
.
unbind
,
this
),
this
.
bind
=
h
(
this
.
bind
,
this
),
this
.
build
=
h
(
this
.
build
,
this
),
this
.
bindingRegExp
=
h
(
this
.
bindingRegExp
,
this
),
this
.
els
.
jquery
||
this
.
els
instanceof
Array
||
(
this
.
els
=
[
this
.
els
]),
this
.
build
()}
return
b
.
prototype
.
bindingRegExp
=
function
(){
var
b
;
return
b
=
a
.
config
.
prefix
,
b
?
new
RegExp
(
"^data-"
+
b
+
"-"
):
/^data-/
},
b
.
prototype
.
build
=
function
(){
var
b
,
c
,
d
,
e
,
f
,
g
,
h
,
i
,
j
,
k
=
this
;
this
.
bindings
=
[],
b
=
this
.
bindingRegExp
(),
d
=
/^on-/
,
f
=
function
(
c
){
var
e
,
f
,
g
,
h
,
i
,
j
,
l
,
m
,
n
,
o
,
p
,
q
;
p
=
c
.
attributes
,
q
=
[];
for
(
n
=
0
,
o
=
p
.
length
;
n
<
o
;
n
++
)
e
=
p
[
n
],
b
.
test
(
e
.
name
)?(
h
=
{},
m
=
e
.
name
.
replace
(
b
,
""
),
l
=
function
(){
var
a
,
b
,
c
,
d
;
c
=
e
.
value
.
split
(
"|"
),
d
=
[];
for
(
a
=
0
,
b
=
c
.
length
;
a
<
b
;
a
++
)
j
=
c
[
a
],
d
.
push
(
j
.
trim
());
return
d
}(),
i
=
l
.
shift
().
split
(
/
(\.
|:
)
/
),
h
.
formatters
=
l
,
g
=
k
.
models
[
i
.
shift
()],
i
.
shift
(),
f
=
i
.
join
(),
d
.
test
(
m
)
&&
(
m
=
m
.
replace
(
d
,
""
),
h
.
special
=
"event"
),
q
.
push
(
k
.
bindings
.
push
(
new
a
.
Binding
(
c
,
m
,
g
,
f
,
h
)))):
q
.
push
(
void
0
);
return
q
},
i
=
this
.
els
,
j
=
[];
for
(
g
=
0
,
h
=
i
.
length
;
g
<
h
;
g
++
)
c
=
i
[
g
],
f
(
c
),
j
.
push
(
function
(){
var
a
,
b
,
d
,
g
;
d
=
c
.
getElementsByTagName
(
"*"
),
g
=
[];
for
(
a
=
0
,
b
=
d
.
length
;
a
<
b
;
a
++
)
e
=
d
[
a
],
g
.
push
(
f
(
e
));
return
g
}());
return
j
},
b
.
prototype
.
bind
=
function
(){
var
a
,
b
,
c
,
d
,
e
;
d
=
this
.
bindings
,
e
=
[];
for
(
b
=
0
,
c
=
d
.
length
;
b
<
c
;
b
++
)
a
=
d
[
b
],
e
.
push
(
a
.
bind
());
return
e
},
b
.
prototype
.
unbind
=
function
(){
var
a
,
b
,
c
,
d
,
e
;
d
=
this
.
bindings
,
e
=
[];
for
(
b
=
0
,
c
=
d
.
length
;
b
<
c
;
b
++
)
a
=
d
[
b
],
e
.
push
(
a
.
unbind
());
return
e
},
b
}(),
c
=
function
(
a
,
b
,
c
){
return
window
.
addEventListener
?
a
.
addEventListener
(
b
,
c
):
a
.
attachEvent
(
b
,
c
)},
g
=
function
(
a
,
b
,
c
){
return
window
.
removeEventListener
?
a
.
removeEventListener
(
b
,
c
):
a
.
detachEvent
(
b
,
c
)},
e
=
function
(
a
){
switch
(
a
.
type
){
case
"text"
:
case
"textarea"
:
case
"password"
:
case
"select-one"
:
case
"radio"
:
return
a
.
value
;
case
"checkbox"
:
return
a
.
checked
}},
d
=
function
(
a
){
return
function
(
b
,
d
,
e
){
d
&&
c
(
b
,
a
,
d
);
if
(
e
)
return
g
(
b
,
a
,
e
)}},
b
=
function
(
a
){
return
function
(
b
,
c
){
return
c
?
b
.
setAttribute
(
a
,
c
):
b
.
removeAttribute
(
a
)}},
a
.
routines
=
{
enabled
:
function
(
a
,
b
){
return
a
.
disabled
=!
b
},
disabled
:
function
(
a
,
b
){
return
a
.
disabled
=!!
b
},
checked
:
function
(
a
,
b
){
return
a
.
type
===
"radio"
?
a
.
checked
=
a
.
value
===
b
:
a
.
checked
=!!
b
},
unchecked
:
function
(
a
,
b
){
return
a
.
type
===
"radio"
?
a
.
checked
=
a
.
value
!==
b
:
a
.
checked
=!
b
},
show
:
function
(
a
,
b
){
return
a
.
style
.
display
=
b
?
""
:
"none"
},
hide
:
function
(
a
,
b
){
return
a
.
style
.
display
=
b
?
"none"
:
""
},
html
:
function
(
a
,
b
){
return
a
.
innerHTML
=
b
||
""
},
value
:
function
(
a
,
b
){
return
a
.
value
=
b
||
""
},
text
:
function
(
a
,
b
){
return
a
.
innerText
!=
null
?
a
.
innerText
=
b
||
""
:
a
.
textContent
=
b
||
""
}},
a
.
config
=
{
preloadData
:
!
0
},
f
=
{
routines
:
a
.
routines
,
config
:
a
.
config
,
configure
:
function
(
b
){
var
c
,
d
,
e
;
b
==
null
&&
(
b
=
{}),
e
=
[];
for
(
c
in
b
)
d
=
b
[
c
],
e
.
push
(
a
.
config
[
c
]
=
d
);
return
e
},
bind
:
function
(
b
,
c
){
var
d
;
return
c
==
null
&&
(
c
=
{}),
d
=
new
a
.
View
(
b
,
c
),
d
.
bind
(),
d
}},
typeof
module
!=
"undefined"
&&
module
!==
null
?
module
.
exports
=
f
:
this
.
rivets
=
f
}).
call
(
this
);
\ No newline at end of file
(
function
(){
var
a
,
b
,
c
,
d
,
e
,
f
,
g
,
h
=
function
(
a
,
b
){
return
function
(){
return
a
.
apply
(
b
,
arguments
)}},
i
=
[].
slice
,
j
=
[].
indexOf
||
function
(
a
){
for
(
var
b
=
0
,
c
=
this
.
length
;
b
<
c
;
b
++
)
if
(
b
in
this
&&
this
[
b
]
===
a
)
return
b
;
return
-
1
};
a
=
{},
String
.
prototype
.
trim
||
(
String
.
prototype
.
trim
=
function
(){
return
this
.
replace
(
/^
\s
+|
\s
+$/g
,
""
)}),
a
.
Binding
=
function
(){
function
f
(
c
,
e
,
f
,
g
,
i
){
this
.
el
=
c
,
this
.
type
=
e
,
this
.
model
=
f
,
this
.
keypath
=
g
,
this
.
options
=
i
!=
null
?
i
:{},
this
.
unbind
=
h
(
this
.
unbind
,
this
),
this
.
publish
=
h
(
this
.
publish
,
this
),
this
.
bind
=
h
(
this
.
bind
,
this
),
this
.
set
=
h
(
this
.
set
,
this
),
this
.
formattedValue
=
h
(
this
.
formattedValue
,
this
),
this
.
options
.
special
===
"event"
?
this
.
routine
=
d
(
this
.
type
):
this
.
routine
=
a
.
routines
[
this
.
type
]
||
b
(
this
.
type
),
this
.
formatters
=
this
.
options
.
formatters
||
[]}
return
f
.
prototype
.
bidirectionals
=
[
"value"
,
"checked"
,
"unchecked"
],
f
.
prototype
.
formattedValue
=
function
(
b
){
var
c
,
d
,
e
,
f
,
g
,
h
,
j
;
h
=
this
.
formatters
;
for
(
f
=
0
,
g
=
h
.
length
;
f
<
g
;
f
++
)
d
=
h
[
f
],
c
=
d
.
split
(
/
\s
+/
),
e
=
c
.
shift
(),
b
=
(
j
=
a
.
config
.
formatters
)[
e
].
apply
(
j
,[
b
].
concat
(
i
.
call
(
c
)));
return
b
},
f
.
prototype
.
set
=
function
(
a
){
return
a
=
this
.
formattedValue
(
a
),
this
.
options
.
special
===
"event"
?(
this
.
routine
(
this
.
el
,
a
,
this
.
currentListener
),
this
.
currentListener
=
a
):(
a
instanceof
Function
&&
(
a
=
a
()),
this
.
routine
(
this
.
el
,
a
))},
f
.
prototype
.
bind
=
function
(){
var
b
;
this
.
options
.
bypass
?
this
.
set
(
this
.
model
[
this
.
keypath
]):(
a
.
config
.
adapter
.
subscribe
(
this
.
model
,
this
.
keypath
,
this
.
set
),
a
.
config
.
preloadData
&&
this
.
set
(
a
.
config
.
adapter
.
read
(
this
.
model
,
this
.
keypath
)));
if
(
b
=
this
.
type
,
j
.
call
(
this
.
bidirectionals
,
b
)
>=
0
)
return
c
(
this
.
el
,
"change"
,
this
.
publish
)},
f
.
prototype
.
publish
=
function
(
b
){
var
c
;
return
c
=
b
.
target
||
b
.
srcElement
,
a
.
config
.
adapter
.
publish
(
this
.
model
,
this
.
keypath
,
e
(
c
))},
f
.
prototype
.
unbind
=
function
(){
var
b
;
a
.
config
.
adapter
.
unsubscribe
(
this
.
model
,
this
.
keypath
,
this
.
set
);
if
(
b
=
this
.
type
,
j
.
call
(
this
.
bidirectionals
,
b
)
>=
0
)
return
this
.
el
.
removeEventListener
(
"change"
,
this
.
publish
)},
f
}(),
a
.
View
=
function
(){
function
b
(
a
,
b
){
this
.
els
=
a
,
this
.
models
=
b
,
this
.
unbind
=
h
(
this
.
unbind
,
this
),
this
.
bind
=
h
(
this
.
bind
,
this
),
this
.
build
=
h
(
this
.
build
,
this
),
this
.
bindingRegExp
=
h
(
this
.
bindingRegExp
,
this
),
this
.
els
.
jquery
||
this
.
els
instanceof
Array
||
(
this
.
els
=
[
this
.
els
]),
this
.
build
()}
return
b
.
prototype
.
bindingRegExp
=
function
(){
var
b
;
return
b
=
a
.
config
.
prefix
,
b
?
new
RegExp
(
"^data-"
+
b
+
"-"
):
/^data-/
},
b
.
prototype
.
build
=
function
(){
var
b
,
c
,
d
,
e
,
f
,
g
,
h
,
i
,
j
,
k
=
this
;
this
.
bindings
=
[],
b
=
this
.
bindingRegExp
(),
d
=
/^on-/
,
f
=
function
(
c
){
var
e
,
f
,
g
,
h
,
i
,
j
,
l
,
m
,
n
,
o
,
p
,
q
;
p
=
c
.
attributes
,
q
=
[];
for
(
n
=
0
,
o
=
p
.
length
;
n
<
o
;
n
++
)
e
=
p
[
n
],
b
.
test
(
e
.
name
)?(
h
=
{},
m
=
e
.
name
.
replace
(
b
,
""
),
l
=
function
(){
var
a
,
b
,
c
,
d
;
c
=
e
.
value
.
split
(
"|"
),
d
=
[];
for
(
a
=
0
,
b
=
c
.
length
;
a
<
b
;
a
++
)
j
=
c
[
a
],
d
.
push
(
j
.
trim
());
return
d
}(),
i
=
l
.
shift
().
split
(
/
(\.
|:
)
/
),
h
.
formatters
=
l
,
g
=
k
.
models
[
i
.
shift
()],
h
.
bypass
=
i
.
shift
()
===
":"
,
f
=
i
.
join
(),
d
.
test
(
m
)
&&
(
m
=
m
.
replace
(
d
,
""
),
h
.
special
=
"event"
),
q
.
push
(
k
.
bindings
.
push
(
new
a
.
Binding
(
c
,
m
,
g
,
f
,
h
)))):
q
.
push
(
void
0
);
return
q
},
i
=
this
.
els
,
j
=
[];
for
(
g
=
0
,
h
=
i
.
length
;
g
<
h
;
g
++
)
c
=
i
[
g
],
f
(
c
),
j
.
push
(
function
(){
var
a
,
b
,
d
,
g
;
d
=
c
.
getElementsByTagName
(
"*"
),
g
=
[];
for
(
a
=
0
,
b
=
d
.
length
;
a
<
b
;
a
++
)
e
=
d
[
a
],
g
.
push
(
f
(
e
));
return
g
}());
return
j
},
b
.
prototype
.
bind
=
function
(){
var
a
,
b
,
c
,
d
,
e
;
d
=
this
.
bindings
,
e
=
[];
for
(
b
=
0
,
c
=
d
.
length
;
b
<
c
;
b
++
)
a
=
d
[
b
],
e
.
push
(
a
.
bind
());
return
e
},
b
.
prototype
.
unbind
=
function
(){
var
a
,
b
,
c
,
d
,
e
;
d
=
this
.
bindings
,
e
=
[];
for
(
b
=
0
,
c
=
d
.
length
;
b
<
c
;
b
++
)
a
=
d
[
b
],
e
.
push
(
a
.
unbind
());
return
e
},
b
}(),
c
=
function
(
a
,
b
,
c
){
return
window
.
addEventListener
?
a
.
addEventListener
(
b
,
c
):
a
.
attachEvent
(
b
,
c
)},
g
=
function
(
a
,
b
,
c
){
return
window
.
removeEventListener
?
a
.
removeEventListener
(
b
,
c
):
a
.
detachEvent
(
b
,
c
)},
e
=
function
(
a
){
switch
(
a
.
type
){
case
"text"
:
case
"textarea"
:
case
"password"
:
case
"select-one"
:
case
"radio"
:
return
a
.
value
;
case
"checkbox"
:
return
a
.
checked
}},
d
=
function
(
a
){
return
function
(
b
,
d
,
e
){
d
&&
c
(
b
,
a
,
d
);
if
(
e
)
return
g
(
b
,
a
,
e
)}},
b
=
function
(
a
){
return
function
(
b
,
c
){
return
c
?
b
.
setAttribute
(
a
,
c
):
b
.
removeAttribute
(
a
)}},
a
.
routines
=
{
enabled
:
function
(
a
,
b
){
return
a
.
disabled
=!
b
},
disabled
:
function
(
a
,
b
){
return
a
.
disabled
=!!
b
},
checked
:
function
(
a
,
b
){
return
a
.
type
===
"radio"
?
a
.
checked
=
a
.
value
===
b
:
a
.
checked
=!!
b
},
unchecked
:
function
(
a
,
b
){
return
a
.
type
===
"radio"
?
a
.
checked
=
a
.
value
!==
b
:
a
.
checked
=!
b
},
show
:
function
(
a
,
b
){
return
a
.
style
.
display
=
b
?
""
:
"none"
},
hide
:
function
(
a
,
b
){
return
a
.
style
.
display
=
b
?
"none"
:
""
},
html
:
function
(
a
,
b
){
return
a
.
innerHTML
=
b
||
""
},
value
:
function
(
a
,
b
){
return
a
.
value
=
b
||
""
},
text
:
function
(
a
,
b
){
return
a
.
innerText
!=
null
?
a
.
innerText
=
b
||
""
:
a
.
textContent
=
b
||
""
}},
a
.
config
=
{
preloadData
:
!
0
},
f
=
{
routines
:
a
.
routines
,
config
:
a
.
config
,
configure
:
function
(
b
){
var
c
,
d
,
e
;
b
==
null
&&
(
b
=
{}),
e
=
[];
for
(
c
in
b
)
d
=
b
[
c
],
e
.
push
(
a
.
config
[
c
]
=
d
);
return
e
},
bind
:
function
(
b
,
c
){
var
d
;
return
c
==
null
&&
(
c
=
{}),
d
=
new
a
.
View
(
b
,
c
),
d
.
bind
(),
d
}},
typeof
module
!=
"undefined"
&&
module
!==
null
?
module
.
exports
=
f
:
this
.
rivets
=
f
}).
call
(
this
);
\ No newline at end of file
...
...
src/rivets.coffee
View file @
0e79195
...
...
@@ -52,6 +52,9 @@ class Rivets.Binding
# routines will also listen for changes on the element to propagate them back
# to the model.
bind
:
=>
if
@
options
.
bypass
@
set
@
model
[
@
keypath
]
else
Rivets
.
config
.
adapter
.
subscribe
@
model
,
@
keypath
,
@
set
if
Rivets
.
config
.
preloadData
...
...
@@ -101,7 +104,7 @@ class Rivets.View
path
=
pipes
.
shift
().
split
(
/(\.|:)/
)
options
.
formatters
=
pipes
model
=
@
models
[
path
.
shift
()]
path
.
shift
()
options
.
bypass
=
path
.
shift
()
is
':'
keypath
=
path
.
join
()
if
eventRegExp
.
test
type
...
...
Please
register
or
sign in
to post a comment