upjs-rails 0.12.1 → 0.12.2

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

@@ -68,11 +68,30 @@ up.modal = (($) ->
       </div>
       """
 
-  currentSource = undefined
+  ###*
+  Returns the source URL for the fragment displayed in the current modal overlay,
+  or `undefined` if no modal is currently open.
+
+  @method up.modal.url
+  @return {String}
+    the source URL
+  ###
+  currentUrl = undefined
+
+  ###*
+  Returns the URL of the page below the modal overlay.
+
+  @method up.modal.coveredUrl
+  @return {String}
+  @protected
+  ###
+  coveredUrl = ->
+    $modal = $('.up-modal')
+    $modal.attr('up-covered-url')
 
   reset = ->
     close()
-    currentSource = undefined
+    currentUrl = undefined
     config.reset()
 
   templateHtml = ->
@@ -83,20 +102,20 @@ up.modal = (($) ->
       template
 
   rememberHistory = ->
-    $popup = $('.up-modal')
-    $popup.attr('up-previous-url', up.browser.url())
-    $popup.attr('up-previous-title', document.title)
+    $modal = $('.up-modal')
+    $modal.attr('up-covered-url', up.browser.url())
+    $modal.attr('up-covered-title', document.title)
 
   discardHistory = ->
-    $popup = $('.up-modal')
-    $popup.removeAttr('up-previous-url')
-    $popup.removeAttr('up-previous-title')
+    $modal = $('.up-modal')
+    $modal.removeAttr('up-covered-url')
+    $modal.removeAttr('up-covered-title')
 
   createHiddenModal = (options) ->
     $modal = $(templateHtml())
     $modal.attr('up-sticky', '') if options.sticky
-    $modal.attr('up-previous-url', up.browser.url())
-    $modal.attr('up-previous-title', document.title)
+    $modal.attr('up-covered-url', up.browser.url())
+    $modal.attr('up-covered-title', document.title)
     $dialog = $modal.find('.up-modal-dialog')
     $dialog.css('width', options.width) if u.isPresent(options.width)
     $dialog.css('max-width', options.maxWidth) if u.isPresent(options.maxWidth)
@@ -138,7 +157,7 @@ up.modal = (($) ->
     shiftElements()
     $modal.show()
     deferred = up.animate($modal, animation, animateOptions)
-    deferred.then -> up.bus.emit('up:modal:opened')
+    deferred.then -> up.emit('up:modal:opened')
 
   ###*
   Opens the given link's destination in a modal overlay:
@@ -146,7 +165,7 @@ up.modal = (($) ->
       var $link = $('...');
       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.
 
   \#\#\#\# Events
 
@@ -162,10 +181,10 @@ up.modal = (($) ->
     The selector to extract from the response and open in a modal dialog.
   @param {Number} [options.width]
     The width of the dialog in pixels.
-    By [default](#up.modal.defaults) the dialog will grow to fit its contents.
+    By [default](/up.modal.config) the dialog will grow to fit its contents.
   @param {Number} [options.height]
     The width of the dialog in pixels.
-    By [default](#up.modal.defaults) the dialog will grow to fit its contents.
+    By [default](/up.modal.config) the dialog will grow to fit its contents.
   @param {Boolean} [options.sticky=false]
     If set to `true`, the modal remains
     open even if the page changes in the background.
@@ -174,11 +193,11 @@ up.modal = (($) ->
   @param {String} [options.animation]
     The animation to use when opening the modal.
   @param {Number} [options.duration]
-    The duration of the animation. See [`up.animate`](/up.motion#up.animate).
+    The duration of the animation. See [`up.animate`](/up.animate).
   @param {Number} [options.delay]
-    The delay before the animation starts. See [`up.animate`](/up.motion#up.animate).
+    The delay before the animation starts. See [`up.animate`](/up.animate).
   @param {String} [options.easing]
-    The timing function that controls the animation's acceleration. [`up.animate`](/up.motion#up.animate).
+    The timing function that controls the animation's acceleration. [`up.animate`](/up.animate).
   @return {Promise}
     A promise that will be resolved when the modal has finished loading.
   ###
@@ -205,7 +224,7 @@ up.modal = (($) ->
     The CSS selector to extract from the response.
     The extracted content will be placed into the dialog window.
   @param {Object} options
-    See options for [previous `up.modal.open` variant](#up.modal.open).
+    See options for [previous `up.modal.open` variant](/up.modal.open).
   ###
   visit = (url, options) ->
     options = u.options(options)
@@ -249,17 +268,6 @@ up.modal = (($) ->
       # callers by returning a Deferred that will never be resolved.
       $.Deferred()
 
-  ###*
-  Returns the source URL for the fragment displayed in the current modal overlay,
-  or `undefined` if no modal is currently open.
-  
-  @method up.modal.source
-  @return {String}
-    the source URL
-  ###
-  source = ->
-    currentSource
-
   ###*
   Closes a currently opened modal overlay.
   Does nothing if no modal is currently open.
@@ -273,7 +281,7 @@ up.modal = (($) ->
   
   @method up.modal.close
   @param {Object} options
-    See options for [`up.animate`](/up.motion#up.animate)
+    See options for [`up.animate`](/up.animate)
   ###
   close = (options) ->
     $modal = $('.up-modal')
@@ -281,14 +289,14 @@ up.modal = (($) ->
       if up.bus.nobodyPrevents('up:modal:close', $element: $modal)
         options = u.options(options,
           animation: config.closeAnimation,
-          url: $modal.attr('up-previous-url')
-          title: $modal.attr('up-previous-title')
+          url: $modal.attr('up-covered-url')
+          title: $modal.attr('up-covered-title')
         )
-        currentSource = undefined
+        currentUrl = undefined
         deferred = up.destroy($modal, options)
         deferred.then ->
           unshifter() while unshifter = unshiftElements.pop()
-          up.bus.emit('up:modal:closed')
+          up.emit('up:modal:closed')
         deferred
       else
         # Although someone prevented the destruction, keep a uniform API for
@@ -354,7 +362,7 @@ up.modal = (($) ->
       </div>
 
   If you want to change the design beyond CSS, you can
-  configure Up.js to [use a different HTML structure](#up.modal.config).
+  configure Up.js to [use a different HTML structure](/up.modal.config).
 
 
   \#\#\#\# Closing behavior
@@ -397,7 +405,7 @@ up.modal = (($) ->
   up.on('up:fragment:inserted', (event, $fragment) ->
     if contains($fragment)
       if newSource = $fragment.attr('up-source')
-        currentSource = newSource
+        currentUrl = newSource
     else if !up.popup.contains($fragment)
       autoclose()
   )
@@ -428,9 +436,11 @@ up.modal = (($) ->
   follow: follow
   open: -> up.error('up.modal.open no longer exists. Please use either up.modal.follow or up.modal.visit.')
   close: close
-  source: source
+  url: -> currentUrl
+  coveredUrl: coveredUrl
   config: config
   defaults: -> u.error('up.modal.defaults(...) no longer exists. Set values on he up.modal.config property instead.')
   contains: contains
+  source: -> up.error('up.popup.source no longer exists. Please use up.popup.url instead.')
 
 )(jQuery)

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

@@ -82,7 +82,7 @@ up.motion = (($) ->
   | `move-from-right`  | Moves the element leftwards from beyond the right  edge of the screen until it reaches its current position |
   | `none`             | An animation that has no visible effect. Sounds useless at first, but can save you a lot of `if` statements. |
 
-  You can define additional named animations using [`up.animation`](#up.animation).
+  You can define additional named animations using [`up.animation`](/up.animation).
 
   \#\#\#\# Animating CSS properties directly
 
@@ -258,9 +258,9 @@ up.motion = (($) ->
   | `move-right` | Moves the first element rightwards until it exists the screen at the right edge. Simultaneously moves the second element rightwards from beyond the left edge of the screen until it reaches its current position. |
   | `none`       | A transition that has no visible effect. Sounds useless at first, but can save you a lot of `if` statements. |
 
-  You can define additional named transitions using [`up.transition`](#up.transition).
+  You can define additional named transitions using [`up.transition`](/up.transition).
   
-  You can also compose a transition from two [named animations](#named-animations).
+  You can also compose a transition from two [named animations](/named-animations).
   separated by a slash character (`/`):
   
   - `move-to-bottom/fade-in`
@@ -392,7 +392,7 @@ up.motion = (($) ->
         )
       )
 
-  It is recommended that your transitions use [`up.animate`](#up.animate),
+  It is recommended that your transitions use [`up.animate`](/up.animate),
   passing along the `options` that were passed to you.
 
   If you choose to *not* use `up.animate` and roll your own
@@ -404,7 +404,7 @@ up.motion = (($) ->
   4. The returned promise responds to a `resolve()` function that
      instantly jumps to the last transition frame and resolves the promise.
 
-  Calling [`up.animate`](#up.animate) with an object argument
+  Calling [`up.animate`](/up.animate) with an object argument
   will take care of all these points.
 
   @method up.transition
@@ -425,7 +425,7 @@ up.motion = (($) ->
       )
 
   It is recommended that your definitions always end by calling
-  calling [`up.animate`](#up.animate) with an object argument, passing along
+  calling [`up.animate`](/up.animate) with an object argument, passing along
   the `options` that were passed to you.
 
   If you choose to *not* use `up.animate` and roll your own
@@ -437,7 +437,7 @@ up.motion = (($) ->
   4. The returned promise responds to a `resolve()` function that
      instantly jumps to the last animation frame and resolves the promise.
 
-  Calling [`up.animate`](#up.animate) with an object argument
+  Calling [`up.animate`](/up.animate) with an object argument
   will take care of all these points.
 
   @method up.animation

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

@@ -21,7 +21,7 @@ up.navigation = (($) ->
   @method up.navigation.config
   @property
   @param {Number} [config.currentClasses]
-    An array of classes to set on [links that point the current location](#up-current).
+    An array of classes to set on [links that point the current location](/up-current).
   ###
   config = u.config
     currentClasses: ['up-current']
@@ -81,11 +81,12 @@ up.navigation = (($) ->
     matchesAny: matchesAny
 
   locationChanged = ->
-
     currentUrls = urlSet([
       normalizeUrl(up.browser.url()),
-      normalizeUrl(up.modal.source()),
-      normalizeUrl(up.popup.source())
+      normalizeUrl(up.modal.url()),
+      normalizeUrl(up.modal.coveredUrl()),
+      normalizeUrl(up.popup.url()),
+      normalizeUrl(up.popup.coveredUrl())
     ])
 
     klass = currentClass()
@@ -176,7 +177,7 @@ up.navigation = (($) ->
   A link matches the current location (and is marked as `.up-current`) if it matches either:
 
   - the link's `href` attribute
-  - the link's [`up-href`](/up.link#turn-any-element-into-a-link) attribute
+  - the link's [`up-href`](#turn-any-element-into-a-link) attribute
   - a space-separated list of URLs in the link's `up-alias` attribute
 
   \#\#\#\# Matching URL by prefix

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

@@ -25,7 +25,26 @@ up.popup = (($) ->
 
   u = up.util
 
-  currentSource = undefined
+  ###*
+  Returns the source URL for the fragment displayed
+  in the current popup, or `undefined` if no  popup is open.
+
+  @method up.popup.url
+  @return {String}
+    the source URL
+  ###
+  currentUrl = undefined
+
+  ###*
+  Returns the URL of the page or modal below the popup.
+
+  @method up.popup.coveredUrl
+  @return {String}
+  @protected
+  ###
+  coveredUrl = ->
+    $popup = $('.up-popup')
+    $popup.attr('up-covered-url')
 
   ###*
   @method up.popup.config
@@ -92,13 +111,13 @@ up.popup = (($) ->
           
   rememberHistory = ->
     $popup = $('.up-popup')
-    $popup.attr('up-previous-url', up.browser.url())
-    $popup.attr('up-previous-title', document.title)
+    $popup.attr('up-covered-url', up.browser.url())
+    $popup.attr('up-covered-title', document.title)
           
   discardHistory = ->
     $popup = $('.up-popup')
-    $popup.removeAttr('up-previous-url')
-    $popup.removeAttr('up-previous-title')
+    $popup.removeAttr('up-covered-url')
+    $popup.removeAttr('up-covered-title')
     
   createHiddenPopup = ($link, selector, sticky) ->
     $popup = u.$createElementFromSelector('.up-popup')
@@ -125,11 +144,11 @@ up.popup = (($) ->
   @param {String} [options.animation]
     The animation to use when opening the popup.
   @param {Number} [options.duration]
-    The duration of the animation. See [`up.animate`](/up.motion#up.animate).
+    The duration of the animation. See [`up.animate`](/up.animate).
   @param {Number} [options.delay]
-    The delay before the animation starts. See [`up.animate`](/up.motion#up.animate).
+    The delay before the animation starts. See [`up.animate`](/up.animate).
   @param {String} [options.easing]
-    The timing function that controls the animation's acceleration. [`up.animate`](/up.motion#up.animate).
+    The timing function that controls the animation's acceleration. [`up.animate`](/up.animate).
   @param {Boolean} [options.sticky=false]
     If set to `true`, the popup remains
     open even if the page changes in the background.
@@ -155,35 +174,23 @@ up.popup = (($) ->
       insert: -> updated($link, $popup, position, animation, animateOptions)
     )
     
-  ###*
-  Returns the source URL for the fragment displayed
-  in the current popup overlay, or `undefined` if no
-  popup is open.
-  
-  @method up.popup.source
-  @return {String}
-    the source URL
-  ###
-  source = ->
-    currentSource
-
   ###*
   Closes a currently opened popup overlay.
   Does nothing if no popup is currently open.
   
   @method up.popup.close
   @param {Object} options
-    See options for [`up.animate`](/up.motion#up.animate).
+    See options for [`up.animate`](/up.animate).
   ###
   close = (options) ->
     $popup = $('.up-popup')
     if $popup.length
       options = u.options(options,
         animation: config.closeAnimation,
-        url: $popup.attr('up-previous-url'),
-        title: $popup.attr('up-previous-title')
+        url: $popup.attr('up-covered-url'),
+        title: $popup.attr('up-covered-title')
       )
-      currentSource = undefined
+      currentUrl = undefined
       up.destroy($popup, options)
     else
       u.resolvedPromise()
@@ -240,7 +247,7 @@ up.popup = (($) ->
   up.on('up:fragment:inserted', (event, $fragment) ->
     if contains($fragment)
       if newSource = $fragment.attr('up-source')
-        currentSource = newSource
+        currentUrl = newSource
     else
       autoclose()
   )
@@ -269,10 +276,12 @@ up.popup = (($) ->
 
   attach: attach
   close: close
-  source: source
+  url: -> currentUrl
+  coveredUrl: coveredUrl
   config: config
   defaults: -> u.error('up.popup.defaults(...) no longer exists. Set values on he up.popup.config property instead.')
   contains: contains
-  open: -> up.warn('up.popup.open no longer exists. Please use up.popup.attach instead.')
+  open: -> up.error('up.popup.open no longer exists. Please use up.popup.attach instead.')
+  source: -> up.error('up.popup.source no longer exists. Please use up.popup.url instead.')
 
 )(jQuery)

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

@@ -3,8 +3,8 @@ Caching and preloading
 ======================
 
 All HTTP requests go through the Up.js proxy.
-It caches a [limited](/up.proxy#up.proxy.config) number of server responses
-for a [limited](/up.proxy#up.proxy.config) amount of time,
+It caches a [limited](/up.proxy.config) number of server responses
+for a [limited](/up.proxy.config) amount of time,
 making requests to these URLs return insantly.
   
 The cache is cleared whenever the user makes a non-`GET` request
@@ -63,7 +63,7 @@ up.proxy = (($) ->
   @method up.proxy.config
   @property
   @param {Number} [config.preloadDelay=75]
-    The number of milliseconds to wait before [`[up-preload]`](#up-preload)
+    The number of milliseconds to wait before [`[up-preload]`](/up-preload)
     starts preloading.
   @param {Number} [config.cacheSize=70]
     The maximum number of responses to cache.
@@ -244,7 +244,7 @@ up.proxy = (($) ->
     if wasIdle
       emission = ->
         if busy() # a fast response might have beaten the delay
-          up.bus.emit('up:proxy:busy')
+          up.emit('up:proxy:busy')
           busyEventEmitted = true
       if config.busyDelay > 0
         busyDelayTimer = setTimeout(emission, config.busyDelay)
@@ -254,14 +254,14 @@ up.proxy = (($) ->
   loadEnded = ->
     pendingCount -= 1
     if idle() && busyEventEmitted
-      up.bus.emit('up:proxy:idle')
+      up.emit('up:proxy:idle')
       busyEventEmitted = false
 
   load = (request) ->
     u.debug('Loading URL %o', request.url)
-    up.bus.emit('up:proxy:load', request)
+    up.emit('up:proxy:load', request)
     promise = u.ajax(request)
-    promise.always -> up.bus.emit('up:proxy:receive', request)
+    promise.always -> up.emit('up:proxy:receive', request)
     promise
 
   isIdempotent = (request) ->

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

@@ -78,7 +78,7 @@ up.tooltip = (($) ->
   
   @method up.tooltip.close
   @param {Object} options
-    See options for [`up.animate`](/up.motion#up.animate).
+    See options for [`up.animate`](/up.animate).
   ###
   close = (options) ->
     $tooltip = $('.up-tooltip')

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

@@ -540,7 +540,7 @@ up.util = (($) ->
   
   Does nothing if the given element is not currently animating.
   
-  Also see [`up.motion.finish`](/up.motion#up.motion.finish).
+  Also see [`up.motion.finish`](/up.motion.finish).
   
   @method up.util.finishCssAnimate
   @protected

data/lib/upjs/rails/version.rb

@@ -1,5 +1,5 @@
 module Upjs
   module Rails
-    VERSION = '0.12.1'
+    VERSION = '0.12.2'
   end
 end

data/spec_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    upjs-rails (0.11.1)
+    upjs-rails (0.12.1)
       rails (>= 3)
 
 GEM

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

@@ -2,7 +2,7 @@ describe 'up.bus', ->
   
   describe 'Javascript functions', ->
     
-    describe 'up.bus.emit', ->
+    describe 'up.emit', ->
 
       it 'triggers an event on the document', ->
         emittedEvent = undefined
@@ -15,7 +15,7 @@ describe 'up.bus', ->
         expect(emittedEvent).toBeUndefined()
         expect(emitted$Target).toBeUndefined()
 
-        up.bus.emit('foo')
+        up.emit('foo')
 
         expect(emittedEvent).toBeDefined()
         expect(emittedEvent.preventDefault).toBeDefined()
@@ -27,7 +27,7 @@ describe 'up.bus', ->
         up.on 'foo', (event) ->
           emittedEvent = event
 
-        up.bus.emit('foo', { customField: 'custom-value' })
+        up.emit('foo', { customField: 'custom-value' })
 
         expect(emittedEvent.customField).toEqual('custom-value')
 
@@ -41,7 +41,7 @@ describe 'up.bus', ->
           emittedEvent = event
           emitted$Target = $target
 
-        up.bus.emit('foo', $element: $element)
+        up.emit('foo', $element: $element)
 
         expect(emittedEvent).toBeDefined()
         expect(emitted$Target).toEqual($element)

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

@@ -81,6 +81,26 @@ describe 'up.modal', ->
             expect(parseInt($anchoredElement.css('right'))).toBeAround(30 , 10)
             done()
 
+
+    describe 'up.modal.coveredUrl', ->
+
+      it 'returns the URL behind the modal overlay', (done) ->
+        up.history.replace('/foo')
+        expect(up.modal.coveredUrl()).toBeUndefined()
+        up.modal.visit('/bar', target: '.container')
+        @lastRequest().respondWith
+          status: 200
+          contentType: 'text/html'
+          responseText:
+            """
+            <div class="container">text</div>
+            """
+        expect(up.modal.coveredUrl()).toEndWith('/foo')
+        up.modal.close().then ->
+          expect(up.modal.coveredUrl()).toBeUndefined()
+          done()
+
+
     describe 'up.modal.close', ->
 
       it 'should have tests'

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

@@ -68,9 +68,47 @@ describe 'up.navigation', ->
           responseText: '<div class="main">new-text</div>'
         expect($link).toHaveClass('up-current')
 
-      it 'marks a link as .up-current if it links to the URL currently shown in the modal'
+      it 'marks a link as .up-current if it links to an URL currently shown either within or below the modal', (done) ->
+        up.history.replace('/foo')
+        $backgroundLink = affix('a[href="/foo"]')
+        $modalLink = affix('a[href="/bar"][up-modal=".main"]')
+        $unrelatedLink = affix('a[href="/baz]')
 
-      it 'marks a link as .up-current if it links to the URL currently shown in the popup'
+        $modalLink.click()
+        @lastRequest().respondWith
+          status: 200
+          contentType: 'text/html'
+          responseText: '<div class="main">new-text</div>'
+        expect($backgroundLink).toHaveClass('up-current')
+        expect($modalLink).toHaveClass('up-current')
+        expect($unrelatedLink).not.toHaveClass('up-current')
+
+        up.modal.close().then ->
+          expect($backgroundLink).toHaveClass('up-current')
+          expect($modalLink).not.toHaveClass('up-current')
+          expect($unrelatedLink).not.toHaveClass('up-current')
+          done()
+
+      it 'marks a link as .up-current if it links to the URL currently either within or below the popup', (done) ->
+        up.history.replace('/foo')
+        $backgroundLink = affix('a[href="/foo"]')
+        $popupLink = affix('a[href="/bar"][up-popup=".main"]')
+        $unrelatedLink = affix('a[href="/baz]')
+
+        $popupLink.click()
+        @lastRequest().respondWith
+          status: 200
+          contentType: 'text/html'
+          responseText: '<div class="main">new-text</div>'
+        expect($backgroundLink).toHaveClass('up-current')
+        expect($popupLink).toHaveClass('up-current')
+        expect($unrelatedLink).not.toHaveClass('up-current')
+
+        up.popup.close().then ->
+          expect($backgroundLink).toHaveClass('up-current')
+          expect($popupLink).not.toHaveClass('up-current')
+          expect($unrelatedLink).not.toHaveClass('up-current')
+          done()
 
       it 'changes .up-current marks as the URL changes'
         
@@ -110,4 +148,4 @@ describe 'up.navigation', ->
           contentType: 'text/html'
           responseText: '<div class="main">new-text</div>'
         expect($area).toHaveClass('up-current')
-        
+

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

@@ -6,6 +6,26 @@ describe 'up.popup', ->
 
       it 'should have tests'
 
+    describe 'up.popup.coveredUrl', ->
+
+      it 'returns the URL behind the popup', (done) ->
+        up.history.replace('/foo')
+        expect(up.popup.coveredUrl()).toBeUndefined()
+
+        $popupLink = affix('a[href="/bar"][up-popup=".container"]')
+        $popupLink.click()
+        @lastRequest().respondWith
+          status: 200
+          contentType: 'text/html'
+          responseText:
+            """
+            <div class="container">text</div>
+            """
+        expect(up.popup.coveredUrl()).toEndWith('/foo')
+        up.popup.close().then ->
+          expect(up.popup.coveredUrl()).toBeUndefined()
+          done()
+
     describe 'up.popup.close', ->
 
       it 'should have tests'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upjs-rails
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails