unpoly-rails 0.37.0 → 0.50.0

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

@@ -7,30 +7,19 @@ up.rails = (($) ->
 
   u = up.util
 
-  willHandle = ($element) ->
-    $element.is('[up-follow], [up-target], [up-modal], [up-popup]')
-
   isRails = ->
-    u.isGiven($.rails)
+    !!$.rails
 
   u.each ['method', 'confirm'], (feature) ->
 
     dataAttribute = "data-#{feature}"
     upAttribute = "up-#{feature}"
 
-    up.compiler "[#{dataAttribute}]", ($element) ->
-      if isRails() && willHandle($element)
+    up.macro "[#{dataAttribute}]", ($element) ->
+      if isRails() && up.link.isFollowable($element)
         replacement = {}
         replacement[upAttribute] = $element.attr(dataAttribute)
         u.setMissingAttrs($element, replacement)
         $element.removeAttr(dataAttribute)
 
-  csrfField = ->
-    if isRails()
-      name: $.rails.csrfParam()
-      value: $.rails.csrfToken()
-
-  csrfField: csrfField
-  isRails: isRails
-
 )(jQuery)

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

@@ -20,12 +20,22 @@ or when a matching fragment is [inserted via AJAX](/up.link) later.
 @class up.syntax
 ###
 up.syntax = (($) ->
-  
+
   u = up.util
 
   DESTRUCTIBLE_CLASS = 'up-destructible'
   DESTRUCTORS_KEY = 'up-destructors'
 
+  SYSTEM_MACRO_PRIORITIES = {
+    '[up-back]': -100        # sets [up-href] to previous URL
+    '[up-drawer]': -200      # sets [up-modal] and makes link followable
+    '[up-dash]': -200        # sets [up-href] unless already set, also other [up-*] attributes
+    '[up-expand]': -300      # distributes [up-*] attributes to parents
+    '[data-method]': -400,   # converts [data-method] to [up-method] only if link has followable [up-*] attributes
+    '[data-confirm]': -400,  # converts [data-conform] to [up-confirm] only if link has followable [up-*] attributes
+  }
+
+  isBooting = true
   compilers = []
   macros = []
 
@@ -176,17 +186,17 @@ up.syntax = (($) ->
 
   
   @function up.compiler
-  @param {String} selector
+  @param {string} selector
     The selector to match.
-  @param {Number} [options.priority=0]
-    The priority of this compilers.
+  @param {number} [options.priority=0]
+    The priority of this compiler.
     Compilers with a higher priority are run first.
     Two compilers with the same priority are run in the order they were registered.
-  @param {Boolean} [options.batch=false]
+  @param {boolean} [options.batch=false]
     If set to `true` and a fragment insertion contains multiple
     elements matching the selector, `compiler` is only called once
     with a jQuery collection containing all matching elements. 
-  @param {Boolean} [options.keep=false]
+  @param {boolean} [options.keep=false]
     If set to `true` compiled fragment will be [persisted](/up-keep) during
     [page updates](/a-up-target).
 
@@ -207,8 +217,10 @@ up.syntax = (($) ->
     The function may also return an array of destructor functions.
   @stable
   ###
-  compiler = (args...) ->
-    insertCompiler(compilers, args...)
+  compiler = (selector, args...) ->
+    callback = args.pop()
+    options = u.options(args[0])
+    insertCompiler(compilers, selector, options, callback)
 
   ###*
   Registers a [compiler](/up.compiler) that is run before all other compilers.
@@ -239,45 +251,50 @@ up.syntax = (($) ->
         $link.attr('up-duration', '300');
       });
 
-  Examples for built-in macros are [`up-dash`](/up-dash) and [`up-expand`](/up-expand).
+  Examples for built-in macros are [`a[up-dash]`](/a-up-dash) and [`[up-expand]`](/up-expand).
 
   @function up.macro
-  @param {String} selector
+  @param {string} selector
     The selector to match.
   @param {Object} options
     See options for [`up.compiler()`](/up.compiler).
-  @param {Function($element, data)} compiler
+  @param {Function($element, data)} macro
     The function to call when a matching element is inserted.
     See [`up.compiler()`](/up.compiler) for details.
   @stable
   ###
-  macro = (args...) ->
-    insertCompiler(macros, args...)
-
-  buildCompiler = (selector, args...) ->
+  macro = (selector, args...) ->
     callback = args.pop()
-    options = u.options(args[0], priority: 0)
-    if options.priority == 'first'
-      options.priority = Number.POSITIVE_INFINITY
-    else if options.priority == 'last'
-      options.priority = Number.NEGATIVE_INFINITY
+    options = u.options(args[0])
+    if isBooting
+      options.priority = detectSystemMacroPriority(selector) ||
+        up.fail('Unregistered priority for system macro %o', selector)
+    insertCompiler(macros, selector, options, callback)
+
+  detectSystemMacroPriority = (fullMacroSelector) ->
+    for substr, priority of SYSTEM_MACRO_PRIORITIES
+      if fullMacroSelector.indexOf(substr) >= 0
+        return priority
+
+  buildCompiler = (selector, options, callback) ->
     selector: selector
     callback: callback
-    priority: options.priority
+    isSystem: isBooting
+    priority: options.priority || 0
     batch: options.batch
     keep: options.keep
 
-  insertCompiler = (queue, args...) ->
+  insertCompiler = (queue, selector, options, callback) ->
     # Silently discard any compilers that are registered on unsupported browsers
     return unless up.browser.isSupported()
-    newCompiler = buildCompiler(args...)
+    newCompiler = buildCompiler(selector, options, callback)
     index = 0
     while (oldCompiler = queue[index]) && (oldCompiler.priority >= newCompiler.priority)
       index += 1
     queue.splice(index, 0, newCompiler)
 
   applyCompiler = (compiler, $jqueryElement, nativeElement) ->
-    up.puts ("Compiling '%s' on %o" unless compiler.isDefault), compiler.selector, nativeElement
+    up.puts ("Compiling '%s' on %o" unless compiler.isSystem), compiler.selector, nativeElement
     if compiler.keep
       value = if u.isString(compiler.keep) then compiler.keep else ''
       $jqueryElement.attr('up-keep', value)
@@ -325,7 +342,7 @@ up.syntax = (($) ->
     up.log.group "Compiling fragment %o", $fragment.get(0), ->
       for queue in [macros, compilers]
         for compiler in queue
-          $matches = u.findWithSelf($fragment, compiler.selector)
+          $matches = u.selectInSubtree($fragment, compiler.selector)
 
           # Exclude all elements that are descendants of the subtrees we want to keep.
           $matches = $matches.filter ->
@@ -334,7 +351,7 @@ up.syntax = (($) ->
               $match.closest(skipSubtree).length == 0
 
           if $matches.length
-            up.log.group ("Compiling '%s' on %d element(s)" unless compiler.isDefault), compiler.selector, $matches.length, ->
+            up.log.group ("Compiling '%s' on %d element(s)" unless compiler.isSystem), compiler.selector, $matches.length, ->
               if compiler.batch
                 applyCompiler(compiler, $matches, $matches.get())
               else
@@ -358,13 +375,12 @@ up.syntax = (($) ->
   @internal
   ###
   prepareClean = ($fragment) ->
-    destructors = []
-    u.findWithSelf($fragment, ".#{DESTRUCTIBLE_CLASS}").each ->
-      # Although destructible elements should always have an array of destructors, we might be
-      # destroying a clone of such an element. E.g. Unpoly creates a clone when keeping an
-      # [up-keep] element, and that clone still has the .up-destructible class.
-      if destructor = $(this).data(DESTRUCTORS_KEY)
-        destructors.push(destructor)
+    $candidates = u.selectInSubtree($fragment, ".#{DESTRUCTIBLE_CLASS}")
+    destructors = u.map $candidates, (candidate) -> $(candidate).data(DESTRUCTORS_KEY)
+    # Although destructible elements should always have an destructor function, we might be
+    # destroying a clone of such an element. E.g. Unpoly creates a clone when keeping an
+    # [up-keep] element, and that clone still has the .up-destructible class.
+    destructors = u.compact destructors
     u.sequence(destructors...)
 
   ###*
@@ -384,7 +400,7 @@ up.syntax = (($) ->
       up.syntax.data('.person') // returns { age: 18, name: 'Bob' }
 
   @function up.syntax.data
-  @param {String|Element|jQuery} elementOrSelector
+  @param {string|Element|jQuery} elementOrSelector
   @return
     The JSON-decoded value of the `up-data` attribute.
 
@@ -443,17 +459,6 @@ up.syntax = (($) ->
     else
       {}
 
-  ###*
-  Makes a snapshot of the currently registered event listeners,
-  to later be restored through `reset`.
-  
-  @internal
-  ###
-  snapshot = ->
-    setDefault = (compiler) -> compiler.isDefault = true
-    u.each(compilers, setDefault)
-    u.each(macros, setDefault)
-
   ###*
   Resets the list of registered compiler directives to the
   moment when the framework was booted.
@@ -461,11 +466,11 @@ up.syntax = (($) ->
   @internal
   ###
   reset = ->
-    isDefault = (compiler) -> compiler.isDefault
-    compilers = u.select(compilers, isDefault)
-    macros = u.select(macros, isDefault)
+    isSystem = (compiler) -> compiler.isSystem
+    compilers = u.select(compilers, isSystem)
+    macros = u.select(macros, isSystem)
 
-  up.on 'up:framework:booted', snapshot
+  up.on 'up:framework:booted', -> isBooting = false
   up.on 'up:framework:reset', reset
 
   compiler: compiler

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

@@ -37,20 +37,20 @@ up.tooltip = (($) ->
   Configures defaults for future tooltips.
 
   @property up.tooltip.config
-  @param {String} [config.position]
+  @param {string} [config.position]
     The default position of tooltips relative to the element.
     Can be `'top'`, `'right'`, `'bottom'` or `'left'`.
-  @param {String} [config.openAnimation='fade-in']
+  @param {string} [config.openAnimation='fade-in']
     The animation used to open a tooltip.
-  @param {String} [config.closeAnimation='fade-out']
+  @param {string} [config.closeAnimation='fade-out']
     The animation used to close a tooltip.
-  @param {Number} [config.openDuration]
+  @param {number} [config.openDuration]
     The duration of the open animation (in milliseconds).
-  @param {Number} [config.closeDuration]
+  @param {number} [config.closeDuration]
     The duration of the close animation (in milliseconds).
-  @param {String} [config.openEasing]
+  @param {string} [config.openEasing]
     The timing function controlling the acceleration of the opening animation.
-  @param {String} [config.closeEasing]
+  @param {string} [config.closeEasing]
     The timing function controlling the acceleration of the closing animation.
   @stable
   ###
@@ -130,33 +130,28 @@ up.tooltip = (($) ->
       });
 
   @function up.tooltip.attach
-  @param {Element|jQuery|String} elementOrSelector
-  @param {String} [options.text]
+  @param {Element|jQuery|string} elementOrSelector
+  @param {string} [options.text]
     The text to display in the tooltip.
 
     Any HTML control characters will be escaped.
     If you need to use HTML formatting in the tooltip, use `options.html` instead.
-  @param {String} [options.html]
+  @param {string} [options.html]
     The HTML to display in the tooltip unescaped.
 
     Make sure to escape any user-provided text before passing it as this option,
     or use `options.text` (which automatically escapes).
-  @param {String} [options.position='top']
+  @param {string} [options.position='top']
     The position of the tooltip.
     Can be `'top'`, `'right'`, `'bottom'` or `'left'`.
-  @param {String} [options.animation]
+  @param {string} [options.animation]
     The [animation](/up.motion) to use when opening the tooltip.
   @return {Promise}
-    A promise that will be resolved when the tooltip's opening animation has finished.
+    A promise that will be fulfilled when the tooltip's opening animation has finished.
   @stable
   ###
   attachAsap = (elementOrSelector, options = {}) ->
-    curriedAttachNow = -> attachNow(elementOrSelector, options)
-    if isOpen()
-      chain.asap(closeNow, curriedAttachNow)
-    else
-      chain.asap(curriedAttachNow)
-    chain.promise()
+    chain.asap closeNow, (-> attachNow(elementOrSelector, options))
 
   attachNow = (elementOrSelector, options) ->
     $anchor = $(elementOrSelector)
@@ -188,13 +183,11 @@ up.tooltip = (($) ->
   @stable
   ###
   closeAsap = (options) ->
-    if isOpen()
-      chain.asap -> closeNow(options)
-    chain.promise()
+    chain.asap -> closeNow(options)
 
   closeNow = (options) ->
     unless isOpen() # this can happen when a request fails and the chain proceeds to the next task
-      return u.resolvedPromise()
+      return Promise.resolve()
 
     options = u.options(options, animation: config.closeAnimation)
     animateOptions = up.motion.animateOptions(options, duration: config.closeDuration, easing: config.closeEasing)
@@ -227,10 +220,10 @@ up.tooltip = (($) ->
       <a href="/decks" up-tooltip="Show all decks" up-position="bottom">Decks</a>
 
   @selector [up-tooltip]
-  @param {String} [up-animation]
+  @param {string} [up-animation]
     The animation used to open the tooltip.
     Defaults to [`up.tooltip.config.openAnimation`](/up.tooltip.config).
-  @param {String} [up-position]
+  @param {string} [up-position]
     The default position of tooltips relative to the element.
     Can be either `"top"` or `"bottom"`.
     Defaults to [`up.tooltip.config.position`](/up.tooltip.config).