Merge pull request #4188 from Turbo87/jsdoc-types

Fixed type annotations
ember-cli · May 30, 2015 · 4aaa498 · 4aaa498
2 parents ac3b1a5 + 1386a30
commit 4aaa498
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/lib/broccoli/ember-app.js b/lib/broccoli/ember-app.js
@@ -1106,8 +1106,8 @@ EmberApp.prototype.dependencies = function(pkg) {
 
   @public
   @method import
-  @param  {mixed}  asset   Either a path to the asset or an object with envirnoment names and paths as key-value pairs.
-  @param  {Object} options Options object
+  @param  {(Object|String)}  asset   Either a path to the asset or an object with envirnoment names and paths as key-value pairs.
+  @param  {Object=} options Options object
  */
 EmberApp.prototype.import = function(asset, options) {
   var assetPath = this._getAssetPath(asset);
@@ -1203,10 +1203,11 @@ EmberApp.prototype._importAssetTree = function(directory, subdirectory) {
 /**
   @private
   @method _getAssetPath
-  @param {Object} asset
-  @return {String} assetPath
+  @param {(Object|String)} asset
+  @return {(String|undefined)} assetPath
  */
 EmberApp.prototype._getAssetPath = function(asset) {
+  /** @type {String} */
   var assetPath;
 
   if (typeof asset === 'object') {