Skip to content

Commit

Permalink
Merge pull request #202 from marionettejs/patch
Browse files Browse the repository at this point in the history
v0.8.5
  • Loading branch information
jamesplease committed Jan 28, 2015
2 parents 21ba29b + c53c7d2 commit 86e26b8
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 9 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "backbone.radio",
"version": "0.8.4",
"version": "0.8.5",
"homepage": "https://github.com/marionettejs/backbone.radio",
"authors": [
"Jmeas <[email protected]>"
Expand Down
7 changes: 4 additions & 3 deletions build/backbone.radio.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Backbone.Radio v0.8.4
// Backbone.Radio v0.8.5
(function(root, factory) {
if (typeof define === 'function' && define.amd) {
define(['backbone', 'underscore'], function(Backbone, _) {
Expand All @@ -20,7 +20,7 @@

var Radio = Backbone.Radio = {};

Radio.VERSION = '0.8.4';
Radio.VERSION = '0.8.5';

// This allows you to run multiple instances of Radio on the same
// webapp. After loading the new version, call `noConflict()` to
Expand Down Expand Up @@ -63,7 +63,8 @@
// Handle event maps.
if (typeof name === 'object') {
for (var key in name) {
results.push(obj[action].apply(obj, [key, name[key]].concat(rest)));
var result = obj[action].apply(obj, [key, name[key]].concat(rest));
eventSplitter.test(key) ? (results = results.concat(result)) : results.push(result);
}
return results;
}
Expand Down
4 changes: 2 additions & 2 deletions build/backbone.radio.min.js

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

Loading

0 comments on commit 86e26b8

Please sign in to comment.