Bump and build v1.3.0

marionettejs · May 1, 2014 · 6b36a2d · 6b36a2d
1 parent 27e5f9e
commit 6b36a2d
Show file tree

Hide file tree

Showing 20 changed files with 104 additions and 64 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change log
 
+### v1.3.0
+  * Add Wreqr.noConflict()
+  * Add Wreqr.VERSION
+
 ### v1.2.1
   * Remove AMD builds and add a single UMD style build.
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "backbone.wreqr",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "homepage": "https://github.com/marionettejs/backbone.wreqr",
   "authors": [
     "Derick Bailey"

diff --git a/component.json b/component.json
@@ -1,7 +1,7 @@
 {
   "name": "backbone.wreqr",
   "description": "A Simple Service Bus For Backbone and Backbone.Marionette",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "repo": "marionettejs/backbone.wreqr",
   "keywords": [
     "backbone",

diff --git a/lib/backbone.wreqr.js b/lib/backbone.wreqr.js
@@ -1,6 +1,6 @@
 // Backbone.Wreqr (Backbone.Marionette)
 // ----------------------------------
-// v1.2.1
+// v1.3.0
 //
 // Copyright (c)2014 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
@@ -25,8 +25,17 @@
 }(this, function(Wreqr, Backbone, _) {
   "use strict";
 
+  var previousWreqr = Backbone.Wreqr;
+
   Backbone.Wreqr = Wreqr;
 
+  Backbone.Wreqr.VERSION = '1.3.0';
+
+  Backbone.Wreqr.noConflict = function () {
+    Backbone.Wreqr = previousWreqr;
+    return this;
+  };
+
   // Handlers
 // --------
 // A registry of functions to call, given a name
@@ -417,7 +426,7 @@ Wreqr.radio = (function(Wreqr){
       var messageSystem = radio._getChannel(channelName)[system];
       var args = Array.prototype.slice.call(arguments, 1);
 
-      messageSystem[method].apply(messageSystem, args);
+      return messageSystem[method].apply(messageSystem, args);
     };
   };
 

diff --git a/lib/backbone.wreqr.map b/lib/backbone.wreqr.map