RubyGems - unpoly-rails - Versions diffs - 0.36.2 → 0.37.0 - Mend

unpoly-rails 0.36.2 → 0.37.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of unpoly-rails might be problematic. Click here for more details.

Files changed (33) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +12 -0
data/README.md +1 -1
data/dist/unpoly.js +137 -73
data/dist/unpoly.min.js +3 -3
data/lib/assets/javascripts/unpoly/bus.coffee +2 -2
data/lib/assets/javascripts/unpoly/dom/extract_plan.coffee +4 -2
data/lib/assets/javascripts/unpoly/dom.coffee +26 -12
data/lib/assets/javascripts/unpoly/form.coffee +19 -1
data/lib/assets/javascripts/unpoly/layout.coffee +1 -1
data/lib/assets/javascripts/unpoly/link.coffee +9 -2
data/lib/assets/javascripts/unpoly/modal.coffee +1 -0
data/lib/assets/javascripts/unpoly/popup.coffee +1 -0
data/lib/assets/javascripts/unpoly/syntax.coffee +48 -29
data/lib/assets/javascripts/unpoly/util.coffee +12 -5
data/lib/unpoly/rails/version.rb +1 -1
data/package.json +1 -1
data/spec_app/Gemfile.lock +1 -1
data/spec_app/app/assets/javascripts/integration_test.coffee +4 -0
data/spec_app/app/controllers/replace_test_controller.rb +5 -0
data/spec_app/app/views/pages/start.erb +4 -0
data/spec_app/app/views/replace_test/_nav.erb +6 -0
data/spec_app/app/views/replace_test/page1.erb +14 -0
data/spec_app/app/views/replace_test/page2.erb +14 -0
data/spec_app/config/routes.rb +1 -0
data/spec_app/spec/javascripts/helpers/reset_path.js.coffee +1 -2
data/spec_app/spec/javascripts/up/dom_spec.js.coffee +69 -1
data/spec_app/spec/javascripts/up/feedback_spec.js.coffee +5 -3
data/spec_app/spec/javascripts/up/history_spec.js.coffee +174 -153
data/spec_app/spec/javascripts/up/link_spec.js.coffee +77 -19
data/spec_app/spec/javascripts/up/syntax_spec.js.coffee +1 -1
data/spec_app/spec/javascripts/up/util_spec.js.coffee +34 -0
metadata +6 -2

data/lib/assets/javascripts/unpoly/dom.coffee CHANGED Viewed

