card-mod-script 0.19.0 → 0.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c9ca59477e60085085977f3e70d3bd6210f59e8c3ed653315cd15dd625de255
-  data.tar.gz: 469c4ca253085196263b78cd0bc8f50bb5d40dadddf06f19b74ea908ccdab62e
+  metadata.gz: 23c40d470fecc20bb9bec6a1b7063c490f182dfed41f1b0f7e49f17a1870b1bc
+  data.tar.gz: f89698cdca9a0db2eed0eed4169cac3969539d797bc0873197766d2334d0d98c
 SHA512:
-  metadata.gz: e04493920ff9ae54edd9d035421910966c65c966d180d56ecf3aec5861bf671d7b567f490675c5f76323372dc137bd7995165228006a610c96c84f16e6cc4e3c
-  data.tar.gz: 0c3a42664d1ef6ff705e13078f1fd85f115b121e283154008c520c01f54b6bd47c49a7404fb97ce247f471c75d401a6b93856ab8caf46ad602d99529b7826dc4
+  metadata.gz: e1bc80e6dc11ca39b30d2dbd91555f27a52aa73cbcd5997237034d00e34edc9cb2e2578179b1aede31f0fd2d9cff108f0147884f66a25ff376d9a89be5e48cf4
+  data.tar.gz: adadb80d1ec88f1274da7582633cfe23139573231f93ad2935c1934daed31cae82f56172117caebc2c2eaa5fb29ad262ab078cd40a4eaa0c9b66bf6f83ecb26f

data/set/all/head_javascript.rb

@@ -15,7 +15,11 @@ format :html do
   end
 
   view :javascript_tags, unknown: true, cache: :deep, perms: :none do
-    Array.wrap(head_javascript_paths).reject(&:empty?).join
+    return unless (asset_card = param_or_rule_card :script)
+
+    [nest(asset_card, view: :remote_script_tags),
+     "<!-- MAIN DECKO JAVASCRIPT -->",
+     main_javascript_tag(asset_card)]
   end
 
   view :script_calls, unknown: true, perms: :none do
@@ -30,26 +34,17 @@ format :html do
     {
       "decko.rootUrl": card_url(""),
       "decko.doubleClick": Card.config.double_click,
-      "decko.cssPath": head_stylesheet_path,
+      "decko.cssPath": main_stylesheet_path,
       "decko.currentUserId": (Auth.current_id if Auth.signed_in?)
     }
   end
 
-  def head_javascript_paths
-    return unless (asset_card = param_or_rule_card :script)
-
-    seed_asset_outputs asset_card
-    asset_card.item_cards.map do |script|
-      script.format(:html).render :javascript_include_tag
-    end
+  def main_javascript_tag asset_card
+    javascript_include_tag asset_card.asset_output_url
   end
 
   private
 
-  def seed_asset_outputs asset_card
-    Cache.populate_fields asset_card.item_names, :asset_output
-  end
-
   def trigger_slot_ready
     "$('document').ready(function() { $('.card-slot').trigger('decko.slot.ready'); })"
   end
@@ -68,8 +63,4 @@ format :html do
       "decko.#{js_function}('#{escape_javascript send(ruby_method)}')"
     end
   end
-
-  def javascript_include_tag *args
-    "\n<!-- #{card.name} -->#{super}"
-  end
 end

data/set/type_plus_right/mod/script.rb

@@ -1,10 +1,7 @@
-include_set Abstract::AssetOutputter, output_format: :js
+# include_set Abstract::AssetOutputter, output_format: :js
+include_set Abstract::AssetInputter, input_format: :js
 include_set Abstract::ModAssets
 
-def make_asset_output_coded
-  super(mod_name)
-end
-
 def subpath
   "script"
 end
@@ -17,27 +14,9 @@ def local_manifest_group_type_id
   ::Card::LocalScriptManifestGroupID
 end
 
-def refresh_asset
-  update_asset_output if asset_output_needs_refresh?
-end
-
-def asset_output_needs_refresh?
-  !asset_output_updated_at || source_changed?(since: asset_output_updated_at)
-end
-
-def asset_output_updated_at
-  asset_output_card&.file_updated_at
-end
-
 format :html do
-  view :javascript_include_tag, cache: :never do
-    [remote_include_tags, local_include_tag].flatten.compact.join "\n"
-  end
-
-  def local_include_tag
-    return unless local_url
-
-    javascript_include_tag local_url
+  view :remote_script_tags, cache: :never do
+    remote_include_tags.compact.join "\n"
   end
 
   def remote_include_tags
@@ -45,8 +24,4 @@ format :html do
       javascript_include_tag tag_args.delete("src"), tag_args
     end
   end
-
-  def local_url
-    card.asset_output_url
-  end
 end

data/set/type_plus_right/set/script.rb

@@ -1,9 +1,24 @@
+include_set Abstract::AssetOutputter, output_format: :js
+
 def ok_item_types
   %i[java_script coffee_script list]
 end
 
-def input_item_cards
-  item_cards.reject do |item_card|
-    item_card.is_a? Abstract::ModAssets
+def make_asset_output_coded
+  super(Cardio.config.seed_mods.first)
+end
+
+format :html do
+  view :remote_script_tags do
+    card.item_cards.map do |mod|
+      remote_script_tags mod
+    end.compact
+  end
+
+  def remote_script_tags card
+    tags = card.format(:html).render :remote_script_tags
+    return unless tags.present?
+
+    %(<!-- #{card.name.left} (remote) -->\n#{tags})
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-script
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.19.1
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -17,42 +17,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.109.0
+        version: 1.109.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.109.0
+        version: 1.109.1
 - !ruby/object:Gem::Dependency
   name: card-mod-assets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: card-mod-list
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.19.1
 description: ''
 email:
 - info@decko.org