popup.js.coffee in upjs-rails-0.18.1

- old
+ new

@@ -107,11 +107,11 @@
         bottom: linkBox.top
       when "top-left"
         left: linkBox.left
         bottom: linkBox.top
       else
-        u.error("Unknown position %o", position)
+        u.error("Unknown position option '%s'", position)
     $popup = $('.up-popup')
     $popup.attr('up-position', position)
     $popup.css(css)
     ensureInViewport($popup)
 
@@ -151,12 +151,11 @@
     $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)
+    u.$createPlaceholder(target, $popup)
     $popup.appendTo(document.body)
     $popup
 
   ###*
   Returns whether popup modal is currently open.
@@ -212,22 +211,22 @@
     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)
 
     up.browser.confirm(options.confirm).then ->
-      if up.bus.nobodyPrevents('up:popup:open', url: url)
+      if up.bus.nobodyPrevents('up:popup:open', url: url, message: 'Opening popup')
         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')
+          up.emit('up:popup:opened', message: '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()
@@ -272,10 +271,10 @@
           url: $popup.attr('up-covered-url'),
           title: $popup.attr('up-covered-title')
         )
         currentUrl = undefined
         deferred = up.destroy($popup, options)
-        deferred.then -> up.emit('up:popup:closed')
+        deferred.then -> up.emit('up:popup:closed', message: 'Popup closed')
         deferred
       else
         # Although someone prevented the destruction,
         # keep a uniform API for callers by returning
         # a Deferred that will never be resolved.