card-mod-script 0.11.1 → 0.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a6087fa8e77af67163055ec2cacf72769dda7706a97d3cc01c006f39515e2cd
-  data.tar.gz: 0a2d9bfb3a441d4c1d28400ddd460fd8832264d5697f411aae94d2bfcd42815b
+  metadata.gz: 759d816f4c258eb90fcf02366900d8df5b72f1c838a0763ec7860cc223361213
+  data.tar.gz: 9b63a9c8988763f22872fcd1d6d6ad36f874e8c8c94ddbaec7af2691b4fbd86e
 SHA512:
-  metadata.gz: 43621111dcc8a417851e8549dbe68f2635d7e4dce815c82391270f83d0d05e7fb1caeafa7c1dfb4d95c701ca6147a59f3242075622f236b9544e696c859e63e3
-  data.tar.gz: 804e6ea80d5339e1b352329179ac884f9354f5c72d193549de9a04b199f1bd8499760086e0a09e4a1c3c972fd81b148bf6b8129b8ba0eba96acd970c9740ec41
+  metadata.gz: 1a3fef9a06dc0355a60d599c17adff7b34750b045c54eb465200fe85af9d4566d7a23420ac62440251ebe5fd32d6ee739e0b7ecb204b9edd559a6e4033e5177f
+  data.tar.gz: 8d8461a62ab1d176eb7dbb830852d168b2426306ed9c1fc2517b4005fe6398a08a7c62b05f793c0908b9b126da317e3b77cc54d3dd1f1c71d98a610d22128aed

data/lib/javascript/decko/modal.js.coffee

