RubyGems - upjs-rails - Versions diffs - 0.17.0 → 0.18.0 - Mend

upjs-rails 0.17.0 → 0.18.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (39) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +46 -1
data/dist/up.js +929 -374
data/dist/up.min.js +2 -2
data/lib/assets/javascripts/up/browser.js.coffee +31 -14
data/lib/assets/javascripts/up/bus.js.coffee +87 -22
data/lib/assets/javascripts/up/flow.js.coffee +119 -43
data/lib/assets/javascripts/up/form.js.coffee +188 -57
data/lib/assets/javascripts/up/link.js.coffee +57 -21
data/lib/assets/javascripts/up/modal.js.coffee +77 -63
data/lib/assets/javascripts/up/motion.js.coffee +10 -9
data/lib/assets/javascripts/up/popup.js.coffee +54 -40
data/lib/assets/javascripts/up/proxy.js.coffee +46 -17
data/lib/assets/javascripts/up/rails.js.coffee +22 -4
data/lib/assets/javascripts/up/syntax.js.coffee +2 -2
data/lib/assets/javascripts/up/util.js.coffee +100 -16
data/lib/upjs/rails/inspector.rb +3 -3
data/lib/upjs/rails/version.rb +1 -1
data/spec_app/Gemfile.lock +1 -4
data/spec_app/app/controllers/test_controller.rb +2 -2
data/spec_app/spec/controllers/test_controller_spec.rb +5 -5
data/spec_app/spec/javascripts/helpers/browser_switches.js.coffee +9 -0
data/spec_app/spec/javascripts/helpers/knife.js.coffee +0 -1
data/spec_app/spec/javascripts/helpers/reset_path.js.coffee +4 -5
data/spec_app/spec/javascripts/helpers/to_be_present.js.coffee +5 -0
data/spec_app/spec/javascripts/helpers/to_have_request_method.js.coffee +8 -0
data/spec_app/spec/javascripts/up/bus_spec.js.coffee +26 -0
data/spec_app/spec/javascripts/up/flow_spec.js.coffee +203 -91
data/spec_app/spec/javascripts/up/form_spec.js.coffee +244 -49
data/spec_app/spec/javascripts/up/history_spec.js.coffee +8 -2
data/spec_app/spec/javascripts/up/link_spec.js.coffee +83 -30
data/spec_app/spec/javascripts/up/modal_spec.js.coffee +23 -17
data/spec_app/spec/javascripts/up/motion_spec.js.coffee +4 -4
data/spec_app/spec/javascripts/up/navigation_spec.js.coffee +1 -1
data/spec_app/spec/javascripts/up/popup_spec.js.coffee +26 -16
data/spec_app/spec/javascripts/up/proxy_spec.js.coffee +45 -13
data/spec_app/spec/javascripts/up/rails_spec.js.coffee +48 -0
data/spec_app/spec/javascripts/up/util_spec.js.coffee +48 -0
metadata +5 -2

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

