unpoly-rails 0.28.1 → 0.29.0

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

@@ -342,7 +342,7 @@ describe 'up.link', ->
         $form = affix('form[up-target]')
         up.hello($form)
         followSpy = up.link.knife.mock('follow').and.returnValue(u.resolvedPromise())
-        $form.click()
+        Trigger.clickSequence($form)
         expect(followSpy).not.toHaveBeenCalled()
 
       describeCapability 'canPushState', ->
@@ -350,7 +350,7 @@ describe 'up.link', ->
         it 'adds a history entry', ->
           affix('.target')
           $link = affix('a[href="/path"][up-target=".target"]')
-          $link.click()
+          Trigger.clickSequence($link)
           @respondWith('<div class="target">new text</div>')
           expect($('.target')).toHaveText('new text')
           expect(location.pathname).toEqual('/path')
@@ -358,35 +358,41 @@ describe 'up.link', ->
         it 'respects a X-Up-Location header that the server sends in case of a redirect', ->
           affix('.target')
           $link = affix('a[href="/path"][up-target=".target"]')
-          $link.click()
+          Trigger.clickSequence($link)
           @respondWith
             responseText: '<div class="target">new text</div>'
             responseHeaders: { 'X-Up-Location': '/other/path' }
           expect($('.target')).toHaveText('new text')
           expect(location.pathname).toEqual('/other/path')
 
-        it 'prefers to update a container in the same layer as the clicked link', ->
+        it 'prefers to update a container in the same layer as the clicked link', (done) ->
           up.motion.config.enabled = false
 
           $popupOpener = affix('a[href="/popup"]')
           up.popup.attach($popupOpener, html: "<div class='target'>old popup text</div>", target: '.target')
-
           affix('.document').affix('.target').text('old document text')
-          $linkInDocument = affix('a[href="/foo"][up-target=".target"]')
-          $linkInDocument.click()
 
-          @respondWith '<div class="target">new text from document link</div>'
+          $linkInDocument = affix('a[href="/foo"][up-target=".target"]')
+          $linkInPopup = $('.up-popup').affix('a[href="/bar"][up-target=".target"]')
 
-          expect($('.document .target')).toHaveText('new text from document link')
+          expect($('.document .target')).toHaveText('old document text')
           expect($('.up-popup .target')).toHaveText('old popup text')
 
-          $linkInPopup = $('.up-popup').affix('a[href="/bar"][up-target=".target"]')
-          $linkInPopup.click()
+          u.nextFrame =>
+
+            Trigger.clickSequence($linkInPopup)
 
-          @respondWith '<div class="target">new text from popup link</div>'
+            u.nextFrame =>
+              @respondWith '<div class="target">new text from popup link</div>'
 
-          expect($('.document .target')).toHaveText('new text from document link')
-          expect($('.up-popup .target')).toHaveText('new text from popup link')
+              expect($('.document .target')).toHaveText('old document text')
+              expect($('.up-popup .target')).toHaveText('new text from popup link')
+              Trigger.clickSequence($linkInDocument)
+
+              u.nextFrame =>
+                @respondWith '<div class="target">new text from document link</div>'
+                expect($('.document .target')).toHaveText('new text from document link')
+                done()
 
 
         describe 'with [up-transition] modifier', ->
@@ -396,7 +402,7 @@ describe 'up.link', ->
             it 'morphs between the old and new target element', (done) ->
               affix('.target.old')
               $link = affix('a[href="/path"][up-target=".target"][up-transition="cross-fade"][up-duration="500"][up-easing="linear"]')
-              $link.click()
+              Trigger.clickSequence($link)
               @respondWith '<div class="target new">new text</div>'
 
               $oldGhost = $('.target.old.up-ghost')
@@ -414,7 +420,7 @@ describe 'up.link', ->
         oldPathname = location.pathname
         affix('.target')
         $link = affix('a[href="/path"][up-target=".target"][up-history="false"]')
