card-mod-script 0.11.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 167f8b8fcb8a302867abf996072f6ee39bf8bb70d36982b02816278629e8e87a
-  data.tar.gz: 65634fe3e1738ac79d697bb63e670604643ae9f3a12ea3e151a3491eff9fd307
+  metadata.gz: 75d3a886dfedda68dc63b519d04fa19582cc76fe3c3a2ac795a5301d0b8221e4
+  data.tar.gz: b5e713c2eee8726858dcd0e947cfea6558179a555168d7f67e78c20e48818e24
 SHA512:
-  metadata.gz: bdf544b35beab9a381b173e095bf08503c5874e78081d261790409d04ac4d76b750a1024bfea0358dbc71588af41c05b978dfdca008afeb55fede48c093a48bf
-  data.tar.gz: 399d001490d2c3bccfa048bf5f032b6229d4def51fc60c7bac66e4f39b40653b42667f331cad4bba1fe7120047ab8d367be20344ab5de093203aa8ab63ab30b5
+  metadata.gz: 282071ff1352a01520318ff5164fbe7228ed1fd49c4a71ce37e96281e4e425fa9a51d5fbfc4d2cf5edfa02cebd8fca5f4b945e563ced5ae1fbfb484f83e18696
+  data.tar.gz: 63cfeb45c2fec9d52389b97d1e5100bb11cf75f39d8faa91c5d7f3eea700d70b46ee405f5568c4159fe11aafa13864a4f5a3435221320053933eafa41d811f45

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

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
 
+require "coderay"
 require "uglifier"
 
 def self.included host_class
@@ -22,7 +23,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.2
+  version: 0.12.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2021-07-05 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.2
+        version: 1.102.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.2
+        version: 1.102.0
 - !ruby/object:Gem::Dependency
   name: card-mod-machines
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: card-mod-list
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0
 description: ''
 email:
 - info@decko.org
@@ -210,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.2.15
 signing_key:
 specification_version: 4
 summary: JavaScript, CoffeeScript, etc.