@@ -60,6 +60,9 @@ jQuery.fn.extend {
                         .data("modal-origin-slot-id")
     @find(".modal-body .card-slot").attr("data-modal-origin-slot-id", origin_slot_id)
 
+  modalOriginSlot: ()->
+
+
   modalSlot: ->
     slot = $("#modal-container")
     if slot.length > 0 then slot else decko.createModalSlot()

data/lib/javascript/decko/name_editor.js.coffee

@@ -1,16 +1,15 @@
 checkNameAfterTyping = null
 
 $(window).ready ->
-  $('body').on 'click', '.renamer-updater', ->
+  $('body').on 'click', '._renamer-updater', ->
     $(this).closest('form').find('#card_update_referers').val 'true'
 
-  $('body').on 'submit', '.edit_name-view .card-form, .name_form-view .card-form', ->
-    confirmer = $(this).find '.alert'
-    if confirmer.is ':hidden'
-      if $(this).find('#referers').val() > 0
-        $(this).find('.renamer-updater').show()
-
-      confirmer.show 'blind'
+  $('body').on 'submit', '._rename-form', ->
+    f = $(this)
+    confirm = f.find '.alert'
+    if confirm.is ':hidden'
+      referenceConfirm f
+      confirm.show 'blind'
       false
 
   $('body').on 'keyup', '.name-editor input', (event) ->
@@ -25,6 +24,16 @@ $(window).ready ->
           checkNameAfterTyping = null
         , 400
 
+
+referenceConfirm = (form)->
+  confirm = form.find '._rename-reference-confirm'
+  return unless confirm.data('referer-count') > 0
+  confirm.show()
+  btn = form.find '._renamer-updater'
+  btn.show()
+  btn.focus()
+
+
 checkName = (box) ->
   name = box.val()
   decko.pingName name, (data)->
@@ -48,4 +57,3 @@ checkName = (box) ->
         msg.html "\"<a href='#{href}'>#{name}</a>\" #{qualifier} use"
       else
         msg.html ''
-

data/lib/javascript/decko/slot.js.coffee

@@ -78,7 +78,13 @@ jQuery.fn.extend
   isSlot: ->
     $(this).hasClass "card-slot"
 
-  isMain: -> @slot().parent('#main')[0]
+  isMain: ->
+    @slot().parent('#main')[0]
+
+  isMainOrMainModal: ->
+    el = $(this)
+    el = el.findOriginSlot("modal") if el.closest(".modal")[0]
+    el.isMain()
 
   findSlot: (selector) ->
     if selector == "modal-origin"

data/lib/javascript/decko/slotter.js.coffee

@@ -94,19 +94,26 @@ $(window).ready ->
     $(this).closest('.slotter').data("slotter-mode", "update-origin")
 
   $('body').on 'submit', 'form.slotter', (event)->
-    if (target = $(this).attr 'main-success') and $(this).isMain()
-      input = $(this).find '[name=success]'
-      if input and input.val() and !(input.val().match /^REDIRECT/)
-        input.val(
-          (if target == 'REDIRECT' then target + ': ' + input.val() else target)
-        )
-    if $(this).data('recaptcha') == 'on'
-      return $(this).handleRecaptchaBeforeSubmit(event)
+    form = $(this)
+    if form.data("main-success") and form.isMainOrMainModal()
+      form.mainSuccess()
+    if form.data('recaptcha') == 'on'
+      return form.handleRecaptchaBeforeSubmit(event)
 
   $('body').on 'ajax:beforeSend', '.slotter', (event, xhr, opt)->
-    $(this).slotterBeforeSend(opt)
+    $(this).slotterBeforeSend opt
 
 jQuery.fn.extend
+  mainSuccess: ()->
+    form = $(this)
+    $.each form.data("main-success"), (key, value)->
+      inputSelector = "[name=success\\[" + key + "\\]]"
+      input = form.find inputSelector
+      unless input[0]
+        input = $('<input type="hidden" name="success[' + key + ']"/>')
+        form.append input
+      input.val value
+
   slotterSuccess: (event, data) ->
     unless @hasClass("slotter")
       console.log "warning: slotterSuccess called on non-slotter element #{this}"

data/set/abstract/script.rb

@@ -22,7 +22,7 @@ end
 
 def compress_js input
   Uglifier.compile input
-rescue => e
+rescue StandardError => e
   # CoffeeScript is compiled in a view
   # If there is a CoffeeScript syntax error we get the rescued view here
   # and the error that the rescued view is no valid Javascript

data/set/type/coffee_script.rb

@@ -17,7 +17,7 @@ format do
 
   def compile_coffee script
     ::CoffeeScript.compile script
-  rescue => e
+  rescue StandardError => e
     line_nr = e.to_s.match(/\[stdin\]:(\d*)/)&.capture(0)&.to_i
     line = script.lines[line_nr - 1] if line_nr
     raise Card::Error, "CoffeeScript::Error (#{card.name}): #{e.message}: #{line}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-script
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.6
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-02 00:00:00.000000000 Z
+date: 2021-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,42 +18,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.1
+        version: 1.101.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.1
+        version: 1.101.6
 - !ruby/object:Gem::Dependency
   name: card-mod-machines
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.11.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.11.6
 - !ruby/object:Gem::Dependency
   name: card-mod-list
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.11.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.11.6
 description: ''
 email:
 - info@decko.org
@@ -185,10 +185,15 @@ files:
 - vendor/jquery_rails/vendor/assets/javascripts/jquery3.min.js
 - vendor/jquery_rails/vendor/assets/javascripts/jquery3.min.map
 - vendor/jquery_rails/vendor/assets/javascripts/jquery_ujs.js
-homepage: http://decko.org
+homepage: https://decko.org
 licenses:
 - GPL-3.0
 metadata:
+  source_code_uri: https://github.com/decko-commons/decko
+  homepage_uri: https://decko.org
+  bug_tracker_uri: https://github.com/decko-commons/decko/issues
+  wiki_uri: https://decko.org
+  documentation_url: http://docs.decko.org/
   card-mod: script
 post_install_message:
 rdoc_options: []
@@ -205,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: JavaScript, CoffeeScript, etc.