-        $link.click()
+        Trigger.clickSequence($link)
         @respondWith
           responseText: '<div class="target">new text</div>'
           responseHeaders: { 'X-Up-Location': '/other/path' }
@@ -562,15 +568,14 @@ describe 'up.link', ->
         $area = affix('div[up-expand] a[href="/path"]')
         up.hello($area)
         spyOn(up, 'replace')
-        $area.get(0).click()
+        Trigger.clickSequence($area)
         expect(up.replace).toHaveBeenCalled()
 
       it 'does not trigger multiple replaces when the user clicks on the expanded area of an up-instant link (bugfix)', ->
-        $area = affix('div[up-expand] a[href="/path"][up-instant]')
+        $area = affix('div[up-expand] a[href="/path"][up-follow][up-instant]')
         up.hello($area)
         spyOn(up, 'replace')
-        Trigger.mousedown($area)
-        Trigger.click($area)
+        Trigger.clickSequence($area)
         expect(up.replace.calls.count()).toEqual(1)
 
       it 'does not add an up-follow attribute if the expanded link is [up-dash] with a selector (bugfix)', ->

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

@@ -420,66 +420,54 @@ describe 'up.modal', ->
 
     describe '[up-close]', ->
 
+      backgroundClicked = undefined
+
+      beforeEach ->
+        up.motion.config.enabled = false
+        backgroundClicked = jasmine.createSpy('background clicked')
+        up.on 'click', backgroundClicked
+
       describe 'when clicked inside a modal', ->
       
-        it 'closes the open modal and prevents the default action', (done) ->
+        it 'closes the open modal and halts the event chain', (done) ->
           up.modal.extract('.target', '<div class="target"><a up-close>text</a></div>', animation: false)
           $link = $('.up-modal a[up-close]') # link is within the modal
-          wasDefaultPrevented = false
-          wasClosed = false
-          up.on 'click', 'a[up-close]', (event) ->
-            wasDefaultPrevented = event.isDefaultPrevented()
-            true # the line above might return false and cancel propagation / prevent default
-          up.on 'up:modal:close', ->
-            wasClosed = true
-          $link.click()
+          Trigger.clickSequence($link)
           u.nextFrame ->
-            expect(wasClosed).toBe(true)
-            expect(wasDefaultPrevented).toBe(true)
+            expect(up.modal.isOpen()).toBe(false)
+            expect(backgroundClicked).not.toHaveBeenCalled()
             done()
 
       describe 'when no modal is open', ->
 
-        it 'does neither close the modal nor prevent the default action', ->
+        it 'does nothing and allows the event chain to continue', (done) ->
           $link = affix('a[up-close]') # link is outside the modal
           up.hello($link)
-          wasDefaultPrevented = false
-          wasClosed = false
-          up.on 'click', 'a[up-close]', (event) ->
-            wasDefaultPrevented = event.isDefaultPrevented()
-            true # the line above might return false and cancel propagation / prevent default
-          up.on 'up:modal:close', ->
-            wasClosed = true
-          $link.click()
-          expect(wasClosed).toBe(false)
-          expect(wasDefaultPrevented).toBe(false)
+          Trigger.clickSequence($link)
+          u.nextFrame ->
+            expect(backgroundClicked).toHaveBeenCalled()
+            done()
 
     describe 'template behavior', ->
 
       it 'closes the modal on close icon click', (done) ->
-        wasClosed = false
         up.modal.extract('.modal', '<div class="modal">Modal content</div>', animation: false)
 
-        closeIcon = $('.up-modal-close')
-        up.on 'up:modal:close', ->
-          wasClosed = true
+        $closeIcon = $('.up-modal-close')
 
-        closeIcon.click()
+        Trigger.clickSequence($closeIcon)
         u.nextFrame ->
-          expect(wasClosed).toBe(true)
+          expect(up.modal.isOpen()).toBe(false)
           done()
 
       it 'closes the modal on backdrop click', (done) ->
-        wasClosed = false
         up.modal.extract('.modal', '<div class="modal">Modal content</div>', animation: false)
 
-        backdrop = $('.up-modal-backdrop')
-        up.on 'up:modal:close', ->
-          wasClosed = true
+        $backdrop = $('.up-modal-backdrop')
 
-        backdrop.click()
+        Trigger.clickSequence($backdrop)
         u.nextFrame ->
-          expect(wasClosed).toBe(true)
+          expect(up.modal.isOpen()).toBe(false)
           done()
 
       it 'closes the modal when the user presses the escape key', (done) ->
@@ -503,28 +491,22 @@ describe 'up.modal', ->
           expect(modal).not.toContainElement('.up-modal-close')
 
         it 'does not close the modal on backdrop click', (done) ->
-          wasClosed = false
           up.modal.extract('.modal', '<div class="modal">Modal content</div>', animation: false, closable: false)
 
-          backdrop = $('.up-modal-backdrop')
-          up.on 'up:modal:close', ->
-            wasClosed = true
+          $backdrop = $('.up-modal-backdrop')
 
-          backdrop.click()
+          Trigger.clickSequence($backdrop)
           u.nextFrame ->
-            expect(wasClosed).toBe(false)
+            expect(up.modal.isOpen()).toBe(true)
             done()
 
         it 'does not close the modal when the user presses the escape key', (done) ->
-          wasClosed = false
           up.modal.extract('.modal', '<div class="modal">Modal content</div>', animation: false, closable: false)
-          up.on 'up:modal:close', ->
-            wasClosed = true
 
           escapeEvent = $.Event('keydown', keyCode: 27)
           $('body').trigger(escapeEvent)
           u.nextFrame ->
-            expect(wasClosed).toBe(false)
+            expect(up.modal.isOpen()).toBe(true)
             done()
 
     describe 'when replacing content', ->
@@ -597,3 +579,30 @@ describe 'up.modal', ->
         @respondWith("<div class='popup-content'></div>")
         expect($('.up-modal')).toExist()
         expect($('.up-popup')).toExist()
+
+      it 'does not close the modal when a clicked [up-target] link within the modal links to cached content (bugfix)', (done) ->
+
+        up.modal.extract '.content', """
+          <div class="content">
+            <a href="/foo" up-target=".content">link</a>
+          </div>
+          """
+        $link = $('.up-modal .content a')
+        expect($link).toExist()
+        whenPreloaded = up.proxy.preload($link)
+
+        @respondWith """
+          <div class="content">
+            new text
+          </div>
+        """
+
+        whenPreloaded.then ->
+
+          Trigger.clickSequence($link)
+
+          u.nextFrame ->
+            expect($('.up-modal')).toExist()
+            expect($('.up-modal .content')).toHaveText('new text')
+
+            done()

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

@@ -67,7 +67,7 @@ describe 'up.navigation', ->
         it 'marks a link as .up-current if it links to the current URL, but is missing a trailing slash', ->
           $link = affix('a[href="/foo"][up-target=".main"]')
           affix('.main')
-          $link.click()
+          Trigger.clickSequence($link)
           @respondWith
             responseHeaders: { 'X-Up-Location': '/foo/' }
             responseText: '<div class="main">new-text</div>'
@@ -76,7 +76,7 @@ describe 'up.navigation', ->
         it 'marks a link as .up-current if it links to the current URL, but has an extra trailing slash', ->
           $link = affix('a[href="/foo/"][up-target=".main"]')
           affix('.main')
-          $link.click()
+          Trigger.clickSequence($link)
           @respondWith
             responseHeaders: { 'X-Up-Location': '/foo' }
             responseText: '<div class="main">new-text</div>'
@@ -106,7 +106,7 @@ describe 'up.navigation', ->
           $popupLink = affix('a[href="/bar"][up-popup=".main"]')
           $unrelatedLink = affix('a[href="/baz]')
 
-          $popupLink.click()
+          Trigger.clickSequence($popupLink)
           @respondWith('<div class="main">new-text</div>')
           expect($backgroundLink).toHaveClass('up-current')
           expect($popupLink).toHaveClass('up-current')
@@ -127,7 +127,7 @@ describe 'up.navigation', ->
         it 'marks clicked links as .up-active until the request finishes', ->
           $link = affix('a[href="/foo"][up-target=".main"]')
           affix('.main')
-          $link.click()
+          Trigger.clickSequence($link)
           expect($link).toHaveClass('up-active')
           @respondWith('<div class="main">new-text</div>')
           expect($link).not.toHaveClass('up-active')
@@ -145,7 +145,7 @@ describe 'up.navigation', ->
           up.hello($area)
           $link = $area.find('a')
           affix('.main')
-          $link.click()
+          Trigger.clickSequence($link)
           expect($link).not.toHaveClass('up-active')
           expect($area).toHaveClass('up-active')
           @respondWith('<div class="main">new-text</div>')
@@ -154,7 +154,7 @@ describe 'up.navigation', ->
         it 'marks clicked modal openers as .up-active while the modal is loading', ->
           $link = affix('a[href="/foo"][up-modal=".main"]')
           affix('.main')
-          $link.click()
+          Trigger.clickSequence($link)
           expect($link).toHaveClass('up-active')
           @respondWith('<div class="main">new-text</div>')
           expect($link).not.toHaveClass('up-active')
@@ -163,7 +163,7 @@ describe 'up.navigation', ->
           $link = affix('a[href="/foo"][up-modal=".main"]')
           up.proxy.preload($link)
           @respondWith('<div class="main">new-text</div>')
-          $link.click()
+          Trigger.clickSequence($link)
           expect('.up-modal .main').toHaveText('new-text')
           expect($link).not.toHaveClass('up-active')
 
@@ -172,7 +172,7 @@ describe 'up.navigation', ->
           affix('.main')
           up.proxy.preload($link)
           @respondWith('<div class="main">new-text</div>')
-          $link.click()
+          Trigger.clickSequence($link)
           expect('.main').toHaveText('new-text')
           expect($link).not.toHaveClass('up-active')
 

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

@@ -134,7 +134,7 @@ describe 'up.popup', ->
           expect(up.popup.coveredUrl()).toBeMissing()
 
           $popupLink = affix('a[href="/bar"][up-popup=".container"][up-history="true"]')
-          $popupLink.click()
+          Trigger.clickSequence($popupLink)
           @respondWith('<div class="container">text</div>')
           expect(up.popup.coveredUrl()).toEndWith('/foo')
           up.popup.close().then ->
@@ -255,42 +255,37 @@ describe 'up.popup', ->
 
     describe '[up-close]', ->
 
+      backgroundClicked = undefined
+
+      beforeEach ->
+        up.motion.config.enabled = false
+        backgroundClicked = jasmine.createSpy('background clicked')
+        up.on 'click', backgroundClicked
+
       describe 'when clicked inside a popup', ->
 
-        it 'closes the open popup and prevents the default action', (done) ->
-          $link = affix('a')
-          up.popup.attach($link, html: '<div class="target">text</div>', target: '.target').then ->
-            $popup = affix('.up-popup')
-            $link = $popup.affix('a[up-close]') # link is within the popup
-            up.hello($link)
-            wasDefaultPrevented = false
-            wasClosed = false
-            up.on 'click', 'a[up-close]', (event) ->
-              wasDefaultPrevented = event.isDefaultPrevented()
-              true # the line above might return false and cancel propagation / prevent default
-            up.on 'up:popup:close', ->
-              wasClosed = true
-            $link.click()
-            u.nextFrame ->
-              expect(wasClosed).toBe(true)
-              expect(wasDefaultPrevented).toBe(true)
-              done()
+        it 'closes the open popup and halts the event chain', (done) ->
+          $opener = affix('a')
+          up.popup.attach($opener, html: '<div class="target">text</div>', target: '.target')
+          $popup = affix('.up-popup')
+          $closer = $popup.affix('a[up-close]') # link is within the popup
+          up.hello($closer)
+          Trigger.clickSequence($closer)
+          u.nextFrame ->
+            expect(up.popup.isOpen()).toBe(false)
+            expect(backgroundClicked).not.toHaveBeenCalled()
+            done()
 
       describe 'when no popup is open', ->
 
-        it 'does neither close the popup nor prevent the default action', ->
+        it 'does nothing and allows the event chain to continue', (done) ->
           $link = affix('a[up-close]') # link is outside the popup
           up.hello($link)
-          wasDefaultPrevented = false
-          wasClosed = false
-          up.on 'click', 'a[up-close]', (event) ->
-            wasDefaultPrevented = event.isDefaultPrevented()
-            true # the line above might return false and cancel propagation / prevent default
-          up.on 'up:popup:close', ->
-            wasClosed = true
-          $link.click()
-          expect(wasClosed).toBe(false)
-          expect(wasDefaultPrevented).toBe(false)
+          Trigger.clickSequence($link)
+          u.nextFrame ->
+            expect(up.popup.isOpen()).toBe(false)
+            expect(backgroundClicked).toHaveBeenCalled()
+            done()
 
     describe 'when replacing content', ->
 
@@ -300,8 +295,7 @@ describe 'up.popup', ->
       it 'prefers to replace a selector within the popup', ->
         $outside = affix('.foo').text('old outside')
         $link = affix('.link')
-        up.popup.attach($link, target: '.foo')
-        @respondWith("<div class='foo'>old inside</div>")
+        up.popup.attach($link, target: '.foo', html: "<div class='foo'>old inside</div>")
         up.extract('.foo', "<div class='foo'>new text</div>")
         expect($outside).toBeInDOM()
         expect($outside).toHaveText('old outside')
@@ -310,8 +304,7 @@ describe 'up.popup', ->
       it 'auto-closes the popup when a replacement from inside the popup affects a selector behind the popup', ->
         affix('.outside').text('old outside')
         $link = affix('.link')
-        up.popup.attach($link, target: '.inside')
-        @respondWith("<div class='inside'>old inside</div>")
+        up.popup.attach($link, target: '.inside', html: "<div class='inside'>old inside</div>")
         up.extract('.outside', "<div class='outside'>new outside</div>", origin: $('.inside'))
         expect($('.outside')).toHaveText('new outside')
         expect($('.up-popup')).not.toExist()
@@ -325,7 +318,7 @@ describe 'up.popup', ->
         affix('.outside').text('old outside')
         $link = affix('.link')
         whenPopupOpen = up.popup.attach($link, url: '/path', target: '.inside')
