Skip to content

Commit

Permalink
Merge pull request #798 from stephenplusplus/spp--storage-acl-fixes
Browse files Browse the repository at this point in the history
Test index.js file
  • Loading branch information
callmehiphop committed Aug 13, 2015
2 parents 4b69f3b + 8b64893 commit d4f066d
Show file tree
Hide file tree
Showing 6 changed files with 396 additions and 176 deletions.
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"
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;
}

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

0 comments on commit d4f066d

Please sign in to comment.