unpoly-rails 0.60.2 → 0.62.1

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

@@ -250,6 +250,7 @@ up.modal = do ->
   createHiddenFrame = (target, options) ->
     html = templateHtml()
     state.modalElement = modalElement = e.createFromHtml(html)
+    modalElement.setAttribute('aria-modal', 'true') # tell modern screen readers to make all other elements inert
     modalElement.setAttribute('up-flavor', state.flavor)
     modalElement.setAttribute('up-position', state.position) if u.isPresent(state.position)
 
@@ -288,7 +289,7 @@ up.modal = do ->
       var link = document.querySelector('a')
       up.modal.follow(link)
 
-  Any option attributes for [`a[up-modal]`](/a.up-modal) will be honored.
+  Any option attributes for [`a[up-modal]`](/a-up-modal) will be honored.
 
   Emits events [`up:modal:open`](/up:modal:open) and [`up:modal:opened`](/up:modal:opened).
 
@@ -436,6 +437,7 @@ up.modal = do ->
     options.layer = 'modal'
     options.failTarget ?= link.getAttribute('up-fail-target')
     options.failLayer ?= link.getAttribute('up-fail-layer') ? 'auto'
+    options.cache ?= e.booleanAttr(link, 'up-cache')
 
     animateOptions = up.motion.animateOptions(options, link, duration: flavorDefault('openDuration', options.flavor), easing: flavorDefault('openEasing', options.flavor))
 
@@ -650,7 +652,7 @@ up.modal = do ->
 
   Clicking would request the path `/blog` and select `.blog-list` from
   the HTML response. Unpoly will dim the page
-  and place the matching `.blog-list` tag will be placed in
+  and place the matching `.blog-list` tag in
   a modal dialog.
 
   @selector a[up-modal]

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

@@ -99,7 +99,7 @@ up.motion = do ->
 
   You can pass additional options:
 
