drollery

1. A comical or whimsical quality.
2. A comical or whimsical way of acting, talking, or behaving.
3. 1. The act of joking; clowning.
   2. Something, such as a story, that is comical or whimsical.

noun

The quality of being laughable or comical: comedy, comicality, comicalness, drollness, farcicality, funniness, humor, humorousness, jocoseness, jocosity, jocularity, ludicrousness, ridiculousness, wit, wittiness, zaniness. See laughter.

The noun has 2 meanings:

Meaning #1: a comic incident or series of incidents
  Synonyms: clowning, comedy, funniness

Meaning #2: a quaint and amusing jest
  Synonym: waggery