@@ -222,6 +222,8 @@ up.dom = (($) ->
     same layer as the element that triggered the replacement (see `options.origin`).
     If that element is not known, or no match was found in that layer,
     Unpoly will search in other layers, starting from the topmost layer.
+  @param {String} [options.failLayer='auto']
+    The name of the layer that ought to be updated if the server sends a non-200 status code.
   @return {Promise}
     A promise that will be resolved when the page has been updated.
@@ -243,6 +245,8 @@ up.dom = (($) ->
     failureOptions = u.merge options,
       humanizedTarget: 'failure target'
       provideTarget: undefined # don't provide a target if we're targeting the failTarget
+    u.renameKey(failureOptions, 'failTransition', 'transition')
+    u.renameKey(failureOptions, 'failLayer', 'layer')
     target = bestPreflightSelector(selectorOrElement, successOptions)
     failTarget = bestPreflightSelector(options.failTarget, failureOptions)
@@ -304,8 +308,6 @@ up.dom = (($) ->
         options.history = false  unless u.isString(options.history)
         options.source  = 'keep' unless u.isString(options.source)
     else
-      options.transition = options.failTransition
-      options.failTransition = undefined
       if isReloadable # e.g. GET returns 500 Internal Server Error
         options.history = url unless options.history is false
         options.source  = url unless options.source  is false
@@ -472,14 +474,19 @@ up.dom = (($) ->
       promise = u.resolvedPromise()
     else
-      replacement = ->
+      # This needs to happen before prepareClean() below.
+      options.keepPlans = transferKeepableElements($old, $new, options)
-        options.keepPlans = transferKeepableElements($old, $new, options)
+      # Collect destructor functions before swapping the elements.
+      # Detaching an element from the DOM will cause jQuery to remove the data properties
+      # where we store constructor functions.
+      clean = up.syntax.prepareClean($old)
-        if $old.is('body')
+      replacement = ->
+        if isSingletonElement($old)
           # jQuery will actually let us .insertBefore the new <body> tag,
           # but that's probably bad Karma.
-          swapBody($old, $new)
+          swapSingletonElement($old, $new)
           # We cannot morph the <body> tag
           transition = false
         else
@@ -502,13 +509,18 @@ up.dom = (($) ->
       # Wrap the replacement as a destroy animation, so $old will
       # get marked as .up-destroying right away.
-      promise = destroy($old, animation: replacement)
+      promise = destroy($old, { clean, animation: replacement })
     promise
+  isSingletonElement = ($element) ->
+    $element.is('body')
   # This is a separate method so we can mock it in specs
-  swapBody = ($oldBody, $newBody) ->
-    $oldBody.replaceWith($newBody)
+  swapSingletonElement = ($old, $new) ->
+    # jQuery will actually let us .insertBefore the new <body> tag,
+    # but that's probably bad Karma.
+    $old.replaceWith($new)
   transferKeepableElements = ($old, $new, options) ->
     keepPlans = []
@@ -750,6 +762,7 @@ up.dom = (($) ->
     $match = undefined
     if u.isPresent(origin)
       originLayer = layerOf(origin)
+      # Make the origin's layer the top priority
       u.remove(layers, originLayer)
       layers.unshift(originLayer)
     for layer in layers
@@ -809,6 +822,7 @@ up.dom = (($) ->
   @stable
   ###
   destroy = (selectorOrElement, options) ->
+    options = u.options(options, animation: false)
     $element = $(selectorOrElement)
     unless $element.is('.up-placeholder, .up-tooltip, .up-modal, .up-popup')
@@ -817,7 +831,6 @@ up.dom = (($) ->
     if $element.length == 0
       u.resolvedDeferred()
     else if up.bus.nobodyPrevents('up:fragment:destroy', $element: $element, message: destroyMessage)
-      options = u.options(options, animation: false)
       animateOptions = up.motion.animateOptions(options)
       $element.addClass('up-destroying')
       # If e.g. a modal or popup asks us to restore a URL, do this
@@ -829,7 +842,8 @@ up.dom = (($) ->
         up.motion.animate($element, options.animation, animateOptions)
       animationDeferred.then ->
-        up.syntax.clean($element)
+        options.clean ||= -> up.syntax.clean($element)
+        options.clean()
         # Emit this while $element is still part of the DOM, so event
         # listeners bound to the document will receive the event.
         up.emit 'up:fragment:destroyed', $element: $element, message: destroyedMessage
@@ -838,7 +852,7 @@ up.dom = (($) ->
     else
       # Although someone prevented the destruction, keep a uniform API for
       # callers by returning a Deferred that will never be resolved.
-      $.Deferred()
+      u.unresolvableDeferred()
   ###*
   Before a page fragment is being [destroyed](/up.destroy), this

data/lib/assets/javascripts/unpoly/form.coffee CHANGED Viewed

@@ -108,6 +108,13 @@ up.form = (($) ->
   @param {Object} [options.headers={}]
     An object of additional header key/value pairs to send along
     with the request.
+  @param {String} [options.layer='auto']
+    The name of the layer that ought to be updated. Valid values are
+    `auto`, `page`, `modal` and `popup`.
+    If set to `auto` (default), Unpoly will try to find a match in the form's layer.
+  @param {String} [options.failLayer='auto']
+    The name of the layer that ought to be updated if the server sends a non-200 status code.
   @return {Promise}
     A promise for the successful form submission.
   @stable
@@ -131,6 +138,7 @@ up.form = (($) ->
     options.restoreScroll = u.option(options.restoreScroll, u.castedAttr($form, 'up-restore-scroll'))
     options.origin = u.option(options.origin, $form)
     options.layer = u.option(options.layer, $form.attr('up-layer'), 'auto')
+    options.failLayer = u.option(options.failLayer, $form.attr('up-fail-layer'), 'auto')
     options.data = u.requestDataFromForm($form)
     options = u.merge(options, up.motion.animateOptions(options, $form))
@@ -445,7 +453,7 @@ up.form = (($) ->
     if switcher
       $(switcher)
     else
-      u.fail('Could not find [up-switch] field for %o', $element.get(0))
+      u.fail('Could not find [up-switch] field for %o', $target.get(0))
   ###*
   Forms with an `up-target` attribute are [submitted via AJAX](/up.submit)
@@ -539,6 +547,16 @@ up.form = (($) ->
     Alternately you can use an attribute `data-method`
     ([Rails UJS](https://github.com/rails/jquery-ujs/wiki/Unobtrusive-scripting-support-for-jQuery))
     or `method` (vanilla HTML) for the same purpose.
+  @param {String} [up-layer='auto']
+    The name of the layer that ought to be updated. Valid values are
+    `auto`, `page`, `modal` and `popup`.
+    If set to `auto` (default), Unpoly will try to find a match in the form's layer.
+    If no match was found in that layer,
+    Unpoly will search in other layers, starting from the topmost layer.
+  @param {String} [up-fail-layer='auto']
+    The name of the layer that ought to be updated if the server sends a
+    non-200 status code.
   @param {String} [up-reveal='true']
     Whether to reveal the target element within its viewport before updating.
   @param {String} [up-restore-scroll='false']

data/lib/assets/javascripts/unpoly/layout.coffee CHANGED Viewed

@@ -432,7 +432,7 @@ up.layout = (($) ->
     else
       $viewports = viewports()
-    scrollTopsForUrl = lastScrollTops.get(url)
+    scrollTopsForUrl = lastScrollTops.get(url) || {}
     up.log.group 'Restoring scroll positions for URL %s to %o', url, scrollTopsForUrl, ->
       $viewports.each ->

data/lib/assets/javascripts/unpoly/link.coffee CHANGED Viewed

@@ -157,6 +157,9 @@ up.link = (($) ->
     If set to `auto` (default), Unpoly will try to find a match in the
     same layer as the given link. If no match was found in that layer,
     Unpoly will search in other layers, starting from the topmost layer.
+  @param {String} [options.failLayer='auto']
+    The name of the layer that ought to be updated if the server sends a non-200 status code.
   @return {Promise}
     A promise that will be resolved when the link destination
     has been loaded and rendered.
@@ -180,6 +183,7 @@ up.link = (($) ->
     options.method = followMethod($link, options)
     options.origin = u.option(options.origin, $link)
     options.layer = u.option(options.layer, $link.attr('up-layer'), 'auto')
+    options.failLayer = u.option(options.failLayer, $link.attr('up-fail-layer'), 'auto')
     options.confirm = u.option(options.confirm, $link.attr('up-confirm'))
     options = u.merge(options, up.motion.animateOptions(options, $link))
@@ -357,9 +361,12 @@ up.link = (($) ->
     The name of the layer that ought to be updated. Valid values are
     `auto`, `page`, `modal` and `popup`.
-    If set to `auto` (default), Unpoly will try to find a match in the
-    same layer as the given link. If no match was found in that layer,
+    If set to `auto` (default), Unpoly will try to find a match in the link's layer.
+    If no match was found in that layer,
     Unpoly will search in other layers, starting from the topmost layer.
+  @param {String} [up-fail-layer='auto']
+    The name of the layer that ought to be updated if the server sends a
+    non-200 status code.
   @param [up-history]
     Whether to push an entry to the browser history when following the link.

data/lib/assets/javascripts/unpoly/modal.coffee CHANGED Viewed

@@ -451,6 +451,7 @@ up.modal = (($) ->
     options.confirm = u.option(options.confirm, $link.attr('up-confirm'))
     options.method = up.link.followMethod($link, options)
     options.layer = 'modal'
+    options.failLayer = u.option(options.failLayer, $link.attr('up-fail-layer'), 'auto')
     animateOptions = up.motion.animateOptions(options, $link, duration: flavorDefault('openDuration', options.flavor), easing: flavorDefault('openEasing', options.flavor))
     # Although we usually fall back to full page loads if a browser doesn't support pushState,

data/lib/assets/javascripts/unpoly/popup.coffee CHANGED Viewed

@@ -246,6 +246,7 @@ up.popup = (($) ->
     options.confirm = u.option(options.confirm, $anchor.attr('up-confirm'))
     options.method = up.link.followMethod($anchor, options)
     options.layer = 'popup'
+    options.failLayer = u.option(options.failLayer, $anchor.attr('up-fail-layer'), 'auto')
     animateOptions = up.motion.animateOptions(options, $anchor, duration: config.openDuration, easing: config.openEasing)
     up.browser.whenConfirmed(options).then ->

data/lib/assets/javascripts/unpoly/syntax.coffee CHANGED Viewed

@@ -129,10 +129,10 @@ up.syntax = (($) ->
   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:
-      <div class="google-map" up-data="[
-        { lat: 48.36, lng: 10.99, title: 'Friedberg' },
-        { lat: 48.75, lng: 11.45, title: 'Ingolstadt' }
-      ]"></div>
+      <div class='google-map' up-data='[
+        { "lat": 48.36, "lng": 10.99, "title": "Friedberg" },
+        { "lat": 48.75, "lng": 11.45, "title": "Ingolstadt" }
+      ]'></div>
   The JSON will parsed and handed to your compiler as a second argument:
@@ -282,22 +282,32 @@ up.syntax = (($) ->
       value = if u.isString(compiler.keep) then compiler.keep else ''
       $jqueryElement.attr('up-keep', value)
     returnValue = compiler.callback.apply(nativeElement, [$jqueryElement, data($jqueryElement)])
-    for destructor in discoverDestructors(returnValue)
-      addDestructor($jqueryElement, destructor)
+    addDestructor($jqueryElement, returnValue)
-  discoverDestructors = (returnValue) ->
+  ###*
+  Tries to find a list of destructors in a compiler's return value.
+  @param {Object} returnValue
+  @return {Function|undefined}
+  @internal
+  ###
+  normalizeDestructor = (returnValue) ->
     if u.isFunction(returnValue)
-      [returnValue]
-    else if u.isArray(returnValue) && u.all(returnValue, u.isFunction)
       returnValue
-    else
-      []
+    else if u.isArray(returnValue) && u.all(returnValue, u.isFunction)
+      u.sequence(returnValue...)
+  addDestructor = ($element, newDestructor) ->
+    if newDestructor = normalizeDestructor(newDestructor)
+      $element.addClass(DESTRUCTIBLE_CLASS)
+      # The initial destructor function is a function that removes the destructor class and data.
+      elementDestructor = $element.data(DESTRUCTORS_KEY) || -> removeDestructors($element)
+      elementDestructor = u.sequence(elementDestructor, newDestructor)
+      $element.data(DESTRUCTORS_KEY, elementDestructor)
-  addDestructor = ($jqueryElement, destructor) ->
-    $jqueryElement.addClass(DESTRUCTIBLE_CLASS)
-    destructors = $jqueryElement.data(DESTRUCTORS_KEY) || []
-    destructors.push(destructor)
-    $jqueryElement.data(DESTRUCTORS_KEY, destructors)
+  removeDestructors = ($element) ->
+    $element.removeData(DESTRUCTORS_KEY)
+    $element.removeClass(DESTRUCTIBLE_CLASS)
   ###*
   Applies all compilers on the given element and its descendants.
@@ -317,10 +327,11 @@ up.syntax = (($) ->
         for compiler in queue
           $matches = u.findWithSelf($fragment, compiler.selector)
+          # Exclude all elements that are descendants of the subtrees we want to keep.
           $matches = $matches.filter ->
             $match = $(this)
-            u.all $skipSubtrees, (element) ->
-              $match.closest(element).length == 0
+            u.all $skipSubtrees, (skipSubtree) ->
+              $match.closest(skipSubtree).length == 0
           if $matches.length
             up.log.group ("Compiling '%s' on %d element(s)" unless compiler.isDefault), compiler.selector, $matches.length, ->
@@ -338,16 +349,23 @@ up.syntax = (($) ->
   @internal
   ###
   clean = ($fragment) ->
+    prepareClean($fragment)()
+  ###*
+  @function up.syntax.prepareClean
+  @param {jQuery} $fragment
+  @return {Function}
+  @internal
+  ###
+  prepareClean = ($fragment) ->
+    destructors = []
     u.findWithSelf($fragment, ".#{DESTRUCTIBLE_CLASS}").each ->
-      $element = $(this)
-      destructors = $element.data(DESTRUCTORS_KEY)
       # Although destructible elements should always have an array of destructors, we might be
       # destroying a clone of such an element. E.g. Unpoly creates a clone when keeping an
       # [up-keep] element, and that clone still has the .up-destructible class.
-      if destructors
-        destructor() for destructor in destructors
-        $element.removeData(DESTRUCTORS_KEY)
-        $element.removeClass(DESTRUCTIBLE_CLASS)
+      if destructor = $(this).data(DESTRUCTORS_KEY)
+        destructors.push(destructor)
+    u.sequence(destructors...)
   ###*
   Checks if the given element has an [`up-data`](/up-data) attribute.
@@ -359,7 +377,7 @@ up.syntax = (($) ->
   You have an element with JSON data serialized into an `up-data` attribute:
-      <span class="person" up-data="{ age: 18, name: 'Bob' }">Bob</span>
+      <span class='person' up-data='{ "age": 18, "name": "Bob" }'>Bob</span>
   Calling `up.syntax.data()` will deserialize the JSON string into a JavaScript object:
@@ -382,10 +400,10 @@ up.syntax = (($) ->
   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:
-      <div class="google-map" up-data="[
-        { lat: 48.36, lng: 10.99, title: 'Friedberg' },
-        { lat: 48.75, lng: 11.45, title: 'Ingolstadt' }
-      ]"></div>
+      <div class='google-map' up-data='[
+        { "lat": 48.36, "lng": 10.99, "title": "Friedberg" },
+        { "lat": 48.75, "lng": 11.45, "title": "Ingolstadt" }
+      ]'></div>
   The JSON will parsed and handed to your compiler as a second argument:
@@ -454,6 +472,7 @@ up.syntax = (($) ->
   macro: macro
   compile: compile
   clean: clean
+  prepareClean: prepareClean
   data: data
 )(jQuery)

data/lib/assets/javascripts/unpoly/util.coffee CHANGED Viewed

@@ -28,14 +28,14 @@ up.util = (($) ->
   @internal
   ###
   memoize = (func) ->
-    cache = undefined
+    cachedValue = undefined
     cached = false
     (args...) ->
       if cached
-        cache
+        cachedValue
       else
         cached = true
-        cache = func(args...)
+        cachedValue = func(args...)
   ###*
   Returns if the given port is the default port for the given protocol.
@@ -1775,6 +1775,9 @@ up.util = (($) ->
     delete object[key]
     value
+  renameKey = (object, oldKey, newKey) ->
+    object[newKey] = pluckKey(object, oldKey)
   pluckData = (elementOrSelector, key) ->
     $element = $(elementOrSelector)
     value = $element.data(key)
@@ -1893,6 +1896,10 @@ up.util = (($) ->
   ###*
   @function up.util.sequence
+  @param {Array<Function>} functions...
+  @return {Function}
+    A function that will call all `functions` if called.
   @internal
   ###
   sequence = (functions...) ->
@@ -1940,7 +1947,7 @@ up.util = (($) ->
   ###*
   Like `$old.replaceWith($new)`, but keeps event handlers bound to `$old`.
-  Note that this is a memory leak unless you re-attach `$new` to the DOM aferwards.
+  Note that this is a memory leak unless you re-attach `$old` to the DOM aferwards.
   @function up.util.detachWith
   @internal
@@ -1974,7 +1981,6 @@ up.util = (($) ->
   isTruthy = (object) ->
     !!object
-  isDetached: isDetached
   requestDataAsArray: requestDataAsArray
   requestDataAsQuery: requestDataAsQuery
   appendRequestData: appendRequestData
@@ -2071,6 +2077,7 @@ up.util = (($) ->
   error: fail
   pluckData: pluckData
   pluckKey: pluckKey
+  renameKey: renameKey
   extractOptions: extractOptions
   isDetached: isDetached
   noop: noop

data/lib/unpoly/rails/version.rb CHANGED Viewed

@@ -4,6 +4,6 @@ module Unpoly
     # The current version of the unpoly-rails gem.
     # This version number is also used for releases of the Unpoly
     # frontend code.
-    VERSION = '0.36.2'
+    VERSION = '0.37.0'
   end
 end

data/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "unpoly",
-  "version": "0.36.2",
+  "version": "0.37.0",
   "description": "Unobtrusive JavaScript framework",
   "main": "dist/unpoly.js",
   "files": [

data/spec_app/Gemfile.lock CHANGED Viewed

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    unpoly-rails (0.36.1)
+    unpoly-rails (0.36.2)
       rails (>= 3)
 GEM

data/spec_app/app/assets/javascripts/integration_test.coffee CHANGED Viewed

@@ -1,3 +1,7 @@
 #= require jquery
 #= require jquery_ujs
 #= require unpoly
+up.compiler '.compiler', ($element) ->
+  console.error('*** Compiler called for %o', $element.get(0))
+  -> console.error('*** Destructor called for %o', $element.get(0))

data/spec_app/app/controllers/replace_test_controller.rb ADDED Viewed

@@ -0,0 +1,5 @@
+class ReplaceTestController < ApplicationController
+  layout 'integration_test'
+end

data/spec_app/app/views/pages/start.erb CHANGED Viewed

@@ -43,4 +43,8 @@
     <li><%= link_to 'Error', '/error_test/trigger' %></li>
   </ul>
+  <ul>
+    <li><%= link_to 'Fragment update', '/replace_test/page1' %></li>
+  </ul>
 </div>

data/spec_app/app/views/replace_test/_nav.erb ADDED Viewed

@@ -0,0 +1,6 @@
+<ul>
+  <li><a href="page1" up-target="body">Link to page1, replacing <code>body</code></a></li>
+  <li><a href="page1" up-target=".content">Link to page1, replacing <code>.content</code></a></li>
+  <li><a href="page2" up-target="body">Link to page2, replacing <code>body</code></a></li>
+  <li><a href="page2" up-target=".content">Link to page2, replacing <code>.content</code></a></li>
+</ul>

data/spec_app/app/views/replace_test/page1.erb ADDED Viewed

@@ -0,0 +1,14 @@
+<div class="example">
+  <h1>Fragment update test</h1>
+  <p class="before">Before from page1</p>
+  <p class="content compiler">Content from page1</p>
+  <p class="before">After from page1</p>
+  <%= render 'nav' %>
+</div>

data/spec_app/app/views/replace_test/page2.erb ADDED Viewed

@@ -0,0 +1,14 @@
+<div class="example">
+  <h1>Fragment update test</h1>
+  <p class="before">Before from page2</p>
+  <p class="content compiler">Content from page2</p>
+  <p class="before">After from page2</p>
+  <%= render 'nav' %>
+</div>

data/spec_app/config/routes.rb CHANGED Viewed

@@ -7,6 +7,7 @@ Rails.application.routes.draw do
   get 'css_test/:action', controller: 'css_test'
   get 'error_test/:action', controller: 'error_test'
   post 'error_test/:action', controller: 'error_test'
+  get 'replace_test/:action', controller: 'replace_test'
   namespace :form_test do
     resource :basic, only: [:new, :create]

data/spec_app/spec/javascripts/helpers/reset_path.js.coffee CHANGED Viewed

@@ -3,6 +3,5 @@ beforeEach ->
   @titleBeforeExample = document.title
 afterEach ->
-  if up.browser.canPushState()
-    history.replaceState?({ fromResetPathHelper: true }, @titleBeforeExample, @hrefBeforeExample)
+  history.replaceState?({ fromResetPathHelper: true }, @titleBeforeExample, @hrefBeforeExample)
   document.title = @titleBeforeExample

data/spec_app/spec/javascripts/up/dom_spec.js.coffee CHANGED Viewed

@@ -47,6 +47,30 @@ describe 'up.dom', ->
           expect(resolution).toHaveBeenCalled()
           expect($('.middle')).toHaveText('new-middle')
+        describe 'cleaning up', ->
+          it 'calls destructors on the replaced element', ->
+            destructor = jasmine.createSpy('destructor')
+            up.compiler '.container', -> destructor
+            $container = affix('.container')
+            up.hello($container)
+            up.replace('.container', '/path')
+            @respondWith '<div class="container">new text</div>'
+            expect('.container').toHaveText('new text')
+            expect(destructor).toHaveBeenCalled()
+          it 'calls destructors when the replaced element is a singleton element like <body> (bugfix)', ->
+            # isSingletonElement() is true for body, but can't have the example replace the Jasmine test runner UI
+            up.dom.knife.mock('isSingletonElement').and.callFake ($element) -> $element.is('.container')
+            destructor = jasmine.createSpy('destructor')
+            up.compiler '.container', -> destructor
+            $container = affix('.container')
+            up.hello($container)
+            up.replace('.container', '/path')
+            @respondWith '<div class="container">new text</div>'
+            expect('.container').toHaveText('new text')
+            expect(destructor).toHaveBeenCalled()
         describe 'transitions', ->
           it 'returns a promise that will be resolved once the server response was received and the swap transition has completed', (done) ->
@@ -64,7 +88,7 @@ describe 'up.dom', ->
                 done()
           it 'ignores a { transition } option when replacing the body element', (done) ->
-            up.dom.knife.mock('swapBody') # can't have the example replace the Jasmine test runner UI
+            up.dom.knife.mock('swapSingletonElement') # can't have the example replace the Jasmine test runner UI
             up.dom.knife.mock('destroy')  # if we don't swap the body, up.dom will destroy it
             replaceCallback = jasmine.createSpy()
             promise = up.replace('body', '/path', transition: 'cross-fade', duration: 50)
@@ -1201,6 +1225,50 @@ describe 'up.dom', ->
           Trigger.click($keeper)
           expect(handler).toHaveBeenCalled()
+        it 'does not call destructors on a kept alement', ->
+          handler = jasmine.createSpy('event handler')
+          destructor = jasmine.createSpy('destructor')
+          up.compiler '.keeper', ($keeper) ->
+            return destructor
+          $container = affix('.container')
+          $container.html """
+            <div class="keeper" up-keep>old-text</div>
+            """
+          up.hello($container)
+          up.extract '.container', """
+            <div class='container'>
+              <div class="keeper" up-keep>new-text</div>
+            </div>
+            """
+          $keeper = $('.keeper')
+          expect($keeper).toHaveText('old-text')
+          expect(destructor).not.toHaveBeenCalled()
+        it 'calls destructors when a kept element is eventually removed from the DOM', ->
+          handler = jasmine.createSpy('event handler')
+          destructor = jasmine.createSpy('destructor')
+          up.compiler '.keeper', ($keeper) ->
+            return destructor
+          $container = affix('.container')
+          $container.html """
+            <div class="keeper" up-keep>old-text</div>
+            """
+          up.hello($container)
+          up.extract '.container', """
+            <div class='container'>
+              <div class="keeper">new-text</div>
+            </div>
+            """
+          $keeper = $('.keeper')
+          expect($keeper).toHaveText('new-text')
+          expect(destructor).toHaveBeenCalled()
         it 'lets listeners cancel the keeping by preventing default on an up:fragment:keep event', ->
           $keeper = affix('.keeper[up-keep]').text('old-inside')
           $keeper.on 'up:fragment:keep', (event) -> event.preventDefault()

data/spec_app/spec/javascripts/up/feedback_spec.js.coffee CHANGED Viewed

@@ -151,13 +151,15 @@ describe 'up.feedback', ->
           @respondWith('<div class="main">new-text</div>')
           expect($area).not.toHaveClass('up-active')
-        it 'marks clicked modal openers as .up-active while the modal is loading', ->
+        it 'marks clicked modal openers as .up-active while the modal is loading', (done) ->
           $link = affix('a[href="/foo"][up-modal=".main"]')
           affix('.main')
           Trigger.clickSequence($link)
           expect($link).toHaveClass('up-active')
-          @respondWith('<div class="main">new-text</div>')
-          expect($link).not.toHaveClass('up-active')
+          u.nextFrame =>
+            @respondWith('<div class="main">new-text</div>')
+            expect($link).not.toHaveClass('up-active')
+            done()
         it 'removes .up-active from a clicked modal opener if the target is already preloaded (bugfix)', ->
           $link = affix('a[href="/foo"][up-modal=".main"]')