Skip to content
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.

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

Test index.js file #798

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions docs/site/components/docs/docs.html
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@ <h2 ng-if="method.name[0].toUpperCase() === method.name[0]">
<span class="view-code-link" docs-code-link></span>
</h3>
<p ng-if="method.description" ng-bind-html="method.description"></p>
<div ng-show="method.name[0].toUpperCase() === method.name[0]"
<div ng-show="method.constructor"

This comment was marked as spam.

class="notice">
Available methods:
<span ng-repeat="method in methods">
<span ng-show="method.name[0].toUpperCase() !== method.name[0]">
<span ng-show="$index > 0">
<a href="{{activeUrl + '?method=' + method.name}}"
>{{method.name}}</a>{{$last ? '' : ', '}}
</span>
Expand Down
10 changes: 9 additions & 1 deletion docs/site/components/docs/docs.js
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,15 @@ angular
}

function compareMethods(a, b) {
return a.constructor ? -1: a.name > b.name ? 1 : -1;
if (a.constructor) {
return -1;
}

if (b.constructor) {
return 1;

This comment was marked as spam.

}

return a.name > b.name ? 1 : -1;
}

$routeProvider
Expand Down
6 changes: 5 additions & 1 deletion lib/common/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ util.missingProjectIdError = missingProjectIdError;
* latter is preferred.
*
* @param {object} globalConfig - The global configuration object.
* @param {object} overrides - The instantiation-time configuration object.
* @param {object=} overrides - The instantiation-time configuration object.
* @return {object}
*
* @example
Expand All @@ -83,11 +83,15 @@ util.missingProjectIdError = missingProjectIdError;
function extendGlobalConfig(globalConfig, overrides) {
var options = extend({}, globalConfig);
var hasGlobalConnection = options.credentials || options.keyFilename;

overrides = overrides || {};
var isOverridingConnection = overrides.credentials || overrides.keyFilename;

if (hasGlobalConnection && isOverridingConnection) {
delete options.credentials;
delete options.keyFilename;
}

return extend(true, {}, options, overrides);
}

Expand Down
Loading