-        @respondWith("<div class='inside'>old inside</div>") # Populate popup
+        @respondWith("<div class='inside'>old inside</div>")
 
         whenPopupOpen.then ->
           up.extract('.outside', "<div class='outside'>new outside</div>",
@@ -347,8 +340,7 @@ describe 'up.popup', ->
       it 'does not auto-close the popup when a replacement from outside the popup affects a selector outside the popup', ->
         affix('.outside').text('old outside')
         $link = affix('.link')
-        up.popup.attach($link, target: '.inside')
-        @respondWith("<div class='inside'>old inside</div>")
+        up.popup.attach($link, target: '.inside', html: "<div class='inside'>old inside</div>")
         up.extract('.outside', "<div class='outside'>new outside</div>", origin: $('.outside'))
         expect($('.outside')).toHaveText('new outside')
         expect($('.up-popup')).toExist()
@@ -356,8 +348,7 @@ describe 'up.popup', ->
       it 'does not auto-close the popup when a replacement from outside the popup affects a selector inside the popup', ->
         affix('.outside').text('old outside')
         $link = affix('.link')
-        up.popup.attach($link, target: '.inside')
-        @respondWith("<div class='inside'>old inside</div>")
+        up.popup.attach($link, target: '.inside', html: "<div class='inside'>old inside</div>")
         up.extract('.inside', "<div class='inside'>new inside</div>", origin: $('.outside'))
         expect($('.inside')).toHaveText('new inside')
         expect($('.up-popup')).toExist()
@@ -367,10 +358,67 @@ describe 'up.popup', ->
       beforeEach ->
         up.motion.config.enabled = false
 
-      it 'closes a popup on mousedown (in case an [up-instant] link removes its parent and thus a click event never fires)', ->
+      it 'closes the popup', (done) ->
         affix('.outside').text('old outside')
         $link = affix('.link')
-        up.popup.attach($link, target: '.inside')
-        @respondWith("<div class='inside'>inside</div>")
-        Trigger.mousedown($('body'))
-        expect($('.up-popup')).not.toExist()
+        up.popup.attach($link, target: '.inside', html: "<div class='inside'>inside</div>")
+        expect(up.popup.isOpen()).toBe(true)
+        Trigger.clickSequence($('body'))
+        u.nextFrame ->
+          expect(up.popup.isOpen()).toBe(false)
+          done()
+
+      it 'closes the popup when a an [up-instant] link removes its parent (and thus a click event never bubbles up to the document)', (done) ->
+        $parent = affix('.parent')
+        $parentReplacingLink = $parent.affix('a[href="/foo"][up-target=".parent"][up-instant]')
+        $popupOpener = affix('.link')
+        up.popup.attach($popupOpener, target: '.inside', html: "<div class='inside'>inside</div>")
+        expect(up.popup.isOpen()).toBe(true)
+        Trigger.clickSequence($parentReplacingLink)
+        u.nextFrame ->
+          expect(up.popup.isOpen()).toBe(false)
+          done()
+
+      it 'closes the popup when the user clicks on an [up-target] link outside the popup', (done) ->
+        $target = affix('.target')
+        $outsideLink = affix('a[href="/foo"][up-target=".target"]')
+        $popupOpener = affix('.link')
+        up.popup.attach($popupOpener, target: '.inside', html: "<div class='inside'>inside</div>")
+        expect(up.popup.isOpen()).toBe(true)
+        Trigger.clickSequence($outsideLink)
+        u.nextFrame ->
+          expect(up.popup.isOpen()).toBe(false)
+          done()
+
+      it 'closes the popup when the user clicks on an [up-instant] link outside the popup', (done) ->
+        $target = affix('.target')
+        $outsideLink = affix('a[href="/foo"][up-target=".target"][up-instant]')
+        $popupOpener = affix('.link')
+        up.popup.attach($popupOpener, target: '.inside', html: "<div class='inside'>inside</div>")
+        expect(up.popup.isOpen()).toBe(true)
+        Trigger.clickSequence($outsideLink)
+        u.nextFrame ->
+          expect(up.popup.isOpen()).toBe(false)
+          done()
+
+      it 'does not close the popup if a link outside the popup is followed with the up.follow function (bugfix)', (done) ->
+        $target = affix('.target')
+        $outsideLink = affix('a[href="/foo"][up-target=".target"]')
+        $popupOpener = affix('.link')
+        up.popup.attach($popupOpener, target: '.inside', html: "<div class='inside'>inside</div>")
+        expect(up.popup.isOpen()).toBe(true)
+        up.follow($outsideLink)
+        u.nextFrame ->
+          expect(up.popup.isOpen()).toBe(true)
+          done()
+
+      it 'does not close the popup if a form outside the popup is followed with the up.submit function (bugfix)', (done) ->
+        $target = affix('.target')
+        $outsideForm = affix('form[action="/foo"][up-target=".target"]')
+        $popupOpener = affix('.link')
+        up.popup.attach($popupOpener, target: '.inside', html: "<div class='inside'>inside</div>")
+        expect(up.popup.isOpen()).toBe(true)
+        up.submit($outsideForm)
+        u.nextFrame ->
+          expect(up.popup.isOpen()).toBe(true)
+          done()