@@ -136,11 +136,10 @@ up.modal = (($) ->
   @experimental
   ###
   coveredUrl = ->
-    $modal = $('.up-modal')
-    $modal.attr('up-covered-url')
+    $('.up-modal').attr('up-covered-url')
   reset = ->
-    close()
+    close(animation: false)
     currentUrl = undefined
     config.reset()
@@ -151,17 +150,13 @@ up.modal = (($) ->
     else
       template
-  rememberHistory = ->
-    $modal = $('.up-modal')
-    $modal.attr('up-covered-url', up.browser.url())
-    $modal.attr('up-covered-title', document.title)
   discardHistory = ->
     $modal = $('.up-modal')
     $modal.removeAttr('up-covered-url')
     $modal.removeAttr('up-covered-title')
-  createHiddenModal = (options) ->
+  createFrame = (target, options) ->
+    shiftElements()
     $modal = $(templateHtml())
     $modal.attr('up-sticky', '') if options.sticky
     $modal.attr('up-covered-url', up.browser.url())
@@ -171,14 +166,14 @@ up.modal = (($) ->
     $dialog.css('max-width', options.maxWidth) if u.isPresent(options.maxWidth)
     $dialog.css('height', options.height) if u.isPresent(options.height)
     $content = $modal.find('.up-modal-content')
-    $placeholder = u.$createElementFromSelector(options.selector)
+    # Create an empty element that will match the
+    # selector that is being replaced.
+    $placeholder = u.$createElementFromSelector(target)
     $placeholder.appendTo($content)
     $modal.appendTo(document.body)
-    rememberHistory()
-    $modal.hide()
     $modal
-  unshiftElements = []
+  unshifters = []
   # Gives `<body>` a right padding in the width of a scrollbar.
   # Also gives elements anchored to the right side of the screen
@@ -195,21 +190,26 @@ up.modal = (($) ->
       'padding-right': "#{bodyRightShift}px",
       'overflow-y': 'hidden'
     )
-    unshiftElements.push(unshiftBody)
+    unshifters.push(unshiftBody)
     up.layout.anchoredRight().each ->
       $element = $(this)
       elementRight = parseInt($element.css('right'))
       elementRightShift = scrollbarWidth + elementRight
-      unshiftElement = u.temporaryCss($element, 'right': elementRightShift)
-      unshiftElements.push(unshiftElement)
+      unshifter = u.temporaryCss($element, 'right': elementRightShift)
+      unshifters.push(unshifter)
-  updated = (animation, animateOptions) ->
-    $modal = $('.up-modal')
-    if $modal.is(':hidden')
-      shiftElements()
-      $modal.show()
-      deferred = up.animate($modal, animation, animateOptions)
-      deferred.then -> up.emit('up:modal:opened')
+  # Reverts the effects of `shiftElements`.
+  unshiftElements = ->
+    unshifter() while unshifter = unshifters.pop()
+  ###*
+  Returns whether a modal is currently open.
+  @function up.modal.isOpen
+  @stable
+  ###
+  isOpen = ->
+    $('.up-modal').length > 0
   ###*
   Opens the given link's destination in a modal overlay:
@@ -235,6 +235,9 @@ up.modal = (($) ->
   @param {Boolean} [options.sticky=false]
     If set to `true`, the modal remains
     open even if the page changes in the background.
+  @param {String} [options.confirm]
+    A message that will be displayed in a cancelable confirmation dialog
+    before the modal is being opened.
   @param {Object} [options.history=true]
     Whether to add a browser history entry for the modal's source URL.
   @param {String} [options.animation]
@@ -246,7 +249,8 @@ up.modal = (($) ->
   @param {String} [options.easing]
     The timing function that controls the animation's acceleration. [`up.animate`](/up.animate).
   @return {Promise}
-    A promise that will be resolved when the popup has been loaded and rendered.
+    A promise that will be resolved when the modal has been loaded and
+    the opening animation has completed.
   @stable
   ###
   follow = (linkOrSelector, options) ->
@@ -275,7 +279,8 @@ up.modal = (($) ->
   @param {Object} options
     See options for [`up.modal.follow`](/up.modal.follow).
   @return {Promise}
-    A promise that will be resolved when the popup has been loaded and rendered.
+    A promise that will be resolved when the modal has been loaded and the opening
+    animation has completed.
   @stable
   ###
   visit = (url, options) ->
@@ -291,34 +296,35 @@ up.modal = (($) ->
     options = u.options(options)
     $link = u.option(options.$link, u.nullJQuery())
     url = u.option(options.url, $link.attr('up-href'), $link.attr('href'))
-    selector = u.option(options.target, $link.attr('up-modal'), 'body')
-    width = u.option(options.width, $link.attr('up-width'), config.width)
-    maxWidth = u.option(options.maxWidth, $link.attr('up-max-width'), config.maxWidth)
-    height = u.option(options.height, $link.attr('up-height'), config.height)
-    animation = u.option(options.animation, $link.attr('up-animation'), config.openAnimation)
-    sticky = u.option(options.sticky, u.castedAttr($link, 'up-sticky'))
+    target = u.option(options.target, $link.attr('up-modal'), 'body')
+    options.width = u.option(options.width, $link.attr('up-width'), config.width)
+    options.maxWidth = u.option(options.maxWidth, $link.attr('up-max-width'), config.maxWidth)
+    options.height = u.option(options.height, $link.attr('up-height'), config.height)
+    options.animation = u.option(options.animation, $link.attr('up-animation'), config.openAnimation)
+    options.sticky = u.option(options.sticky, u.castedAttr($link, 'up-sticky'))
     # Although we usually fall back to full page loads if a browser doesn't support pushState,
     # in the case of modals we assume that the developer would rather see a dialog
     # without an URL update.
-    history = if up.browser.canPushState() then u.option(options.history, u.castedAttr($link, 'up-history'), config.history) else false
+    options.history = if up.browser.canPushState() then u.option(options.history, u.castedAttr($link, 'up-history'), config.history) else false
+    options.confirm = u.option(options.confirm, $link.attr('up-confirm'))
     animateOptions = up.motion.animateOptions(options, $link)
-    close()
-    if up.bus.nobodyPrevents('up:modal:open', url: url)
-      createHiddenModal
-        selector: selector
-        width: width
-        maxWidth: maxWidth
-        height: height
-        sticky: sticky
-      promise = up.replace(selector, url, history: history, requireMatch: false)
-      promise.then -> updated(animation, animateOptions)
-      promise
-    else
-      # Although someone prevented the destruction, keep a uniform API for
-      # callers by returning a Deferred that will never be resolved.
-      u.unresolvableDeferred()
+    up.browser.confirm(options.confirm).then ->
+      if up.bus.nobodyPrevents('up:modal:open', url: url)
+        wasOpen = isOpen()
+        close(animation: false) if wasOpen
+        options.beforeSwap = -> createFrame(target, options)
+        promise =  up.replace(target, url, u.merge(options, animation: false))
+        unless wasOpen
+          promise = promise.then ->
+            up.animate($('.up-modal'), options.animation, animateOptions)
+        promise = promise.then ->
+          up.emit('up:modal:opened')
+        promise
+      else
+        # Although someone prevented opening the modal, keep a uniform API for
+        # callers by returning a Deferred that will never be resolved.
+        u.unresolvablePromise()
   ###*
   This event is [emitted](/up.emit) when a modal dialog is starting to open.
@@ -361,11 +367,11 @@ up.modal = (($) ->
           title: $modal.attr('up-covered-title')
         )
         currentUrl = undefined
-        deferred = up.destroy($modal, options)
-        deferred.then ->
-          unshifter() while unshifter = unshiftElements.pop()
+        promise = up.destroy($modal, options)
+        promise = promise.then ->
+          unshiftElements()
           up.emit('up:modal:closed')
-        deferred
+        promise
       else
         # Although someone prevented the destruction,
         # keep a uniform API for callers by returning
@@ -423,19 +429,26 @@ up.modal = (($) ->
   a modal dialog.
   @selector a[up-modal]
-  @param [up-sticky]
-  @param [up-animation]
-  @param [up-height]
+  @param {String} [up-confirm]
+    A message that will be displayed in a cancelable confirmation dialog
+    before the modal is opened.
+  @param {String} [up-sticky]
+    If set to `"true"`, the modal remains
+    open even if the page changes in the background.
+  @param {String} [up-animation]
+    The animation to use when opening the modal.
+  @param {String} [up-height]
+    The width of the dialog in pixels.
+    By [default](/up.modal.config) the dialog will grow to fit its contents.
   @param [up-width]
-  @param [up-history]
+    The width of the dialog in pixels.
+    By [default](/up.modal.config) the dialog will grow to fit its contents.
+  @param [up-history="true"]
+    Whether to add a browser history entry for the modal's source URL.
   @stable
   ###
-  up.link.registerFollowVariant '[up-modal]', ($link) ->
-    event.preventDefault()
-    if $link.is('.up-current')
-      close()
-    else
-      follow($link)
+  up.link.onAction '[up-modal]', ($link) ->
+    follow($link)
   # Close the modal when someone clicks outside the dialog
   # (but not on a modal opener).
@@ -491,6 +504,7 @@ up.modal = (($) ->
   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.')
+  source: -> up.error('up.modal.source no longer exists. Please use up.popup.url instead.')
+  isOpen: isOpen
 )(jQuery)

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

@@ -156,7 +156,7 @@ up.motion = (($) ->
     options = animateOptions(options)
     if animation == 'none' || animation == false
       none()
-    if u.isFunction(animation)
+    else if u.isFunction(animation)
       assertIsDeferred(animation($element, options), animation)
     else if u.isString(animation)
       animate($element, findAnimation(animation), options)
@@ -168,7 +168,7 @@ up.motion = (($) ->
         $element.css(animation)
         u.resolvedDeferred()
     else
-      u.error("Unknown animation type %o", animation)
+      u.error("Unknown animation type for %o", animation)
   ###*
   Extracts animation-related options from the given options hash.
@@ -356,12 +356,13 @@ up.motion = (($) ->
       finish($old)
       finish($new)
-      if transitionOrName == 'none' || transitionOrName == false || animation = animations[transitionOrName]
-        deferred = skipMorph($old, $new, parsedOptions)
-        deferred.then -> animate($new, animation || 'none', options)
-        deferred
+      if transitionOrName == 'none' || transitionOrName == false
+        return skipMorph($old, $new, parsedOptions)
+      else if animation = animations[transitionOrName]
+        skipMorph($old, $new, parsedOptions)
+        return animate($new, animation, parsedOptions)
       else if transition = u.presence(transitionOrName, u.isFunction) || transitions[transitionOrName]
-        withGhosts $old, $new, parsedOptions, ($oldGhost, $newGhost) ->
+        return withGhosts $old, $new, parsedOptions, ($oldGhost, $newGhost) ->
           transitionPromise = transition($oldGhost, $newGhost, parsedOptions)
           assertIsDeferred(transitionPromise, transitionOrName)
       else if u.isString(transitionOrName) && transitionOrName.indexOf('/') >= 0
@@ -371,11 +372,11 @@ up.motion = (($) ->
             animate($old, parts[0], options),
             animate($new, parts[1], options)
           )
-        morph($old, $new, transition, parsedOptions)
+        return morph($old, $new, transition, parsedOptions)
       else
         u.error("Unknown transition %o", transitionOrName)
     else
-      skipMorph($old, $new, parsedOptions)
+      return skipMorph($old, $new, parsedOptions)
   ###*
   This causes the side effects of a successful transition, but instantly.

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

@@ -65,8 +65,7 @@ up.popup = (($) ->
   @experimental
   ###
   coveredUrl = ->
-    $popup = $('.up-popup')
-    $popup.attr('up-covered-url')
+    $('.up-popup').attr('up-covered-url')
   ###*
   Sets default options for future popups.
@@ -91,10 +90,10 @@ up.popup = (($) ->
     history: false
   reset = ->
-    close()
+    close(animation: false)
     config.reset()
-  setPosition = ($link, $popup, position) ->
+  setPosition = ($link, position) ->
     linkBox = u.measure($link, full: true)
     css = switch position
       when "bottom-right"
@@ -111,6 +110,7 @@ up.popup = (($) ->
         bottom: linkBox.top
       else
         u.error("Unknown position %o", position)
+    $popup = $('.up-popup')
     $popup.attr('up-position', position)
     $popup.css(css)
     ensureInViewport($popup)
@@ -141,33 +141,31 @@ up.popup = (($) ->
       else if bottom = parseInt($popup.css('bottom'))
         $popup.css('bottom', bottom + errorY)
-  rememberHistory = ->
-    $popup = $('.up-popup')
-    $popup.attr('up-covered-url', up.browser.url())
-    $popup.attr('up-covered-title', document.title)
   discardHistory = ->
     $popup = $('.up-popup')
     $popup.removeAttr('up-covered-url')
     $popup.removeAttr('up-covered-title')
-  createHiddenPopup = ($link, selector, sticky) ->
+  createFrame = (target, options) ->
     $popup = u.$createElementFromSelector('.up-popup')
-    $popup.attr('up-sticky', '') if sticky
-    $placeholder = u.$createElementFromSelector(selector)
+    $popup.attr('up-sticky', '') if options.sticky
+    $popup.attr('up-covered-url', up.browser.url())
+    $popup.attr('up-covered-title', document.title)
+    # Create an empty element that will match the
+    # selector that is being replaced.
+    $placeholder = u.$createElementFromSelector(target)
     $placeholder.appendTo($popup)
     $popup.appendTo(document.body)
-    rememberHistory()
-    $popup.hide()
     $popup
-  updated = ($link, position, animation, animateOptions) ->
-    $popup = $('.up-popup')
-    if $popup.is(':hidden')
-      $popup.show()
-      setPosition($link, $popup, position)
-      deferred = up.animate($popup, animation, animateOptions)
-      deferred.then -> up.emit('up:popup:opened')
+  ###*
+  Returns whether popup modal is currently open.
+  @function up.popup.isOpen
+  @stable
+  ###
+  isOpen = ->
+    $('.up-popup').length > 0
   ###*
   Attaches a popup overlay to the given element or selector.
@@ -181,6 +179,9 @@ up.popup = (($) ->
     Defines where the popup is attached to the opening element.
     Valid values are `bottom-right`, `bottom-left`, `top-right` and `top-left`.
+  @param {String} [options.confirm]
+    A message that will be displayed in a cancelable confirmation dialog
+    before the modal is being opened.
   @param {String} [options.animation]
     The animation to use when opening the popup.
   @param {Number} [options.duration]
@@ -194,7 +195,8 @@ up.popup = (($) ->
     open even if the page changes in the background.
   @param {Object} [options.history=false]
   @return {Promise}
-    A promise that will be resolved when the popup has been loaded and rendered.
+    A promise that will be resolved when the popup has been loaded and
+    the opening animation has completed.
   @stable
   ###
   attach = (linkOrSelector, options) ->
@@ -203,24 +205,32 @@ up.popup = (($) ->
     options = u.options(options)
     url = u.option(options.url, $link.attr('href'))
-    selector = u.option(options.target, $link.attr('up-popup'), 'body')
-    position = u.option(options.position, $link.attr('up-position'), config.position)
-    animation = u.option(options.animation, $link.attr('up-animation'), config.openAnimation)
-    sticky = u.option(options.sticky, u.castedAttr($link, 'up-sticky'))
-    history = if up.browser.canPushState() then u.option(options.history, u.castedAttr($link, 'up-history'), config.history) else false
+    target = u.option(options.target, $link.attr('up-popup'), 'body')
+    options.position = u.option(options.position, $link.attr('up-position'), config.position)
+    options.animation = u.option(options.animation, $link.attr('up-animation'), config.openAnimation)
+    options.sticky = u.option(options.sticky, u.castedAttr($link, 'up-sticky'))
+    options.history = if up.browser.canPushState() then u.option(options.history, u.castedAttr($link, 'up-history'), config.history) else false
+    options.confirm = u.option(options.confirm, $link.attr('up-confirm'))
     animateOptions = up.motion.animateOptions(options, $link)
-    close()
-    if up.bus.nobodyPrevents('up:popup:open', url: url)
-      createHiddenPopup($link, selector, sticky)
-      promise = up.replace(selector, url, history: history, requireMatch: false)
-      promise.then -> updated($link, position, animation, animateOptions)
-      promise
-    else
-      # Although someone prevented the destruction, keep a uniform API for
-      # callers by returning a Deferred that will never be resolved.
-      u.unresolvableDeferred()
+    up.browser.confirm(options.confirm).then ->
+      if up.bus.nobodyPrevents('up:popup:open', url: url)
+        wasOpen = isOpen()
+        close(animation: false) if wasOpen
+        options.beforeSwap = -> createFrame(target, options)
+        promise = up.replace(target, url, u.merge(options, animation: false))
+        promise = promise.then ->
+          setPosition($link, options.position)
+        unless wasOpen
+          promise = promise.then ->
+            up.animate($('.up-popup'), options.animation, animateOptions)
+        promise = promise.then ->
+          up.emit('up:popup:opened')
+        promise
+      else
+        # Although someone prevented the destruction, keep a uniform API for
+        # callers by returning a Deferred that will never be resolved.
+        u.unresolvableDeferred()
   ###*
   This event is [emitted](/up.emit) when a popup is starting to open.
@@ -325,12 +335,15 @@ up.popup = (($) ->
     Defines where the popup is attached to the opening element.
     Valid values are `bottom-right`, `bottom-left`, `top-right` and `top-left`.
+  @param {String} [up-confirm]
+    A message that will be displayed in a cancelable confirmation dialog
+    before the popup is opened.
   @param [up-sticky]
     If set to `true`, the popup remains
     open even if the page changes in the background.
   @stable
   ###
-  up.link.registerFollowVariant('[up-popup]', ($link) ->
+  up.link.onAction('[up-popup]', ($link) ->
     if $link.is('.up-current')
       close()
     else
@@ -392,5 +405,6 @@ up.popup = (($) ->
   contains: contains
   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.')
+  isOpen: isOpen
 )(jQuery)