unpoly-rails 0.50.1 → 0.50.2

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

@@ -261,10 +261,11 @@ up.link = (($) ->
     unless isFollowable($link)
       $link.attr('up-follow', '')
 
-  childClicked = (event, $link) ->
+  shouldProcessEvent = (event, $link) ->
     $target = $(event.target)
-    $targetLink = $target.closest('a, [up-href]')
-    $targetLink.length && $link.find($targetLink).length
+    $targetedChildLink = $target.closest('a, [up-href]').not($link)
+    $targetedInput = up.form.fieldSelector().seekUp($target)
+    $targetedChildLink.length == 0 && $targetedInput.length == 0 && u.isUnmodifiedMouseEvent(event)
 
   ###*
   Returns whether the given link has a [safe](https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.1.1)
@@ -553,7 +554,7 @@ up.link = (($) ->
   makeFollowable: makeFollowable
   isSafe: isSafe
   isFollowable: isFollowable
-  childClicked: childClicked
+  shouldProcessEvent: shouldProcessEvent
   followMethod: followMethod
   addFollowVariant: addFollowVariant
   followVariantForLink: followVariantForLink

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

@@ -159,7 +159,7 @@ up.proxy = (($) ->
 
       up.request('/search', data: { query: 'sunshine' }).then(function(response) {
         console.log('The response text is %o', response.text);
-      }).fail(function() {
+      }).catch(function() {
         console.error('The request failed');
       });
 
@@ -266,7 +266,7 @@ up.proxy = (($) ->
 
       up.request('/search', data: { query: 'sunshine' }).then(function(text) {
         console.log('The response text is %o', text);
-      }).fail(function() {
+      }).catch(function() {
         console.error('The request failed');
       });
 
@@ -631,11 +631,11 @@ up.proxy = (($) ->
     but will also make the interaction feel less instant.
   @stable
   ###
-  up.on 'mouseover mousedown touchstart', 'a[up-preload], [up-href][up-preload]', (event, $element) ->
+  up.on 'mouseover mousedown touchstart', 'a[up-preload], [up-href][up-preload]', (event, $link) ->
     # Don't do anything if we are hovering over the child of a link.
     # The actual link will receive the event and bubble in a second.
-    if !up.link.childClicked(event, $element) && up.link.isSafe($element)
-      checkPreload($element)
+    if up.link.shouldProcessEvent(event, $link) && up.link.isSafe($link)
+      checkPreload($link)
 
   up.on 'up:framework:reset', reset
 

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

@@ -345,10 +345,14 @@ up.syntax = (($) ->
           $matches = u.selectInSubtree($fragment, compiler.selector)
 
           # Exclude all elements that are descendants of the subtrees we want to keep.
-          $matches = $matches.filter ->
-            $match = $(this)
-            u.all $skipSubtrees, (skipSubtree) ->
-              $match.closest(skipSubtree).length == 0
+          # We only do this if `options.skip` was given, since the exclusion
+          # process below is very expensive (we had a case where compiling 100 slements
+          # took 1.5s because of this).
+          if $skipSubtrees.length
+            $matches = $matches.filter ->
+              $match = $(this)
+              u.all $skipSubtrees, (skipSubtree) ->
+                $match.closest(skipSubtree).length == 0
 
           if $matches.length
             up.log.group ("Compiling '%s' on %d element(s)" unless compiler.isSystem), compiler.selector, $matches.length, ->

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.50.1'
+    VERSION = '0.50.2'
   end
 end

data/package.json

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

data/spec_app/Gemfile.lock

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

data/spec_app/spec/javascripts/helpers/trigger.js.coffee

@@ -81,6 +81,6 @@
   mouseup: mouseup
   click: click
   clickSequence: clickSequence
-
+  createMouseEvent: createMouseEvent
   
 )()

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

@@ -207,6 +207,12 @@ describe 'up.layout', ->
             # [F] 0 ............ 99
             expect($(document).scrollTop()).toBe(@clientHeight + 50)
 
+        it 'does not crash when called with a CSS selector (bugfix)', (done) ->
+          promise = up.reveal('.container')
+          promiseState(promise).then (result) ->
+            expect(result.state).toEqual('fulfilled')
+            done()
+
         describe 'with { top: true } option', ->
 
           it 'scrolls the viewport to the first row of the element, even if that element is already fully revealed', asyncSpec (next) ->

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

@@ -368,7 +368,7 @@ describe 'up.link', ->
 
       describeFallback 'canPushState', ->
 
-        it 'follows the given link', asyncSpec (next) ->
+        it 'navigates to the given link without JavaScript', asyncSpec (next) ->
           $link = affix('a[href="/path"]')
           spyOn(up.browser, 'navigate')
           up.follow($link)
@@ -384,6 +384,57 @@ describe 'up.link', ->
           next =>
             expect(up.browser.navigate).toHaveBeenCalledWith('/path', { method: 'PUT' })
 
+    describe 'up.link.shouldProcessEvent', ->
+
+      buildEvent = ($element, attrs) ->
+        event = Trigger.createMouseEvent('mousedown', attrs)
+        event = $.event.fix(event) # convert native event to jQuery event
+        event.target = u.unJQuery($element)
+        event
+
+      it "returns true when the given event's target is the given link itself", ->
+        $link = affix('a[href="/foo"]')
+        event = buildEvent($link)
+        expect(up.link.shouldProcessEvent(event, $link)).toBe(true)
+
+      it "returns true when the given event's target is a non-link child of the given link", ->
+        $link = affix('a[href="/foo"]')
+        $span = $link.affix('span')
+        event = buildEvent($span)
+        expect(up.link.shouldProcessEvent(event, $link)).toBe(true)
+
+      it "returns false when the given event's target is a child link of the given link (think [up-expand])", ->
+        $link = affix('div[up-href="/foo"]')
+        $childLink = $link.affix('a[href="/bar"]')
+        event = buildEvent($childLink)
+        expect(up.link.shouldProcessEvent(event, $link)).toBe(false)
+
+      it "returns false when the given event's target is a child input of the given link (think [up-expand])", ->
+        $link = affix('div[up-href="/foo"]')
+        $childInput = $link.affix('input[type="text"]')
+        event = buildEvent($childInput)
+        expect(up.link.shouldProcessEvent(event, $link)).toBe(false)
+
+      it 'returns false if the right mouse button is used', ->
+        $link = affix('a[href="/foo"]')
+        event = buildEvent($link, button: 2)
+        expect(up.link.shouldProcessEvent(event, $link)).toBe(false)
+
+      it 'returns false if shift is pressed during the click', ->
+        $link = affix('a[href="/foo"]')
+        event = buildEvent($link, shiftKey: 2)
+        expect(up.link.shouldProcessEvent(event, $link)).toBe(false)
+
+      it 'returns false if ctrl is pressed during the click', ->
+        $link = affix('a[href="/foo"]')
+        event = buildEvent($link, ctrlKey: 2)
+        expect(up.link.shouldProcessEvent(event, $link)).toBe(false)
+
+      it 'returns false if meta is pressed during the click', ->
+        $link = affix('a[href="/foo"]')
+        event = buildEvent($link, metaKey: 2)
+        expect(up.link.shouldProcessEvent(event, $link)).toBe(false)
+
     describe 'up.link.makeFollowable', ->
 
       it "adds [up-follow] to a link that wouldn't otherwise be handled by Unpoly", ->
@@ -824,6 +875,27 @@ describe 'up.link', ->
         next =>
           expect(up.replace).toHaveBeenCalled()
 
+      it 'does nothing when the user clicks another link in the expanded area', asyncSpec (next) ->
+        $area = affix('div[up-expand]')
+        $expandedLink = $area.affix('a[href="/expanded-path"][up-follow]')
+        $otherLink = $area.affix('a[href="/other-path"][up-follow]')
+        up.hello($area)
+        followSpy = up.link.knife.mock('defaultFollow').and.returnValue(Promise.resolve())
+        Trigger.clickSequence($otherLink)
+        next =>
+          expect(followSpy.calls.count()).toEqual(1)
+          expect(followSpy.calls.mostRecent().args[0]).toEqual($otherLink)
+
+      it 'does nothing when the user clicks on an input in the expanded area', asyncSpec (next) ->
+        $area = affix('div[up-expand]')
+        $expandedLink = $area.affix('a[href="/expanded-path"][up-follow]')
+        $input = $area.affix('input[type=text]')
+        up.hello($area)
+        followSpy = up.link.knife.mock('defaultFollow').and.returnValue(Promise.resolve())
+        Trigger.clickSequence($input)
+        next =>
+          expect(followSpy).not.toHaveBeenCalled()
+
       it 'does not trigger multiple replaces when the user clicks on the expanded area of an [up-instant] link (bugfix)', asyncSpec (next) ->
         $area = affix('div[up-expand] a[href="/path"][up-follow][up-instant]')
         up.hello($area)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unpoly-rails
 version: !ruby/object:Gem::Version
-  version: 0.50.1
+  version: 0.50.2
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-18 00:00:00.000000000 Z
+date: 2017-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails