Merge branch 'master' of https://github.com/ansman/rivets into avoid-return-values
Conflicts: lib/rivets.js lib/rivets.min.js
Showing
1 changed file
with
4 additions
and
1 deletions
... | @@ -171,10 +171,12 @@ class Rivets.View | ... | @@ -171,10 +171,12 @@ class Rivets.View |
171 | if iterator | 171 | if iterator |
172 | node.removeAttribute(a.name) for a in iterator | 172 | node.removeAttribute(a.name) for a in iterator |
173 | iterator = null | 173 | iterator = null |
174 | return | ||
174 | 175 | ||
175 | for el in @els | 176 | for el in @els |
176 | parseNode el | 177 | parseNode el |
177 | parseNode node for node in el.getElementsByTagName '*' | 178 | parseNode node for node in el.getElementsByTagName '*' |
179 | return | ||
178 | 180 | ||
179 | # Binds all of the current bindings for this view. | 181 | # Binds all of the current bindings for this view. |
180 | bind: => | 182 | bind: => |
... | @@ -235,7 +237,7 @@ iterationBinding = (name) -> (el, collection, binding) -> | ... | @@ -235,7 +237,7 @@ iterationBinding = (name) -> (el, collection, binding) -> |
235 | binding.marker = document.createComment " rivets: each-#{name} " | 237 | binding.marker = document.createComment " rivets: each-#{name} " |
236 | el.parentNode.insertBefore binding.marker, el | 238 | el.parentNode.insertBefore binding.marker, el |
237 | el.parentNode.removeChild el | 239 | el.parentNode.removeChild el |
238 | 240 | ||
239 | binding.iterated = [] | 241 | binding.iterated = [] |
240 | 242 | ||
241 | for item in collection | 243 | for item in collection |
... | @@ -308,6 +310,7 @@ rivets = | ... | @@ -308,6 +310,7 @@ rivets = |
308 | configure: (options={}) -> | 310 | configure: (options={}) -> |
309 | for property, value of options | 311 | for property, value of options |
310 | Rivets.config[property] = value | 312 | Rivets.config[property] = value |
313 | return | ||
311 | 314 | ||
312 | # Binds a set of model objects to a parent DOM element. Returns a Rivets.View | 315 | # Binds a set of model objects to a parent DOM element. Returns a Rivets.View |
313 | # instance. | 316 | # instance. | ... | ... |
-
Please register or sign in to post a comment