unpoly-rails 0.32.0 → 0.33.0

data/lib/assets/javascripts/unpoly/{modal.js.coffee → modal.coffee}

@@ -268,7 +268,7 @@ up.modal = (($) ->
     if u.documentHasVerticalScrollbar()
       $body = $('body')
       scrollbarWidth = u.scrollbarWidth()
-      bodyRightPadding = parseInt($body.css('padding-right'))
+      bodyRightPadding = parseFloat($body.css('padding-right'))
       bodyRightShift = scrollbarWidth + bodyRightPadding
       unshiftBody = u.temporaryCss($body,
         'padding-right': "#{bodyRightShift}px",
@@ -277,7 +277,7 @@ up.modal = (($) ->
       state.unshifters.push(unshiftBody)
       up.layout.anchoredRight().each ->
         $element = $(this)
-        elementRight = parseInt($element.css('right'))
+        elementRight = parseFloat($element.css('right'))
         elementRightShift = scrollbarWidth + elementRight
         unshifter = u.temporaryCss($element, 'right': elementRightShift)
         state.unshifters.push(unshifter)
@@ -293,6 +293,7 @@ up.modal = (($) ->
   This also returns `true` if the modal is in an opening or closing animation.
 
   @function up.modal.isOpen
+  @return {Boolean}
   @stable
   ###
   isOpen = ->
@@ -338,11 +339,11 @@ up.modal = (($) ->
   @param {String} [options.animation]
     The animation to use when opening the modal.
   @param {Number} [options.duration]
-    The duration of the animation. See [`up.animate`](/up.animate).
+    The duration of the animation. See [`up.animate()`](/up.animate).
   @param {Number} [options.delay]
-    The delay before the animation starts. See [`up.animate`](/up.animate).
+    The delay before the animation starts. See [`up.animate()`](/up.animate).
   @param {String} [options.easing]
-    The timing function that controls the animation's acceleration. [`up.animate`](/up.animate).
+    The timing function that controls the animation's acceleration. [`up.animate()`](/up.animate).
   @return {Promise}
     A promise that will be resolved when the modal has been loaded and
     the opening animation has completed.
@@ -356,7 +357,7 @@ up.modal = (($) ->
   ###*
   Opens a modal for the given URL.
 
-  Example:
+  \#\#\# Example
 
       up.modal.visit('/foo', { target: '.list' });
 
@@ -372,7 +373,7 @@ up.modal = (($) ->
     The CSS selector to extract from the response.
     The extracted content will be placed into the dialog window.
   @param {Object} options
-    See options for [`up.modal.follow`](/up.modal.follow).
+    See options for [`up.modal.follow()`](/up.modal.follow).
   @return {Promise}
     A promise that will be resolved when the modal has been loaded and the opening
     animation has completed.
@@ -387,7 +388,7 @@ up.modal = (($) ->
   [Extracts](/up.extract) the given CSS selector from the given HTML string and
   opens the results in a modal.
 
-  Example:
+  \#\#\# Example
 
       var html = 'before <div class="content">inner</div> after';
       up.modal.extract('.content', html);
@@ -404,7 +405,7 @@ up.modal = (($) ->
   @param {String} html
     The HTML containing the modal content.
   @param {Object} options
-    See options for [`up.modal.follow`](/up.modal.follow).
+    See options for [`up.modal.follow()`](/up.modal.follow).
   @return {Promise}
     A promise that will be resolved when the modal has been opened and the opening
     animation has completed.
@@ -464,7 +465,7 @@ up.modal = (($) ->
         if options.history
           state.coveredUrl = up.browser.url()
           state.coveredTitle = document.title
-        options.beforeSwap = -> createFrame(target, options)
+        options.provideTarget = -> createFrame(target, options)
         extractOptions = u.merge(options, animation: false)
         if html
           promise = up.extract(target, html, extractOptions)
@@ -503,7 +504,7 @@ up.modal = (($) ->
 
   @function up.modal.close
   @param {Object} options
-    See options for [`up.animate`](/up.animate)
+    See options for [`up.animate()`](/up.animate)
   @return {Promise}
     A promise that will be resolved once the modal's close
     animation has finished.
@@ -534,7 +535,7 @@ up.modal = (($) ->
     up.bus.whenEmitted('up:modal:close', $element: state.$modal, message: 'Closing modal').then ->
       state.phase = 'closing'
       # the current URL must be deleted *before* calling up.destroy,
-      # since up.navigation listens to up:fragment:destroyed and then
+      # since up.feedback listens to up:fragment:destroyed and then
       # re-assigns .up-current classes.
       state.url = null
       state.coveredUrl = null
@@ -601,6 +602,8 @@ up.modal = (($) ->
 
   @function up.modal.contains
   @param {String} elementOrSelector
+    The element to test
+  @return {Boolean}
   @stable
   ###
   contains = (elementOrSelector) ->
@@ -609,7 +612,7 @@ up.modal = (($) ->
 
   flavor = (name, overrideConfig = {}) ->
     up.log.warn 'The up.modal.flavor function is deprecated. Use the up.modal.flavors property instead.'
-    u.extend(flavorOverrides(name), overrideConfig)
+    u.assign(flavorOverrides(name), overrideConfig)
 
   ###*
   Returns a config object for the given flavor.
@@ -784,7 +787,7 @@ up.modal = (($) ->
       if u.isPresent(options.$link)
         u.horizontalScreenHalf(options.$link)
       else
-        # In case the drawer was opened programmatically through `up.modal.open`,
+        # In case the drawer was opened programmatically through Javascript,
         # we might now know the link that was clicked on.
         'left'
 

data/lib/assets/javascripts/unpoly/{motion.js.coffee → motion.coffee}

@@ -26,8 +26,8 @@ of the dialog by adding an [`up-animation`](/up-modal#up-animation) attribute to
 Unpoly ships with a number of [predefined transitions](/up.morph#named-transitions)
 and [predefined animations](/up.animate#named-animations).
 
-You can define custom animations using [`up.transition`](/up.transition) and
-[`up.animation`](/up.animation).
+You can define custom animations using [`up.transition()`](/up.transition) and
+[`up.animation()`](/up.animation).
 
 @class up.motion
 ###
@@ -120,7 +120,7 @@ up.motion = (($) ->
   | `move-from-right`  | Moves the element leftwards from beyond the right  edge of the screen until it reaches its current position |
   | `none`             | An animation that has no visible effect. Sounds useless at first, but can save you a lot of `if` statements. |
 
-  You can define additional named animations using [`up.animation`](/up.animation).
+  You can define additional named animations using [`up.animation()`](/up.animation).
 
   \#\#\# Animating CSS properties directly
 
@@ -165,7 +165,7 @@ up.motion = (($) ->
     $element = $(elementOrSelector)
     finish($element)
     options = animateOptions(options)
-    if animation == 'none' || animation == false || u.isMissing(animation)
+    if isNone(animation)
       none()
     else if u.isFunction(animation)
       assertIsDeferred(animation($element, options), animation)
@@ -283,6 +283,9 @@ up.motion = (($) ->
   @stable
   ###
   finish = (elementOrSelector = '.up-animating') ->
+    # We don't need to crawl through the DOM if we aren't animating anyway
+    return unless isEnabled()
+
     $element = $(elementOrSelector)
     $animatingSubtree = u.findWithSelf($element, '.up-animating')
     u.finishCssAnimate($animatingSubtree)
@@ -320,7 +323,7 @@ up.motion = (($) ->
   | `move-right` | Moves the first element rightwards until it exists the screen at the right edge. Simultaneously moves the second element rightwards from beyond the left edge of the screen until it reaches its current position. |
   | `none`       | A transition that has no visible effect. Sounds useless at first, but can save you a lot of `if` statements. |
 
-  You can define additional named transitions using [`up.transition`](/up.transition).
+  You can define additional named transitions using [`up.transition()`](/up.transition).
   
   You can also compose a transition from two [named animations](/named-animations).
   separated by a slash character (`/`):
@@ -366,32 +369,27 @@ up.motion = (($) ->
   @stable
   ###  
   morph = (source, target, transitionOrName, options) ->
-    if transitionOrName == 'none'
-      transitionOrName = false
-
     options = u.options(options)
 
+    willMorph = isEnabled() && !isNone(transitionOrName)
     $old = $(source)
     $new = $(target)
 
-    ensureMorphable($old, transitionOrName)
-    ensureMorphable($new, transitionOrName)
-
-    up.log.group ('Morphing %o to %o (using %s, %o)' if transitionOrName), $old.get(0), $new.get(0), transitionOrName, options, ->
-
+    up.log.group ('Morphing %o to %o (using %s, %o)' if willMorph), $old.get(0), $new.get(0), transitionOrName, options, ->
       parsedOptions = u.only(options, 'reveal', 'restoreScroll', 'source')
-      parsedOptions = u.extend(parsedOptions, animateOptions(options))
+      parsedOptions = u.assign(parsedOptions, animateOptions(options))
 
-      if isEnabled()
-        finish($old)
-        finish($new)
+      finish($old)
+      finish($new)
+
+      if willMorph
+        ensureMorphable($old)
+        ensureMorphable($new)
 
-        if !transitionOrName
-          return skipMorph($old, $new, parsedOptions)
-        else if animation = animations[transitionOrName]
+        if animation = animations[transitionOrName]
           skipMorph($old, $new, parsedOptions)
           return animate($new, animation, parsedOptions)
-        else if transition = u.presence(transitionOrName, u.isFunction) || transitions[transitionOrName]
+        else if transition = (u.presence(transitionOrName, u.isFunction) || transitions[transitionOrName])
           return withGhosts $old, $new, parsedOptions, ($oldGhost, $newGhost) ->
             transitionPromise = transition($oldGhost, $newGhost, parsedOptions)
             assertIsDeferred(transitionPromise, transitionOrName)
@@ -408,8 +406,8 @@ up.motion = (($) ->
       else
         return skipMorph($old, $new, parsedOptions)
 
-  ensureMorphable = ($element, transition) ->
-    if transition && $element.parents('body').length == 0
+  ensureMorphable = ($element) ->
+    if $element.parents('body').length == 0
       element = $element.get(0)
       up.fail("Can't morph a <%s> element (%o)", element.tagName, element)
 
@@ -490,10 +488,10 @@ up.motion = (($) ->
         )
       )
 
-  It is recommended that your transitions use [`up.animate`](/up.animate),
+  It is recommended that your transitions use [`up.animate()`](/up.animate),
   passing along the `options` that were passed to you.
 
-  If you choose to *not* use `up.animate` and roll your own
+  If you choose to *not* use `up.animate()` and roll your own
   logic instead, your code must honor the following contract:
 
   1. It must honor the passed options `{ delay, duration, easing }` if present
@@ -502,7 +500,7 @@ up.motion = (($) ->
   4. The returned promise responds to a `resolve()` function that
      instantly jumps to the last transition frame and resolves the promise.
 
-  Calling [`up.animate`](/up.animate) with an object argument
+  Calling [`up.animate()`](/up.animate) with an object argument
   will take care of all these points.
 
   @function up.transition
@@ -524,10 +522,10 @@ up.motion = (($) ->
       })
 
   It is recommended that your definitions always end by calling
-  calling [`up.animate`](/up.animate) with an object argument, passing along
+  calling [`up.animate()`](/up.animate) with an object argument, passing along
   the `options` that were passed to you.
 
-  If you choose to *not* use `up.animate` and roll your own
+  If you choose to *not* use `up.animate()` and roll your own
   animation code instead, your code must honor the following contract:
 
   1. It must honor the passed options `{ delay, duration, easing }` if present
@@ -536,7 +534,7 @@ up.motion = (($) ->
   4. The returned promise responds to a `resolve()` function that
      instantly jumps to the last animation frame and resolves the promise.
 
-  Calling [`up.animate`](/up.animate) with an object argument
+  Calling [`up.animate()`](/up.animate) with an object argument
   will take care of all these points.
 
   @function up.animation
@@ -589,7 +587,7 @@ up.motion = (($) ->
   @internal
   ###
   isNone = (animation) ->
-    animation is false || animation is 'none' || animation is none
+    animation is false || animation is 'none' || u.isMissing(animation) || u.isResolvedPromise(animation)
 
   animation('none', none)
 
@@ -721,7 +719,6 @@ up.motion = (($) ->
   animation: animation
   config: config
   isEnabled: isEnabled
-  defaults: -> up.fail('up.motion.defaults(...) no longer exists. Set values on he up.motion.config property instead.')
   none: none
   when: resolvableWhen
   prependCopy: prependCopy

data/lib/assets/javascripts/unpoly/namespace.coffee.erb

@@ -0,0 +1,10 @@
+###*
+@module up
+###
+@up =
+  version: <%= Unpoly::Rails::VERSION.to_json %>
+
+  renamedModule: (oldName, newName) ->
+    Object.defineProperty? up, oldName, get: ->
+      up.log.warn("up.#{oldName} has been renamed to up.#{newName}")
+      up[newName]

data/lib/assets/javascripts/unpoly/{popup.js.coffee → popup.coffee}

@@ -87,8 +87,9 @@ up.popup = (($) ->
     history: false
 
   ###*
-  Returns the source URL for the fragment displayed
-  in the current popup, or `undefined` if no  popup is open.
+  Returns the URL from which the current popup's contents were loaded.
+
+  Returns `undefined` if no  popup is open.
 
   @function up.popup.url
   @return {String}
@@ -168,6 +169,7 @@ up.popup = (($) ->
   Returns whether popup modal is currently open.
 
   @function up.popup.isOpen
+  @return {Boolean}
   @stable
   ###
   isOpen = ->
@@ -201,11 +203,11 @@ up.popup = (($) ->
   @param {String} [options.animation]
     The animation to use when opening the popup.
   @param {Number} [options.duration]
-    The duration of the animation. See [`up.animate`](/up.animate).
+    The duration of the animation. See [`up.animate()`](/up.animate).
   @param {Number} [options.delay]
-    The delay before the animation starts. See [`up.animate`](/up.animate).
+    The delay before the animation starts. See [`up.animate()`](/up.animate).
   @param {String} [options.easing]
-    The timing function that controls the animation's acceleration. [`up.animate`](/up.animate).
+    The timing function that controls the animation's acceleration. [`up.animate()`](/up.animate).
   @param {String} [options.method="GET"]
     Override the request method.
   @param {Boolean} [options.sticky=false]
@@ -251,7 +253,7 @@ up.popup = (($) ->
           state.coveredUrl = up.browser.url()
           state.coveredTitle = document.title
         state.sticky = options.sticky
-        options.beforeSwap = -> createFrame(target)
+        options.provideTarget = -> createFrame(target)
         extractOptions = u.merge(options, animation: false)
         if html
           promise = up.extract(target, html, extractOptions)
@@ -290,7 +292,7 @@ up.popup = (($) ->
 
   @function up.popup.close
   @param {Object} options
-    See options for [`up.animate`](/up.animate).
+    See options for [`up.animate()`](/up.animate).
   @return {Promise}
     A promise that will be resolved once the modal's close
     animation has finished.
@@ -311,7 +313,7 @@ up.popup = (($) ->
       title: state.coveredTitle
     )
     animateOptions = up.motion.animateOptions(options, duration: config.closeDuration, easing: config.closeEasing)
-    u.extend(options, animateOptions)
+    u.assign(options, animateOptions)
 
     up.bus.whenEmitted('up:popup:close', message: 'Closing popup', $element: state.$popup).then ->
       state.phase = 'closing'
@@ -355,6 +357,8 @@ up.popup = (($) ->
 
   @methods up.popup.contains
   @param {String} elementOrSelector
+    The element to test
+  @return {Boolean}
   @stable
   ###
   contains = (elementOrSelector) ->
@@ -424,11 +428,19 @@ up.popup = (($) ->
   up.bus.onEscape(closeAsap)
 
   ###*
-  When an element with this attribute is clicked,
-  a currently open popup is closed.
+  When this element is clicked, a currently open [popup](/up.popup) is closed.
 
   Does nothing if no popup is currently open.
 
+  \#\#\# Example
+
+  Clickin on this `<span>` will close a currently open popup:
+
+      <span class='up-close'>Close this popup</span>
+
+  When a popup changes the current URL, you might need to deal with content being displayed
+  as either a popup or a full page.
+
   To make a link that closes the current popup, but follows to
   a fallback destination if no popup is open:
 

data/lib/assets/javascripts/unpoly/{proxy.js.coffee → proxy.coffee}

@@ -1,22 +1,25 @@
 ###*
-Caching and preloading
-======================
+AJAX acceleration
+=================
 
-Unpoly caches server responses for a few minutes,
-making requests to these URLs return instantly.
+Unpoly comes with a number of tricks to shorten the latency between browser and server.
 
-All Unpoly functions and selectors go through this cache.
-If you need to make cache-aware requests from your [custom JavaScript](/up.syntax),
-use [`up.ajax`](/up.ajax).
+\#\#\# Server responses are cached by default
 
-\#\#\# How the cache is cleared
+Unpoly caches server responses for a few minutes,
+making requests to these URLs return instantly.
+All Unpoly functions and selectors go through this cache, unless
+you explicitly pass a `{ cache: false }` option or set an `up-cache="false"` attribute.
 
 The cache holds up to 70 responses for 5 minutes. You can configure the cache size and expiry using
-[`up.proxy.config`](/up.proxy.config), or clear the cache manually using [`up.proxy.clear`](/up.proxy.clear).
+[`up.proxy.config`](/up.proxy.config), or clear the cache manually using [`up.proxy.clear()`](/up.proxy.clear).
 
 Also the entire cache is cleared with every non-`GET` request (like `POST` or `PUT`).
 
-\#\#\# Preloading
+If you need to make cache-aware requests from your [custom JavaScript](/up.syntax),
+use [`up.ajax()`](/up.ajax).
+
+\#\#\# Preloading links
 
 Unpoly also lets you speed up reaction times by [preloading
 links](/up-preload) when the user hovers over the click area (or puts the mouse/finger
@@ -28,6 +31,13 @@ the user releases the mouse/finger.
 You can listen to the [`up:proxy:slow`](/up:proxy:slow) event to implement a spinner
 that appears during a long-running request.
 
+\#\#\# More acceleration
+
+Other Unpoly modules contain even more tricks to outsmart network latency:
+
+- [Instantaneous feedback for links that are currently loading](/up-active)
+- [Follow links on `mousedown` instead of `click`](/up-instant)
+
 @class up.proxy  
 ###
 up.proxy = (($) ->
@@ -193,6 +203,11 @@ up.proxy = (($) ->
   @param {String} [request.url]
     You can omit the first string argument and pass the URL as
     a `request` property instead.
+  @param {String} [request.timeout]
+    A timeout in milliseconds for the request.
+
+    If [`up.proxy.config.maxRequests`](/up.proxy.config#maxRequests) is set, the timeout
+    will not include the time spent waiting in the queue.
   @return
     A promise for the response that is API-compatible with the
     promise returned by [`jQuery.ajax`](http://api.jquery.com/jquery.ajax/).
@@ -206,7 +221,15 @@ up.proxy = (($) ->
     forceCache = (options.cache == true)
     ignoreCache = (options.cache == false)
 
-    request = u.only(options, 'url', 'method', 'data', 'target', 'headers', '_normalized')
+    request = u.only options,
+      'url',
+      'method',
+      'data',
+      'target',
+      'headers',
+      'timeout',
+      '_normalized'
+
     request = normalizeRequest(request)
 
     pending = true
@@ -561,7 +584,6 @@ up.proxy = (($) ->
   isBusy: isBusy
   isCachable: isCachable
   config: config
-  defaults: -> up.fail('up.proxy.defaults(...) no longer exists. Set values on he up.proxy.config property instead.')
   
 )(jQuery)
 

data/lib/assets/javascripts/unpoly/{syntax.js.coffee → syntax.coffee}

@@ -33,21 +33,32 @@ up.syntax = (($) ->
   Registers a function to be called whenever an element with
   the given selector is inserted into the DOM.
 
+  Use compilers to activate your custom Javascript behavior on matching
+  elements.
+
+  You should migrate your [jQuery ready callbacks](https://api.jquery.com/ready/)
+  to compilers.
+
+
+  \#\#\# Example
+
+  Let's say that any element with the `action` class should alert a message when clicked.
+  We can implement this behavior as a compiler function that is called on all elements matching
+  the `.action` selector:
+
       up.compiler('.action', function($element) {
-        // your code here
+        $element.on('click', function() {
+          alert('Action was clicked!');
+        });
       });
 
-  The functions will be called on elements matching `.action` when
-  the page loads, or whenever a matching fragment is [updated through Unpoly](/up.replace)
-  later.
-
-  If you have used Angular.js before, this resembles
-  [Angular directives](https://docs.angularjs.org/guide/directive).
+  The compiler function will be called once for each matching element when
+  the page loads, or when a matching fragment is [inserted](/up.replace) later.
 
 
   \#\#\# Integrating jQuery plugins
 
-  `up.compiler` is a great way to integrate jQuery plugins.
+  `up.compiler()` is a great way to integrate jQuery plugins.
   Let's say your JavaScript plugin wants you to call `lightboxify()`
   on links that should open a lightbox. You decide to
   do this for all links with an `lightbox` class:
@@ -64,7 +75,7 @@ up.syntax = (($) ->
 
   \#\#\# Custom elements
 
-  You can use `up.compiler` to implement custom elements like this:
+  You can use `up.compiler()` to implement custom elements like this:
 
       <clock></clock>
 
@@ -141,7 +152,7 @@ up.syntax = (($) ->
       });
 
 
-  \#\#\# Migrating jQuery event handlers to `up.compiler`
+  \#\#\# Migrating jQuery event handlers to `up.compiler()`
 
   Within the compiler, Unpoly will bind `this` to the
   native DOM element to help you migrate your existing jQuery code to
@@ -155,9 +166,9 @@ up.syntax = (($) ->
         });
       });
 
-  ... you can reuse the event handler like this:
+  ... you can reuse the callback function like this:
 
-      $('.action').compiler(function($element) {
+      up.compiler('.action', function($element) {
         $element.on('click', function() {
           $(this).something();
         });
@@ -191,7 +202,7 @@ up.syntax = (($) ->
     [clear global state](/up.compiler#cleaning-up-after-yourself)
     such as timeouts and event handlers bound to the document.
     The destructor is *not* expected to remove the element from the DOM, which
-    is already handled by [`up.destroy`](/up.destroy).
+    is already handled by [`up.destroy()`](/up.destroy).
 
     The function may also return an array of destructor functions.
   @stable
@@ -202,7 +213,7 @@ up.syntax = (($) ->
   ###*
   Registers a [compiler](/up.compiler) that is run before all other compilers.
 
-  You can use `up.macro` to register a compiler that sets other UJS attributes.
+  You can use `up.macro()` to register a compiler that sets other UJS attributes.
 
   \#\#\# Example
 
@@ -234,10 +245,10 @@ up.syntax = (($) ->
   @param {String} selector
     The selector to match.
   @param {Object} options
-    See options for [`up.compiler`](/up.compiler).
+    See options for [`up.compiler()`](/up.compiler).
   @param {Function($element, data)} compiler
     The function to call when a matching element is inserted.
-    See [`up.compiler`](/up.compiler) for details.
+    See [`up.compiler()`](/up.compiler) for details.
   @stable
   ###
   macro = (args...) ->
@@ -290,7 +301,7 @@ up.syntax = (($) ->
 
   ###*
   Applies all compilers on the given element and its descendants.
-  Unlike [`up.hello`](/up.hello), this doesn't emit any events.
+  Unlike [`up.hello()`](/up.hello), this doesn't emit any events.
 
   @function up.syntax.compile
   @param {Array<Element>} [options.skip]
@@ -320,7 +331,7 @@ up.syntax = (($) ->
 
   ###*
   Runs any destroyers on the given fragment and its descendants.
-  Unlike [`up.destroy`](/up.destroy), this doesn't emit any events
+  Unlike [`up.destroy()`](/up.destroy), this doesn't emit any events
   and does not remove the element from the DOM.
 
   @function up.syntax.clean
@@ -350,7 +361,7 @@ up.syntax = (($) ->
 
       <span class="person" up-data="{ age: 18, name: 'Bob' }">Bob</span>
 
-  Calling `up.syntax.data` will deserialize the JSON string into a JavaScript object:
+  Calling `up.syntax.data()` will deserialize the JSON string into a JavaScript object:
 
       up.syntax.data('.person') // returns { age: 18, name: 'Bob' }
 
@@ -366,7 +377,7 @@ up.syntax = (($) ->
   ###*
   If an element annotated with [`up-data`] is inserted into the DOM,
   Up will parse the JSON and pass the resulting object to any matching
-  [`up.compiler`](/up.compiler) handlers.
+  [`up.compiler()`](/up.compiler) handlers.
 
   For instance, a container for a [Google Map](https://developers.google.com/maps/documentation/javascript/tutorial)
   might attach the location and names of its marker pins:
@@ -395,7 +406,7 @@ up.syntax = (($) ->
 
   Similarly, when an event is triggered on an element annotated with
   [`up-data`], the parsed object will be passed to any matching
-  [`up.on`](/up.on) handlers.
+  [`up.on()`](/up.on) handlers.
 
       up.on('click', '.google-map', function(event, $element, pins) {
         console.log("There are %d pins on the clicked map", pins.length);

data/lib/assets/javascripts/unpoly/{tooltip.js.coffee → tooltip.coffee}

@@ -175,7 +175,7 @@ up.tooltip = (($) ->
 
   @function up.tooltip.close
   @param {Object} options
-    See options for [`up.animate`](/up.animate).
+    See options for [`up.animate()`](/up.animate).
   @return {Promise}
     A promise for the end of the closing animation.
   @stable
@@ -191,7 +191,7 @@ up.tooltip = (($) ->
 
     options = u.options(options, animation: config.closeAnimation)
     animateOptions = up.motion.animateOptions(options, duration: config.closeDuration, easing: config.closeEasing)
-    u.extend(options, animateOptions)
+    u.assign(options, animateOptions)
     state.phase = 'closing'
     up.destroy(state.$tooltip, options).then ->
       state.phase = 'closed'