upjs-rails 0.16.0 → 0.17.0

data/lib/assets/javascripts/up/modal.js.coffee

@@ -430,13 +430,12 @@ up.modal = (($) ->
   @param [up-history]
   @stable
   ###
-  up.on('click', 'a[up-modal]', (event, $link) ->
+  up.link.registerFollowVariant '[up-modal]', ($link) ->
     event.preventDefault()
     if $link.is('.up-current')
       close()
     else
       follow($link)
-  )
 
   # Close the modal when someone clicks outside the dialog
   # (but not on a modal opener).

data/lib/assets/javascripts/up/navigation.js.coffee

@@ -119,14 +119,14 @@ up.navigation = (($) ->
   The user clicks on the link. While the request is loading,
   the link has the `up-active` class:
 
-      <a href="/foo" up-follow up-active>Foo</a>
+      <a href="/foo" up-follow class="up-active">Foo</a>
 
   Once the link destination has loaded and rendered, the `up-active` class
   is removed and the [`up-current`](/up-current) class is added:
 
-      <a href="/foo" up-follow up-current>Foo</a>
+      <a href="/foo" up-follow class="up-current">Foo</a>
 
-  @selector [up-active]
+  @selector .up-active
   @stable
   ###
   sectionClicked = ($section) ->
@@ -162,7 +162,7 @@ up.navigation = (($) ->
   If the browser location changes to `/foo`, the markup changes to this:
 
       <nav>
-        <a href="/foo" up-current>Foo</a>
+        <a href="/foo" class="up-current">Foo</a>
         <a href="/bar">Bar</a>
       </nav>
 
@@ -189,7 +189,7 @@ up.navigation = (($) ->
 
       <a href="/reports" up-alias="/reports/*">Reports</a>
 
-  @selector [up-current]
+  @selector .up-current
   @stable
   ###
   up.on 'up:fragment:inserted', ->

data/lib/assets/javascripts/up/popup.js.coffee

@@ -330,8 +330,7 @@ up.popup = (($) ->
     open even if the page changes in the background.
   @stable
   ###
-  up.on('click', 'a[up-popup]', (event, $link) ->
-    event.preventDefault()
+  up.link.registerFollowVariant('[up-popup]', ($link) ->
     if $link.is('.up-current')
       close()
     else
@@ -383,6 +382,7 @@ up.popup = (($) ->
   # The framework is reset between tests
   up.on 'up:framework:reset', reset
 
+  knife: eval(Knife?.point)
   attach: attach
   close: close
   url: -> currentUrl

data/lib/assets/javascripts/up/rails.js.coffee

@@ -0,0 +1,18 @@
+###*
+Play nice with Rails UJS
+========================
+###
+
+up.rails = (($) ->
+
+  u = up.util
+
+  willHandle = ($element) ->
+    $element.is('[up-follow], [up-target], [up-modal], [up-popup]')
+
+  up.compiler '[data-method]', ($element) ->
+    if $.rails && willHandle($element)
+      u.setMissingAttrs($element, 'up-method': $element.attr('data-method'))
+      $element.removeAttr('data-method')
+
+)(jQuery)

data/lib/upjs/rails/version.rb

@@ -4,6 +4,6 @@ module Upjs
     # The current version of the upjs-rails gem.
     # This version number is also used for releases of the Up.js
     # frontend code.
-    VERSION = '0.16.0'
+    VERSION = '0.17.0'
   end
 end

data/spec_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    upjs-rails (0.15.1)
+    upjs-rails (0.16.0)
       rails (>= 3)
 
 GEM
@@ -212,4 +212,4 @@ DEPENDENCIES
   web-console (~> 2.0)
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

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

@@ -51,9 +51,8 @@
     mock: mock
 
   reset = ->
-    for cleaner in Knife.cleaners
-      cleaner()
-    Knife.cleaners = []
+    console.log("Reset with cleaners %o", Knife.cleaners)
+    cleaner() while cleaner = Knife.cleaners.pop()
 
   me = {}
   me.reset = reset

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

@@ -0,0 +1,2 @@
+#afterEach ->
+#  Knife.reset()

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

@@ -40,6 +40,24 @@ describe 'up.form', ->
               expect(callback).not.toHaveBeenCalled()
               done()
 
+          it "runs a callback in the same frame if the delay is 0 and it receives a '#{eventName}' event", ->
+            $input = affix('input[value="old-value"]')
+            callback = jasmine.createSpy('change callback')
+            up.observe($input, { delay: 0 }, callback)
+            $input.val('new-value')
+            $input.trigger(eventName)
+            expect(callback.calls.count()).toEqual(1)
+
+          it "runs multiple callbacks in the same frame if the delay is 0 and it receives a '#{eventName}' event", ->
+            $input = affix('input[value="old-value"]')
+            callback = jasmine.createSpy('change callback')
+            up.observe($input, { delay: 0 }, callback)
+            $input.val('new-value')
+            $input.trigger(eventName)
+            $input.val('yet-another-value')
+            $input.trigger(eventName)
+            expect(callback.calls.count()).toEqual(2)
+
         describe 'when the first argument is a form', ->
 
           it "runs the callback when any of the form's inputs receives a '#{eventName}' event and the value changed", (done) ->

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

@@ -172,14 +172,94 @@ describe 'up.link', ->
         $form.click()
         expect(followSpy).not.toHaveBeenCalled()
 
+      it 'adds a history entry', ->
+        affix('.target')
+        $link = affix('a[href="/path"][up-target=".target"]')
+        $link.click()
+        @respondWith('<div class="target">new text</div>')
+        expect($('.target')).toHaveText('new text')
+        expect(location.pathname).toEqual('/path')
+
+      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()
+        @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 'does not add a history entry when an up-history attribute is set to "false"', ->
+        oldPathname = location.pathname
+        affix('.target')
+        $link = affix('a[href="/path"][up-target=".target"][up-history="false"]')
+        $link.click()
+        @respondWith
+          responseText: '<div class="target">new text</div>'
+          responseHeaders: { 'X-Up-Location': '/other/path' }
+        expect($('.target')).toHaveText('new text')
+        expect(location.pathname).toEqual(oldPathname)
+
     describe 'a[up-follow]', ->
 
+      beforeEach ->
+        @$link = affix('a[href="/path"][up-follow]')
+        @followSpy = up.link.knife.mock('follow')
+        @defaultSpy = up.link.knife.mock('allowDefault').and.callFake((event) -> event.preventDefault())
+
       it "calls up.follow with the clicked link", ->
-        followSpy = up.link.knife.mock('follow')
-        $link = affix('a[href="/path"][up-follow]')
-        up.hello($link)
-        $link.click()
-        expect(followSpy).toHaveBeenCalledWith($link)
+        Trigger.click(@$link)
+        expect(@followSpy).toHaveBeenCalledWith(@$link)
+
+      it 'does nothing if the right mouse button is used', ->
+        Trigger.click(@$link, button: 2)
+        expect(@followSpy).not.toHaveBeenCalled()
+
+      it 'does nothing if shift is pressed during the click', ->
+        Trigger.click(@$link, shiftKey: true)
+        expect(@followSpy).not.toHaveBeenCalled()
+
+      it 'does nothing if ctrl is pressed during the click', ->
+        Trigger.click(@$link, ctrlKey: true)
+        expect(@followSpy).not.toHaveBeenCalled()
+
+#      it 'does nothing if meta is pressed during the click', ->
+#        Trigger.click(@$link, metaKey: true)
+#        expect(@followSpy).not.toHaveBeenCalled()
+
+      describe 'with [up-instant] modifier', ->
+
+        beforeEach ->
+          @$link.attr('up-instant', '')
+
+        it 'follows a link on mousedown (instead of on click)', ->
+          Trigger.mousedown(@$link)
+          expect(@followSpy.calls.mostRecent().args[0]).toEqual(@$link)
+
+        it 'does nothing on mouseup', ->
+          Trigger.mouseup(@$link)
+          expect(@followSpy).not.toHaveBeenCalled()
+
+        it 'does nothing on click', ->
+          Trigger.click(@$link)
+          expect(@followSpy).not.toHaveBeenCalled()
+
+        it 'does nothing if the right mouse button is pressed down', ->
+          Trigger.mousedown(@$link, button: 2)
+          expect(@followSpy).not.toHaveBeenCalled()
+
+        it 'does nothing if shift is pressed during mousedown', ->
+          Trigger.mousedown(@$link, shiftKey: true)
+          expect(@followSpy).not.toHaveBeenCalled()
+
+        it 'does nothing if ctrl is pressed during mousedown', ->
+          Trigger.mousedown(@$link, ctrlKey: true)
+          expect(@followSpy).not.toHaveBeenCalled()
+
+        it 'does nothing if meta is pressed during mousedown', ->
+          Trigger.mousedown(@$link, metaKey: true)
+          expect(@followSpy).not.toHaveBeenCalled()
 
     describe '[up-expand]', ->
 
@@ -205,40 +285,3 @@ describe 'up.link', ->
         up.hello($area)
         expect($area.attr('up-follow')).toEqual('')
 
-    describe '[up-instant]', ->
-
-      beforeEach ->
-        @$link = affix('a[href="/path"][up-follow][up-instant]')
-        @followSpy = up.link.knife.mock('follow')
-
-      afterEach ->
-        Knife.reset()
-
-      it 'follows a link on mousedown (instead of on click)', ->
-        Trigger.mousedown(@$link)
-        expect(@followSpy.calls.mostRecent().args[0]).toEqual(@$link)
-
-      it 'does nothing on mouseup', ->
-        Trigger.mouseup(@$link)
-        expect(@followSpy).not.toHaveBeenCalled()
-      
-      it 'does nothing on click', ->
-        Trigger.click(@$link)
-        expect(@followSpy).not.toHaveBeenCalled()
-              
-      it 'does nothing if the right mouse button is pressed down', ->
-        Trigger.mousedown(@$link, button: 2)
-        expect(@followSpy).not.toHaveBeenCalled()
-      
-      it 'does nothing if shift is pressed during mousedown', ->
-        Trigger.mousedown(@$link, shiftKey: true)
-        expect(@followSpy).not.toHaveBeenCalled()
-      
-      it 'does nothing if ctrl is pressed during mousedown', ->
-        Trigger.mousedown(@$link, ctrlKey: true)
-        expect(@followSpy).not.toHaveBeenCalled()
-      
-      it 'does nothing if meta is pressed during mousedown', ->
-        Trigger.mousedown(@$link, metaKey: true)
-        expect(@followSpy).not.toHaveBeenCalled()
-      

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

@@ -100,12 +100,64 @@ describe 'up.modal', ->
     
     describe 'a[up-modal]', ->
       
+      beforeEach ->
+        @$link = affix('a[href="/path"][up-modal=".target"]')
+        @followSpy = up.modal.knife.mock('follow')
+        @defaultSpy = up.link.knife.mock('allowDefault').and.callFake((event) -> event.preventDefault())
+
       it 'opens the clicked link in a modal', ->
-        followSpy = up.modal.knife.mock('follow')
-        $link = affix('a[href="/path"][up-modal=".foo"]')
-        up.hello($link)
-        $link.click()
-        expect(followSpy).toHaveBeenCalledWith($link)
+        Trigger.click(@$link)
+        expect(@followSpy).toHaveBeenCalledWith(@$link)
+
+      it 'does nothing if the right mouse button is used', ->
+        Trigger.click(@$link, button: 2)
+        expect(@followSpy).not.toHaveBeenCalled()
+
+      it 'does nothing if shift is pressed during the click', ->
+        Trigger.click(@$link, shiftKey: true)
+        expect(@followSpy).not.toHaveBeenCalled()
+
+      it 'does nothing if ctrl is pressed during the click', ->
+        Trigger.click(@$link, ctrlKey: true)
+        expect(@followSpy).not.toHaveBeenCalled()
+
+#      it 'does nothing if meta is pressed during the click', ->
+#        Trigger.click(@$link, metaKey: true)
+#        expect(@followSpy).not.toHaveBeenCalled()
+
+      describe 'with [up-instant] modifier', ->
+
+        beforeEach ->
+          @$link.attr('up-instant', '')
+
+        it 'opens the modal on mousedown (instead of on click)', ->
+          Trigger.mousedown(@$link)
+          expect(@followSpy.calls.mostRecent().args[0]).toEqual(@$link)
+
+        it 'does nothing on mouseup', ->
+          Trigger.mouseup(@$link)
+          expect(@followSpy).not.toHaveBeenCalled()
+
+        it 'does nothing on click', ->
+          Trigger.click(@$link)
+          expect(@followSpy).not.toHaveBeenCalled()
+
+        it 'does nothing if the right mouse button is pressed down', ->
+          Trigger.mousedown(@$link, button: 2)
+          expect(@followSpy).not.toHaveBeenCalled()
+
+        it 'does nothing if shift is pressed during mousedown', ->
+          Trigger.mousedown(@$link, shiftKey: true)
+          expect(@followSpy).not.toHaveBeenCalled()
+
+        it 'does nothing if ctrl is pressed during mousedown', ->
+          Trigger.mousedown(@$link, ctrlKey: true)
+          expect(@followSpy).not.toHaveBeenCalled()
+
+        it 'does nothing if meta is pressed during mousedown', ->
+          Trigger.mousedown(@$link, metaKey: true)
+          expect(@followSpy).not.toHaveBeenCalled()
+
 
     describe '[up-close]', ->
 

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

@@ -70,7 +70,7 @@ describe 'up.navigation', ->
         $modalLink = affix('a[href="/bar"][up-modal=".main"]')
         $unrelatedLink = affix('a[href="/baz]')
 
-        $modalLink.click()
+        Trigger.click($modalLink)
         @respondWith('<div class="main">new-text</div>')
         expect($backgroundLink).toHaveClass('up-current')
         expect($modalLink).toHaveClass('up-current')

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

@@ -6,6 +6,35 @@ describe 'up.popup', ->
 
     describe 'up.popup.attach', ->
 
+      it "loads this link's destination in a popup when clicked", ->
+        $link = affix('a[href="/path/to"][up-popup=".middle"]').text('link')
+        $link.css
+          position: 'fixed'
+          left: '100px'
+          top: '50px'
+
+        up.popup.attach($link)
+
+        expect(@lastRequest().url).toMatch /\/path\/to$/
+        @respondWith """
+          <div class="before">new-before</div>
+          <div class="middle">new-middle</div>
+          <div class="after">new-after</div>
+          """
+
+        $popup = $('.up-popup')
+
+        expect($popup).toExist()
+        expect($popup.find('.middle')).toHaveText('new-middle')
+        expect($popup.find('.before')).not.toExist()
+        expect($popup.find('.after')).not.toExist()
+
+        popupDims = u.measure($popup, full: true)
+        linkDims = u.measure($link, full: true)
+
+        expect(popupDims.right).toBeAround(linkDims.right, 1)
+        expect(popupDims.top).toBeAround(linkDims.top + linkDims.height, 1)
+
       it 'does not explode if the popup was closed before the response was received', ->
         $span = affix('span')
         up.popup.attach($span, url: '/foo', target: '.container')
@@ -40,32 +69,59 @@ describe 'up.popup', ->
 
     describe 'a[up-popup]', ->
 
-      it "loads this link's destination in a popup when clicked", ->
-        $link = affix('a[href="/path/to"][up-popup=".middle"]').text('link')
-        $link.css
-          position: 'fixed'
-          left: '100px'
-          top: '50px'
-        $link.click()
-        expect(@lastRequest().url).toMatch /\/path\/to$/
-        @respondWith """
-          <div class="before">new-before</div>
-          <div class="middle">new-middle</div>
-          <div class="after">new-after</div>
-          """
+      beforeEach ->
+        @$link = affix('a[href="/path"][up-popup=".target"]')
+        @attachSpy = up.popup.knife.mock('attach')
+        @defaultSpy = up.link.knife.mock('allowDefault').and.callFake((event) -> event.preventDefault())
 
-        $popup = $('.up-popup')
+      it 'opens the clicked link in a popup', ->
+        Trigger.click(@$link)
+        expect(@attachSpy).toHaveBeenCalledWith(@$link)
 
-        expect($popup).toExist()
-        expect($popup.find('.middle')).toHaveText('new-middle')
-        expect($popup.find('.before')).not.toExist()
-        expect($popup.find('.after')).not.toExist()
+      it 'does nothing if the right mouse button is used', ->
+        Trigger.click(@$link, button: 2)
+        expect(@attachSpy).not.toHaveBeenCalled()
 
-        popupDims = u.measure($popup, full: true)
-        linkDims = u.measure($link, full: true)
+      it 'does nothing if shift is pressed during the click', ->
+        Trigger.click(@$link, shiftKey: true)
+        expect(@attachSpy).not.toHaveBeenCalled()
 
-        expect(popupDims.right).toBeAround(linkDims.right, 1)
-        expect(popupDims.top).toBeAround(linkDims.top + linkDims.height, 1)
+      it 'does nothing if ctrl is pressed during the click', ->
+        Trigger.click(@$link, ctrlKey: true)
+        expect(@attachSpy).not.toHaveBeenCalled()
+
+      describe 'with [up-instant] modifier', ->
+
+        beforeEach ->
+          @$link.attr('up-instant', '')
+
+        it 'opens the modal on mousedown (instead of on click)', ->
+          Trigger.mousedown(@$link)
+          expect(@attachSpy.calls.mostRecent().args[0]).toEqual(@$link)
+
+        it 'does nothing on mouseup', ->
+          Trigger.mouseup(@$link)
+          expect(@attachSpy).not.toHaveBeenCalled()
+
+        it 'does nothing on click', ->
+          Trigger.click(@$link)
+          expect(@attachSpy).not.toHaveBeenCalled()
+
+        it 'does nothing if the right mouse button is pressed down', ->
+          Trigger.mousedown(@$link, button: 2)
+          expect(@attachSpy).not.toHaveBeenCalled()
+
+        it 'does nothing if shift is pressed during mousedown', ->
+          Trigger.mousedown(@$link, shiftKey: true)
+          expect(@attachSpy).not.toHaveBeenCalled()
+
+        it 'does nothing if ctrl is pressed during mousedown', ->
+          Trigger.mousedown(@$link, ctrlKey: true)
+          expect(@attachSpy).not.toHaveBeenCalled()
+
+        it 'does nothing if meta is pressed during mousedown', ->
+          Trigger.mousedown(@$link, metaKey: true)
+          expect(@attachSpy).not.toHaveBeenCalled()
 
     describe '[up-close]', ->