Skip to content

Allow custom send function #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
timt-unity3d wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Allow custom send function #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a92d116
added ability to override send
timt-unity3d Feb 15, 2017
b45926a
compiled new files
timt-unity3d Feb 15, 2017
3441356
refactored where send is called
timt-unity3d Feb 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions dist/angular-http-batch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* angular-http-batcher - v1.12.0 - 2015-10-12
* angular-http-batcher - v1.12.0 - 2017-02-15
* https://github.com/jonsamwell/angular-http-batcher
* Copyright (c) 2015 Jon Samwell
* Copyright (c) 2017 Jon Samwell
*/
(function (window, angular) {
'use strict';
Expand Down Expand Up @@ -260,7 +260,14 @@ function HttpBatchAdapter($document, $window, httpBatchConfig) {
// angular would have already encoded the parameters *if* the dev passed them in via the params parameter to $http
// so we only need to url encode the url not the query string part
relativeUrlParts = urlInfo.relativeUrl.split('?');
encodedRelativeUrl = encodeURI(relativeUrlParts[0]) + (relativeUrlParts.length > 1 ? '?' + relativeUrlParts[1] : '');
// do a very basic check to see if query strings are encoded as dev might
// have just added them to the url and not passed them in via the params config param to $http
if (relativeUrlParts.length > 1 && (/%[A-F0-9]{2}/gi).test(relativeUrlParts[1]) === false) {
// chances are they are not encoded so encode them
encodedRelativeUrl = encodeURI(urlInfo.relativeUrl);
} else {
encodedRelativeUrl = encodeURI(relativeUrlParts[0]) + (relativeUrlParts.length > 1 ? '?' + relativeUrlParts[1] : '');
}

batchBody.push(request.method + ' ' + encodedRelativeUrl + ' ' + constants.httpVersion);
batchBody.push('Host: ' + urlInfo.host);
Expand Down Expand Up @@ -587,8 +594,12 @@ function addRequestFn(request) {

function sendFn() {
var self = this,
adapter = self.getAdapter(),
httpBatchConfig = adapter.buildRequest(self.requests, self.config);
adapter = self.getAdapter();
if (adapter.hasOwnProperty('send')) {
return adapter.send.apply(this);
}

var httpBatchConfig = adapter.buildRequest(self.requests, self.config);

self.sendCallback();
self.$injector.get('$http')(httpBatchConfig).then(function (response) {
Expand Down
6 changes: 3 additions & 3 deletions dist/angular-http-batch.min.js
View file
Open in desktop

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

8 changes: 6 additions & 2 deletions src/services/httpBatcher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,12 @@ function addRequestFn(request) {

function sendFn() {
var self = this,
adapter = self.getAdapter(),
httpBatchConfig = adapter.buildRequest(self.requests, self.config);
adapter = self.getAdapter();
if (adapter.hasOwnProperty('send')) {
return adapter.send.apply(this);
}

var httpBatchConfig = adapter.buildRequest(self.requests, self.config);

self.sendCallback();
self.$injector.get('$http')(httpBatchConfig).then(function (response) {
Expand Down