Updated API box to show other instance names

Now that `Package`, `Npm` and `Cordova` are all instances, we need to show the instance names in more cases (not just `this` in cases like subscriptions and methods).

It's not perfect but it's close enough I think.

Author: tmeasday

code

@@ -126,11 +126,19 @@ signature = function (data, options) {
     // In general, if we are looking at an instance method, we want to show it as
     //   Something#foo or #foo (if short). However, when it's on something called
     //   `this`, we'll do the slightly weird thing of showing `this.foo` in both cases.
-    if (data.scope === "instance" && apiData(data.memberof).instancename === 'this') {
-      escapedLongname = "<em>this</em>." + data.name;
-    } else if (data.scope === "instance" && options.short) {
-      // Something#foo => #foo
-      return '<em>' + options.instanceDelimiter + '</em>' + escapedLongname.split('#')[1];
+    if (data.scope === "instance") {
+      // the class this method belongs to.
+      var memberOfData = apiData(data.memberof);
+
+      // Certain instances are provided to the user in scope with a specific name
+      // TBH I'm not sure what else we use instanceName for (why we are setting for
+      // e.g. `reactiveVar` if we don't want to show it here) but we opt into showing it
+      if (memberOfData.showinstancename) {
+        escapedLongname = "<em>" + memberOfData.instancename + "</em>." + data.name;
+      } else if (options.short) {
+        // Something#foo => #foo
+        return '<em>' + options.instanceDelimiter + '</em>' + escapedLongname.split('#')[1];
+      }
     }
 
     // If the user passes in a instanceDelimiter and we are a static method,

scripts/api-box.js

@@ -81,14 +81,14 @@ package) so that Meteor will pick up the local dependency.
 Provide basic package information with `Package.describe(options)`. To publish a
 package, you must define `summary` and `version`.
 
-{% apibox "Package.describe" %}
+{% apibox "PackageNamespace#describe" nested: %}
 
 Define dependencies and expose package methods with the
 `Package.onUse` handler. This section lets you define what packages your package
 depends on, what packages are implied by your package, and what object your
 package is exported to.
 
-{% apibox "Package.onUse" %}
+{% apibox "PackageNamespace#onUse" nested: %}
 
 {% apibox "PackageAPI#versionsFrom" %}
 {% apibox "PackageAPI#use" %}
@@ -107,15 +107,15 @@ If you used `meteor create` to set up your package, Meteor will create the
 required scaffolding in `package.js`, and you'll only need to add unit test code
 in the `_test.js` file that was created.
 
-{% apibox "Package.onTest" %}
+{% apibox "PackageNamespace#onTest" nested: %}
 
 Meteor packages can include NPM packages and Cordova plugins by using
 `Npm.depends` and `Cordova.depends` in the `package.js` file.
 
-{% apibox "Npm.depends" %}
+{% apibox "PackageNpm#depends" nested: %}
 {% apibox "Npm.require" %}
-{% apibox "Cordova.depends" %}
-{% apibox "Package.registerBuildPlugin" %}
+{% apibox "PackageCordova#depends" nested: %}
+{% apibox "PackageNamespace#registerBuildPlugin" nested: %}
 {% apibox "Plugin.registerSourceHandler" nested:true %}
 
 <h2 id="build-plugin-api">Build Plugins API</h2>