-      up.animate('warning', '.fade-in', {
+      up.animate('.warning', 'fade-in', {
         delay: 1000,
         duration: 250,
         easing: 'linear'

data/lib/assets/javascripts/unpoly/protocol.coffee

@@ -246,7 +246,7 @@ up.protocol = do ->
     The parameter name can be configured as a string or as function that returns the parameter name.
     If no name is set, no token will be sent.
 
-    Defaults to the `content` attribute of a `<meta>` tag named `csrf-token`:
+    Defaults to the `content` attribute of a `<meta>` tag named `csrf-param`:
 
         <meta name="csrf-param" content="authenticity_token" />
 

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

@@ -215,7 +215,7 @@ up.syntax = do ->
   ###**
   Registers a [compiler](/up.compiler) that is run before all other compilers.
 
-  Use `up.macro()` to register a compiler that sets multiply Unpoly attributes.
+  Use `up.macro()` to register a compiler that sets multiple Unpoly attributes.
 
   \#\#\# Example
 
@@ -373,10 +373,9 @@ up.syntax = do ->
   clean = (fragment) ->
     cleanables = e.subtree(fragment, '.up-can-clean')
     u.each cleanables, (cleanable) ->
-      if destructors = cleanable.upDestructors
+      if destructors = u.pluckKey(cleanable, 'upDestructors')
         destructor() for destructor in destructors
-      # We do not actually remove the #upDestructors property or .up-can-* classes for performance reasons.
-      # The element we just cleaned is about to be removed from the DOM.
+      cleanable.classList.remove('up-can-clean')
 
   ###**
   Checks if the given element has an [`up-data`](/up-data) attribute.

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

@@ -499,7 +499,8 @@ up.util = do ->
   @stable
   ###
   isJQuery = (object) ->
-    up.browser.canJQuery() && (object instanceof jQuery)
+    # We cannot do `object instanceof jQuery` since window.jQuery might not be set
+    !!object?.jquery
 
   ###**
   Returns whether the given argument is an object with a `then` method.

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

@@ -506,13 +506,37 @@ up.viewport = do ->
 
   The scroll positions will be associated with the current URL.
   They can later be restored by calling [`up.viewport.restoreScroll()`](/up.viewport.restoreScroll)
-  at the same URL.
+  at the same URL, or by following a link with an [`[up-restore-scroll]`](/a-up-follow#up-restore-scroll)
+  attribute.
 
-  Unpoly automatically saves scroll positions whenever a fragment was updated on the page.
+  Unpoly automatically saves scroll positions before a [fragment update](/up.replace)
+  you will rarely need to call this function yourself.
+
+  \#\#\# Examples
+
+  Should you need to save the current scroll positions outside of a [fragment update](/up.replace),
+  you may call:
+
+      up.viewport.saveScroll()
+
+  Instead of saving the current scroll positions for the current URL, you may also pass another
+  url or vertical scroll positionsfor each viewport:
+
+      up.viewport.saveScroll({
+        url: '/inbox',
+        tops: {
+          'body': 0,
+          '.sidebar', 100,
+          '.main', 320
+        }
+      })
 
   @function up.viewport.saveScroll
   @param {string} [options.url]
+    The URL for which to save scroll positions.
+    If omitted, the current browser location is used.
   @param {Object<string, number>} [options.tops]
+    An object mapping viewport selectors to vertical scroll positions in pixels.
   @experimental
   ###
   saveScroll = (options = {}) ->

data/lib/unpoly/rails/version.rb

@@ -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.60.2'
+    VERSION = '0.62.1'
   end
 end

data/package.json

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

data/spec_app/Gemfile

@@ -14,11 +14,9 @@ gem 'bower-rails'
 gem 'bootstrap-sass', '~> 3.3'
 gem 'rake', '< 11'
 
-# Jasmine spec runner won't boot with a more modern version of sprockets.
-# It crashes with an "asset not precompiled" error.
 gem 'tilt', '=1.4.1'
-gem 'sprockets-rails', '=2.2.4'
-gem 'sprockets', '=2.12.3'
+gem 'sprockets-rails', '~> 3.2.1'
+gem 'sprockets', '~> 3.7.2'
 
 group :development, :test do
   gem 'byebug'

data/spec_app/Gemfile.lock

@@ -12,7 +12,7 @@ GIT
 PATH
   remote: ..
   specs:
-    unpoly-rails (0.60.1)
+    unpoly-rails (0.62.0)
       rails (>= 3)
 
 GEM
@@ -62,7 +62,7 @@ GEM
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
     bower-rails (0.9.2)
-    builder (3.2.3)
+    builder (3.2.4)
     byebug (3.5.1)
       columnize (~> 0.8)
       debugger-linecache (~> 1.2)
@@ -75,8 +75,8 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     columnize (0.9.0)
-    concurrent-ruby (1.1.4)
-    crass (1.0.4)
+    concurrent-ruby (1.1.6)
+    crass (1.0.6)
     debug_inspector (0.0.2)
     debugger-linecache (1.2.0)
     diff-lcs (1.2.5)
@@ -92,7 +92,6 @@ GEM
       haml (>= 3.1, < 5.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
-    hike (1.2.3)
     hpricot (0.8.6)
     html2haml (1.0.1)
       erubis (~> 2.7.0)
@@ -102,25 +101,24 @@ GEM
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     jasmine-core (2.99.2)
-    jquery-rails (4.3.1)
+    jquery-rails (4.3.5)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (1.8.6)
     libv8 (3.16.14.3)
-    loofah (2.2.3)
+    loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     mime-types (2.99)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    multi_json (1.13.1)
-    nokogiri (1.9.1)
+    minitest (5.14.0)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     phantomjs (2.1.1.0)
-    rack (1.6.11)
+    rack (1.6.13)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.2.0)
@@ -140,8 +138,8 @@ GEM
       activesupport (>= 4.2.0, < 5.0)
       nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
     railties (4.2.0)
       actionpack (= 4.2.0)
       activesupport (= 4.2.0)
@@ -177,23 +175,21 @@ GEM
       tilt (>= 1.1, < 3)
     sexp_processor (4.4.4)
     slop (3.6.0)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.4)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     sqlite3 (1.3.10)
     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
-    thor (0.20.3)
+    thor (1.0.1)
     thread_safe (0.3.6)
     tilt (1.4.1)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     uglifier (2.6.0)
       execjs (>= 0.3.0)
@@ -220,8 +216,8 @@ DEPENDENCIES
   rake (< 11)
   rspec-rails
   sass-rails (~> 5.0)
-  sprockets (= 2.12.3)
-  sprockets-rails (= 2.2.4)
+  sprockets (~> 3.7.2)
+  sprockets-rails (~> 3.2.1)
   sqlite3
   therubyracer
   tilt (= 1.4.1)
@@ -230,4 +226,4 @@ DEPENDENCIES
   web-console (~> 2.0)
 
 BUNDLED WITH
-   1.16.4
+   1.17.3

data/spec_app/app/views/css_test/modal.erb

@@ -1,6 +1,6 @@
 <script>
   var u = up.util;
-  up.compiler('.clamped-open', function($link) {
+  up.$compiler('.clamped-open', function($link) {
     $link.on('click', function(event) {
       event.preventDefault();
       u.task(function() {

data/spec_app/app/views/css_test/popup.erb

@@ -1,6 +1,6 @@
 <script>
   var u = up.util;
-  up.compiler('.clamped-open', function(link) {
+  up.$compiler('.clamped-open', function(link) {
     link.addEventListener('click', function(event) {
       event.preventDefault();
       u.task(function() {

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

@@ -63,7 +63,8 @@
     <li><%= link_to 'Form (redirect)', '/form_test/redirect/new' %></li>
     <li><%= link_to 'Error', '/error_test/trigger' %></li>
     <li><%= link_to 'Booting with non-GET method', '/method_test/page1' %></li>
-    <li><%= link_to 'Fragment update', '/replace_test/page1' %></li>
+    <li><%= link_to 'Fragment update (basic)', '/replace_test/page1' %></li>
+    <li><%= link_to 'Fragment update (table)', '/replace_test/table' %></li>
     <li><%= link_to 'Hash links (without Unpoly)', '/hash_test/vanilla#one' %></li>
     <li><%= link_to 'Hash links (with Unpoly)', '/hash_test/unpoly#one' %></li>
     <li><%= link_to 'Revealing content in an overflowing <div> ', '/reveal_test/within_overflowing_div_viewport' %></li>

data/spec_app/app/views/replace_test/table.erb

@@ -0,0 +1,16 @@
+<table>
+  <tbody>
+    <tr id="one">
+      <td><%= Time.now %></td>
+      <td><a href="table" up-target="#one">Replace this row</a></td>
+    </tr>
+    <tr id="two">
+      <td><%= Time.now %></td>
+      <td><a href="table" up-target="#two">Replace this row</a></td>
+    </tr>
+    <tr id="three">
+      <td><%= Time.now %></td>
+      <td><a href="table" up-target="#three">Replace this row</a></td>
+    </tr>
+  </tbody>
+</table>

data/spec_app/spec/javascripts/up/event_spec.js.coffee

@@ -494,3 +494,37 @@ describe 'up.event', ->
         promiseState(promise).then (result) ->
           expect(result.state).toEqual('rejected')
           done()
+
+    describe 'up.event.halt', ->
+
+      it 'stops propagation of the given event to other event listeners on the same element', ->
+        otherListenerBefore = jasmine.createSpy()
+        otherListenerAfter = jasmine.createSpy()
+        element = fixture('div')
+
+        element.addEventListener('foo', otherListenerBefore)
+        element.addEventListener('foo', up.event.halt)
+        element.addEventListener('foo', otherListenerAfter)
+
+        up.emit(element, 'foo')
+
+        expect(otherListenerBefore).toHaveBeenCalled()
+        expect(otherListenerAfter).not.toHaveBeenCalled()
+
+      it 'stops the event from bubbling up the document tree', ->
+        parent = fixture('div')
+        element = e.affix(parent, 'div')
+        parentListener = jasmine.createSpy()
+        parent.addEventListener('foo', parentListener)
+        element.addEventListener('foo', up.event.halt)
+
+        up.emit(element, 'foo')
+
+        expect(parentListener).not.toHaveBeenCalled()
+
+      it 'prevents default on the event', ->
+        element = fixture('div')
+        element.addEventListener('foo', up.event.halt)
+        event = up.emit(element, 'foo')
+        expect(event.defaultPrevented).toBe(true)
+

data/spec_app/spec/javascripts/up/form_spec.js.coffee

@@ -6,6 +6,47 @@ describe 'up.form', ->
 
   describe 'JavaScript functions', ->
 
+    describe 'up.form.fields', ->
+
+      it 'returns a list of form fields within the given element', ->
+        form = fixture('form')
+        textField = e.affix(form, 'input[type=text]')
+        select = e.affix(form, 'select')
+        results = up.form.fields(form)
+        expect(results).toMatchList([textField, select])
+
+      it 'returns an empty list if the given element contains no form fields', ->
+        form = fixture('form')
+        results = up.form.fields(form)
+        expect(results).toMatchList([])
+
+      it 'returns a list of the given element if the element is itself a form field', ->
+        textArea = fixture('textarea')
+        results = up.form.fields(textArea)
+        expect(results).toMatchList([textArea])
+
+      it 'ignores fields outside the given form', ->
+        form1 = fixture('form')
+        form1Field = e.affix(form1, 'input[type=text]')
+        form2 = fixture('form')
+        form2Field = e.affix(form2, 'input[type=text]')
+        results = up.form.fields(form1)
+        expect(results).toMatchList([form1Field])
+
+      it "includes fields outside the form with a [form] attribute matching the given form's ID", ->
+        form = fixture('form#form-id')
+        insideField = e.affix(form, 'input[type=text]')
+        outsideField = fixture('input[type=text][form=form-id]')
+        results = up.form.fields(form)
+        expect(results).toMatchList([insideField, outsideField])
+
+      it "does not return duplicate fields if a field with a matching [form] attribute is also a child of the form", ->
+        form = fixture('form#form-id')
+        field = e.affix(form, 'input[type=text][form=form-id]')
+        results = up.form.fields(form)
+        expect(results).toMatchList([field])
+
+
     describe 'up.observe', ->
 
       beforeEach ->
@@ -858,6 +899,23 @@ describe 'up.form', ->
         Trigger.change($field)
         next => expect(submitSpy).toHaveBeenCalled()
 
+      it 'submits the form when a change is observed on a container for a radio button group', asyncSpec (next) ->
+        form = fixture('form')
+        group = e.affix(form, '.group[up-autosubmit][up-delay=0]')
+        radio1 = e.affix(group, 'input[type=radio][name=foo][value=1]')
+        radio2 = e.affix(group, 'input[type=radio][name=foo][value=2]')
+        up.hello(form)
+        submitSpy = up.form.knife.mock('submit').and.returnValue(Promise.reject())
+        Trigger.clickSequence(radio1)
+        next =>
+          expect(submitSpy.calls.count()).toBe(1)
+          Trigger.clickSequence(radio2)
+        next =>
+          expect(submitSpy.calls.count()).toBe(2)
+          Trigger.clickSequence(radio1)
+        next =>
+          expect(submitSpy.calls.count()).toBe(3)
+
     describe 'form[up-autosubmit]', ->
 
       it 'submits the form when a change is observed in any of its fields', asyncSpec (next) ->
@@ -1013,16 +1071,17 @@ describe 'up.form', ->
           container.innerHTML = """
             <form action="/users" id="registration">
 
-              <label>
+              <div up-fieldset>
                 <input type="text" name="email" up-validate />
-              </label>
+              </div>
 
-              <label>
+              <div up-fieldset>
                 <input type="password" name="password" up-validate />
-              </label>
+              </div>
 
             </form>
           """
+          up.hello(container)
 
           Trigger.change $('#registration input[name=password]')
 
@@ -1030,24 +1089,93 @@ describe 'up.form', ->
             @respondWith """
               <form action="/users" id="registration">
 
-                <label>
+                <div up-fieldset>
                   Validation message
                   <input type="text" name="email" up-validate />
-                </label>
+                </div>
 
-                <label>
+                <div up-fieldset>
                   Validation message
                   <input type="password" name="password" up-validate />
-                </label>
+                </div>
 
               </form>
             """
 
           next =>
-            $labels = $('#registration label')
+            $labels = $('#registration [up-fieldset]')
             expect($labels[0]).not.toHaveText('Validation message')
             expect($labels[1]).toHaveText('Validation message')
 
+    describe 'form[up-validate]', ->
+
+      # it 'prints an error saying that this form is not yet supported', ->
+
+      it 'performs server-side validation for all fieldsets contained within the form', asyncSpec (next) ->
+        container = fixture('.container')
+        container.innerHTML = """
+          <form action="/users" id="registration" up-validate>
+
+            <div up-fieldset>
+              <input type="text" name="email">
+            </div>
+
+            <div up-fieldset>
+              <input type="password" name="password">
+            </div>
+
+          </form>
+        """
+        up.hello(container)
+
+        Trigger.change $('#registration input[name=password]')
+
+        next =>
+          expect(jasmine.Ajax.requests.count()).toEqual(1)
+          expect(@lastRequest().requestHeaders['X-Up-Validate']).toEqual('password')
+          expect(@lastRequest().requestHeaders['X-Up-Target']).toEqual('[up-fieldset]:has(input[name="password"])')
+
+
+          @respondWith """
+            <form action="/users" id="registration" up-validate>
+
+              <div up-fieldset>
+                Validation message
+                <input type="text" name="email">
+              </div>
+
+              <div up-fieldset>
+                Validation message
+                <input type="password" name="password">
+              </div>
+
+            </form>
+          """
+
+        next =>
+          $labels = $('#registration [up-fieldset]')
+          expect($labels[0]).not.toHaveText('Validation message')
+          expect($labels[1]).toHaveText('Validation message')
+
+      it 'only sends a single request when a radio button group changes', asyncSpec (next) ->
+        container = fixture('.container')
+        container.innerHTML = """
+          <form action="/users" id="registration" up-validate>
+
+            <div up-fieldset>
+              <input type="radio" name="foo" value="1" checked>
+              <input type="radio" name="foo" value="2">
+            </div>
+
+          </form>
+        """
+        up.hello(container)
+
+        Trigger.change $('#registration input[value="2"]')
+
+        next =>
+          expect(jasmine.Ajax.requests.count()).toEqual(1)
+
     describe '[up-switch]', ->
 
       describe 'on a select', ->