Skip to content

Commit 67f9d20

Browse files
committed
Merge branch 'develop'
2 parents 5e15f43 + 4bbfa37 commit 67f9d20

File tree

5 files changed

+2
-35
lines changed

5 files changed

+2
-35
lines changed

src/AlgoliaSearchCore.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ var RESET_APP_DATA_TIMER =
2222
* @param {Object} [opts]
2323
* @param {number} [opts.timeout=2000] - The request timeout set in milliseconds,
2424
* another request will be issued after this timeout
25-
* @param {string} [opts.protocol='http:'] - The protocol used to query Algolia Search API.
26-
* Set to 'https:' to force using https.
27-
* Default to document.location.protocol in browsers
25+
* @param {string} [opts.protocol='https:'] - The protocol used to query Algolia Search API.
26+
* Set to 'http:' to force using http.
2827
* @param {Object|Array} [opts.hosts={
2928
* read: [this.applicationID + '-dsn.algolia.net'].concat([
3029
* this.applicationID + '-1.algolianet.com',

src/browser/builds/algoliasearch.angular.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,8 @@ window.angular.module('algoliasearch', [])
2626
function algoliasearch(applicationID, apiKey, opts) {
2727
var cloneDeep = require('../../clone.js');
2828

29-
var getDocumentProtocol = require('../get-document-protocol');
30-
3129
opts = cloneDeep(opts || {});
3230

33-
if (opts.protocol === undefined) {
34-
opts.protocol = getDocumentProtocol();
35-
}
36-
3731
opts._ua = opts._ua || algoliasearch.ua;
3832

3933
return new AlgoliaSearchAngular(applicationID, apiKey, opts);

src/browser/builds/algoliasearch.jquery.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,8 @@ if (process.env.NODE_ENV === 'debug') {
2222
function algoliasearch(applicationID, apiKey, opts) {
2323
var cloneDeep = require('../../clone.js');
2424

25-
var getDocumentProtocol = require('../get-document-protocol');
26-
2725
opts = cloneDeep(opts || {});
2826

29-
if (opts.protocol === undefined) {
30-
opts.protocol = getDocumentProtocol();
31-
}
32-
3327
opts._ua = opts._ua || algoliasearch.ua;
3428

3529
return new AlgoliaSearchJQuery(applicationID, apiKey, opts);

src/browser/createAlgoliasearch.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,8 @@ module.exports = function createAlgoliasearch(AlgoliaSearch, uaSuffix) {
2121
function algoliasearch(applicationID, apiKey, opts) {
2222
var cloneDeep = require('../clone.js');
2323

24-
var getDocumentProtocol = require('./get-document-protocol');
25-
2624
opts = cloneDeep(opts || {});
2725

28-
if (opts.protocol === undefined) {
29-
opts.protocol = getDocumentProtocol();
30-
}
31-
3226
opts._ua = opts._ua || algoliasearch.ua;
3327

3428
return new AlgoliaSearchBrowser(applicationID, apiKey, opts);

src/browser/get-document-protocol.js

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)