Skip to content

Commit

Permalink
updated bower deps
Browse files Browse the repository at this point in the history
  • Loading branch information
Spencer Alger committed May 6, 2014
1 parent 83ce9ff commit 950cfcc
Show file tree
Hide file tree
Showing 67 changed files with 1,834 additions and 1,170 deletions.
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@
"scripts": {
"test": "grunt test",
"server": "grunt server",
"update": "npm run update-esjs && npm run update-K4D3",
"update-esjs": "bower update elasticsearch && cd ./src/bower_components/elasticsearch && npm install && grunt browser_clients:build",
"update-K4D3": "bower update K4D3 && cd ./src/bower_components/K4D3 && npm install && grunt production"
"update": "bower update elasticsearch && bower update K4D3 && npm run rebuild-esjs",
"rebuild-esjs": "cd ./src/bower_components/elasticsearch && npm install && grunt browser_clients:build"
},
"repository": {
"type": "git",
Expand Down
10 changes: 5 additions & 5 deletions src/bower_components/angular-mocks/.bower.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"name": "angular-mocks",
"version": "1.2.15-build.2365+sha.d07101d",
"version": "1.2.16",
"main": "./angular-mocks.js",
"dependencies": {
"angular": "1.2.15-build.2365+sha.d07101d"
"angular": "1.2.16"
},
"homepage": "https://github.com/angular/bower-angular-mocks",
"_release": "1.2.15-build.2365+sha.d07101d",
"_release": "1.2.16",
"_resolution": {
"type": "version",
"tag": "v1.2.15-build.2365+sha.d07101d",
"commit": "1958c29e6e2e368adfce6c3923e9f39b6a9ef5b3"
"tag": "v1.2.16",
"commit": "e429a011d88c402430329449500f352751d1a137"
},
"_source": "git://github.com/angular/bower-angular-mocks.git",
"_target": "~1.2.14",
Expand Down
48 changes: 26 additions & 22 deletions src/bower_components/angular-mocks/angular-mocks.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license AngularJS v1.2.15-build.2365+sha.d07101d
* @license AngularJS v1.2.16
* (c) 2010-2014 Google, Inc. http://angularjs.org
* License: MIT
*/
Expand Down Expand Up @@ -1097,12 +1097,12 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {
responsesPush = angular.bind(responses, responses.push),
copy = angular.copy;

function createResponse(status, data, headers) {
function createResponse(status, data, headers, statusText) {
if (angular.isFunction(status)) return status;

return function() {
return angular.isNumber(status)
? [status, data, headers]
? [status, data, headers, statusText]
: [200, status, data];
};
}
Expand All @@ -1127,7 +1127,8 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {
function handleResponse() {
var response = wrapped.response(method, url, data, headers);
xhr.$$respHeaders = response[2];
callback(copy(response[0]), copy(response[1]), xhr.getAllResponseHeaders());
callback(copy(response[0]), copy(response[1]), xhr.getAllResponseHeaders(),
copy(response[3] || ''));
}

function handleTimeout() {
Expand Down Expand Up @@ -1194,16 +1195,17 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {
* request is handled.
*
* - respond –
* `{function([status,] data[, headers])|function(function(method, url, data, headers)}`
* – The respond method takes a set of static data to be returned or a function that can return
* an array containing response status (number), response data (string) and response headers
* (Object).
* `{function([status,] data[, headers, statusText])
* | function(function(method, url, data, headers)}`
* – The respond method takes a set of static data to be returned or a function that can
* return an array containing response status (number), response data (string), response
* headers (Object), and the text for the status (string).
*/
$httpBackend.when = function(method, url, data, headers) {
var definition = new MockHttpExpectation(method, url, data, headers),
chain = {
respond: function(status, data, headers) {
definition.response = createResponse(status, data, headers);
respond: function(status, data, headers, statusText) {
definition.response = createResponse(status, data, headers, statusText);
}
};

Expand Down Expand Up @@ -1311,17 +1313,18 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {
* request is handled.
*
* - respond –
* `{function([status,] data[, headers])|function(function(method, url, data, headers)}`
* – The respond method takes a set of static data to be returned or a function that can return
* an array containing response status (number), response data (string) and response headers
* (Object).
* `{function([status,] data[, headers, statusText])
* | function(function(method, url, data, headers)}`
* – The respond method takes a set of static data to be returned or a function that can
* return an array containing response status (number), response data (string), response
* headers (Object), and the text for the status (string).
*/
$httpBackend.expect = function(method, url, data, headers) {
var expectation = new MockHttpExpectation(method, url, data, headers);
expectations.push(expectation);
return {
respond: function(status, data, headers) {
expectation.response = createResponse(status, data, headers);
respond: function (status, data, headers, statusText) {
expectation.response = createResponse(status, data, headers, statusText);
}
};
};
Expand Down Expand Up @@ -1823,13 +1826,14 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) {
* control how a matched request is handled.
*
* - respond –
* `{function([status,] data[, headers])|function(function(method, url, data, headers)}`
* `{function([status,] data[, headers, statusText])
* | function(function(method, url, data, headers)}`
* – The respond method takes a set of static data to be returned or a function that can return
* an array containing response status (number), response data (string) and response headers
* (Object).
* - passThrough – `{function()}` – Any request matching a backend definition with `passThrough`
* handler, will be pass through to the real backend (an XHR request will be made to the
* server.
* an array containing response status (number), response data (string), response headers
* (Object), and the text for the status (string).
* - passThrough – `{function()}` – Any request matching a backend definition with
* `passThrough` handler will be passed through to the real backend (an XHR request will be made
* to the server.)
*/

/**
Expand Down
4 changes: 2 additions & 2 deletions src/bower_components/angular-mocks/bower.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "angular-mocks",
"version": "1.2.15-build.2365+sha.d07101d",
"version": "1.2.16",
"main": "./angular-mocks.js",
"dependencies": {
"angular": "1.2.15-build.2365+sha.d07101d"
"angular": "1.2.16"
}
}
10 changes: 5 additions & 5 deletions src/bower_components/angular-route/.bower.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"name": "angular-route",
"version": "1.2.15-build.2365+sha.d07101d",
"version": "1.2.16",
"main": "./angular-route.js",
"dependencies": {
"angular": "1.2.15-build.2365+sha.d07101d"
"angular": "1.2.16"
},
"homepage": "https://github.com/angular/bower-angular-route",
"_release": "1.2.15-build.2365+sha.d07101d",
"_release": "1.2.16",
"_resolution": {
"type": "version",
"tag": "v1.2.15-build.2365+sha.d07101d",
"commit": "1a0136259f55788de38db0c95198abc8844a042f"
"tag": "v1.2.16",
"commit": "ed0e2b796077d953f518cb81cc7af981cf695a45"
},
"_source": "git://github.com/angular/bower-angular-route.git",
"_target": "~1.2.14",
Expand Down
Loading

0 comments on commit 950cfcc

Please sign in to comment.