Skip to content
This repository has been archived by the owner on Nov 17, 2020. It is now read-only.

Commit

Permalink
Bump and build v1.3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
samccone committed Dec 18, 2014
1 parent 108e513 commit 99c4ed4
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 25 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change log

### v1.3.2
* Increase underscore range
* Minor underscore refactors

### v1.3.1
* Fix UMD setup and build process

Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "backbone.wreqr",
"version": "1.3.1",
"version": "1.3.2",
"homepage": "https://github.com/marionettejs/backbone.wreqr",
"authors": [
"Derick Bailey"
Expand Down
35 changes: 15 additions & 20 deletions lib/backbone.wreqr.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Backbone.Wreqr (Backbone.Marionette)
// ----------------------------------
// v1.3.1
// v1.3.2
//
// Copyright (c)2014 Derick Bailey, Muted Solutions, LLC.
// Distributed under MIT license
Expand Down Expand Up @@ -29,7 +29,7 @@

var Wreqr = Backbone.Wreqr = {};

Backbone.Wreqr.VERSION = '1.3.1';
Backbone.Wreqr.VERSION = '1.3.2';

Backbone.Wreqr.noConflict = function () {
Backbone.Wreqr = previousWreqr;
Expand Down Expand Up @@ -105,8 +105,7 @@
}

return function(){
var args = Array.prototype.slice.apply(arguments);
return config.callback.apply(config.context, args);
return config.callback.apply(config.context, arguments);
};
},

Expand Down Expand Up @@ -188,7 +187,7 @@
//
// A simple command pattern implementation. Register a command
// handler and execute it.
Wreqr.Commands = (function(Wreqr){
Wreqr.Commands = (function(Wreqr, _){
"use strict";

return Wreqr.Handlers.extend({
Expand All @@ -201,14 +200,13 @@
this._initializeStorage(this.options);
this.on("handler:add", this._executeCommands, this);

var args = Array.prototype.slice.call(arguments);
Wreqr.Handlers.prototype.constructor.apply(this, args);
Wreqr.Handlers.prototype.constructor.apply(this, arguments);
},

// Execute a named command with the supplied args
execute: function(name, args){
execute: function(name){
name = arguments[0];
args = Array.prototype.slice.call(arguments, 1);
var args = _.rest(arguments);

if (this.hasHandler(name)){
this.getHandler(name).apply(this, args);
Expand Down Expand Up @@ -246,27 +244,25 @@
}
});

})(Wreqr);
})(Wreqr, _);

// Wreqr.RequestResponse
// ---------------------
//
// A simple request/response implementation. Register a
// request handler, and return a response from it
Wreqr.RequestResponse = (function(Wreqr){
Wreqr.RequestResponse = (function(Wreqr, _){
"use strict";

return Wreqr.Handlers.extend({
request: function(){
var name = arguments[0];
var args = Array.prototype.slice.call(arguments, 1);
request: function(name){
if (this.hasHandler(name)) {
return this.getHandler(name).apply(this, args);
return this.getHandler(name).apply(this, _.rest(arguments));
}
}
});

})(Wreqr);
})(Wreqr, _);

// Event Aggregator
// ----------------
Expand Down Expand Up @@ -351,7 +347,7 @@
// --------------
//
// An object that lets you communicate with many channels.
Wreqr.radio = (function(Wreqr){
Wreqr.radio = (function(Wreqr, _){
"use strict";

var Radio = function() {
Expand Down Expand Up @@ -424,15 +420,14 @@
var proxyMethod = function(radio, system, method) {
return function(channelName) {
var messageSystem = radio._getChannel(channelName)[system];
var args = Array.prototype.slice.call(arguments, 1);

return messageSystem[method].apply(messageSystem, args);
return messageSystem[method].apply(messageSystem, _.rest(arguments));
};
};

return new Radio();

})(Wreqr);
})(Wreqr, _);


return Backbone.Wreqr;
Expand Down
2 changes: 1 addition & 1 deletion lib/backbone.wreqr.map

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

Loading

0 comments on commit 99c4ed4

Please sign in to comment.