Updated jsdoc

videojs · Jun 26, 2014 · d24a9b4 · d24a9b4
1 parent 0ee79af
commit d24a9b4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/js/component.js b/src/js/component.js
@@ -563,11 +563,11 @@ vjs.Component.prototype.one = function(type, fn) {
  * Trigger an event on an element
  *
  *     myComponent.trigger('eventName');
- *     myComponent.trigger({'type':'eventName', 'value':'eventValue'});
+ *     myComponent.trigger({'type':'eventName'});
  *
- * @param  {Object} event  either a string (the event type) 
- *                         to trigger or an event object 
- *                          with a type attribute.
+ * @param  {Event|Object|String} event  either a string (the event type) 
+ *                               to trigger or an event object 
+ *                               with a type attribute.
  * @return {vjs.Component}      self
  */
 vjs.Component.prototype.trigger = function(event){

diff --git a/src/js/events.js b/src/js/events.js
@@ -264,10 +264,10 @@ vjs.fixEvent = function(event) {
 
 /**
  * Trigger an event for an element
- * @param  {Element|Object} elem  Element to trigger an event on
- * @param  {Object}         event either a string (the event type) 
- *                          to trigger or an event object with a 
- *                          type attribute.
+ * @param  {Element|Object} elem   Element to trigger an event on
+ * @param  {Event|Object|String}   event either a string (the event type) 
+ *                                 to trigger or an event object with a 
+ *                                 type attribute.
  * @private
  */
 vjs.trigger = function(elem, event) {