Merge pull request #798 from stephenplusplus/spp--storage-acl-fixes

Test index.js file

Author: callmehiphop

docs/site/components/docs/docs.html

@@ -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>

docs/site/components/docs/docs.js

@@ -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

lib/common/util.js

@@ -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
@@ -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);
 }