card-mod-script 0.13.2 → 0.14.1

data/assets/script/manifest.yml

@@ -1,13 +1,23 @@
+remote:
+  items:
+    - src: https://code.jquery.com/jquery-3.6.0.min.js
+      integrity: sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=
+      crossorigin: anonymous
+    - src: https://cdnjs.cloudflare.com/ajax/libs/jquery-ujs/1.2.0/rails.min.js
+      integrity: sha512-7JCF1tm2gqb7ddeKwz64uEhSx9f/Eu+90/LQ26ymVJlkrrOI7C1JR0KUHLi4FASyVwkuAekBNsMfCWJm1l9bHQ==
+      crossorigin: anonymous
+      referrerpolicy: no-referrer
+
 jquery:
   items:
-    - ../../vendor/jquery_rails/vendor/assets/javascripts/jquery3.js
-    - ../../vendor/jquery_rails/vendor/assets/javascripts/jquery_ujs.js
+    # - ../../vendor/jquery_rails/vendor/assets/javascripts/jquery3.js
+    # - ../../vendor/jquery_rails/vendor/assets/javascripts/jquery_ujs.js
     # jquery-ui includes all interaction components, the dialog and the autocomplete widget
     # and all dependencies for those
     # decko depends on autocomplete, sortable, jquery.autosize and jquery.fileupload
     # the dialog widget is not used in decko but in wikirate
     # don't know if iframe-transport is needed but it used to be there
-    - jquery-ui.js
+    - jquery-ui.min.js
     - jquery.autosize.js
     - ../../vendor/jquery_file_upload/js/jquery.fileupload.js
     - ../../vendor/jquery_file_upload/js/jquery.iframe-transport.js
@@ -24,6 +34,7 @@ decko:
     - decko/upload.js.coffee
     - decko/slot.js.coffee
     - decko/decko.js.coffee
+    - decko/type_editor.js.coffee
     - decko/modal.js.coffee
     - decko/overlay.js.coffee
     - decko/recaptcha.js.coffee
@@ -38,6 +49,8 @@ decko:
     - decko/follow.js.coffee
     - decko/card_menu.js.coffee
     - decko/slot_ready.js.coffee
+    - decko/pointer_config.js.coffee
+    - decko/pointer_list_editor.js.coffee
     - decko/filter.js.coffee
     - decko/filter_links.js.coffee
     - decko/filter_items.js.coffee

data/init/early/init_execjs.rb

@@ -0,0 +1,3 @@
+# By requiring this here, we force the runtime detection (common installation problem)
+
+require "execjs"

data/set/abstract/00_script.rb

@@ -3,44 +3,43 @@
 require "coderay"
 require "uglifier"
 
-def self.included host_class
-  host_class.include_set Abstract::Machine
-  host_class.include_set Abstract::MachineInput
+include_set Abstract::AssetInputter, input_format: :js, input_view: :compressed
 
-  host_class.machine_input { standard_machine_input }
-  host_class.store_machine_output filetype: "js"
-end
+format :js do
+  view :compressed do
+    js = compress(_render_core)
+    comment_with_source js
+  end
 
-def standard_machine_input
-  js = format(:js)._render_core
-  js = compress js if compress?
-  comment_with_source js
-end
+  def comment_with_source js
+    "// #{card.name}\n#{js}"
+  end
 
-def comment_with_source js
-  "//#{name}\n#{js}"
-end
+  def compress input
+    compress? ? try_compress(input) : input
+  end
 
-def compress input
-  Uglifier.compile input
-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
-  # To get the original error we have to refer to Card::Error.current
-  raise Card::Error, compression_error_message(e)
-end
+  def try_compress input
+    Uglifier.compile(input)
+  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
+    # To get the original error we have to refer to Card::Error.current
+    raise Card::Error, compression_error_message(e)
+  end
 
-def compression_error_message e
-  if Card::Error.current
-    Card::Error.current.message
-  else
-    "JavaScript::SyntaxError (#{name}): #{e.message}"
+  def compression_error_message e
+    if Card::Error.current
+      Card::Error.current.message
+    else
+      "JavaScript::SyntaxError (#{name}): #{e.message}"
+    end
   end
-end
 
-def compress?
-  Cardio.config.compress_javascript
+  def compress?
+    Cardio.config.compress_assets
+  end
 end
 
 def clean_html?

data/set/abstract/01_asset_script.rb

@@ -7,19 +7,3 @@ include_set Abstract::AssetFile
 def compress?
   @minimize
 end
-
-format :js do
-  view :source do
-    if @local
-      card.machine_output_url
-    else
-      source
-    end
-  end
-end
-
-format :html do
-  view :javascript_include_tag do
-    javascript_include_tag card.machine_output_url
-  end
-end

data/set/abstract/{script_asset_list.rb → script_group.rb}

@@ -1,9 +1,14 @@
-include_set Abstract::Machine
-include_set Abstract::MachineInput
-include_set Abstract::AssetList
+include_set Abstract::AssetGroup
 
-machine_input { standard_machine_input }
-store_machine_output filetype: "js"
+def asset_input_content
+  format(:js).render_core
+end
+
+format :js do
+  view :core do
+    card.render_items_and_compress :js
+  end
+end
 
 def new_asset_constants path
   if path.ends_with? ".js.coffee"
@@ -21,12 +26,6 @@ def javascript_constants
   { type_id: JavaScriptID, set_module: Abstract::AssetJavaScript }
 end
 
-def standard_machine_input
-  render_items_and_compress :js
-end
-
-format :html do
-  view :javascript_include_tag do
-    javascript_include_tag card.machine_output_url
-  end
+def valid_file_extensions
+  %w[js coffee]
 end

data/set/all/head_javascript.rb

@@ -1,9 +1,13 @@
 format :html do
+  # script_config basket is a hash where
+  #  - key is the codename of a card with javascript config (usually in json format)
+  #  - value is the name of a javascript method that handles the config
+  basket[:script_config] = {}
+
   def views_in_head
     super + %w[
       decko_script_variables
       head_javascript
-      html5shiv_tag
       script_config_and_initiation
     ]
   end
@@ -20,13 +24,9 @@ format :html do
     Array.wrap(head_javascript_paths).reject(&:empty?).join("\n")
   end
 
-  view :html5shiv_tag, unknown: true, perms: :none do
-    nest :script_html5shiv_printshiv, view: :script_tag
-  end
-
   view :script_config_and_initiation, unknown: true, perms: :none do
     javascript_tag do
-      (mod_js_configs << trigger_slot_ready).join "\n\n"
+      (script_configs << trigger_slot_ready).join "\n\n"
     end
   end
 
@@ -66,10 +66,14 @@ format :html do
     "{ #{vars} }"
   end
 
-  def mod_js_configs
-    mod_js_config.map do |codename, js_decko_function|
+  def script_configs
+    basket[:script_config].map do |codename, js_decko_function|
       config_json = escape_javascript Card::Rule.global_setting(codename)
       "decko.#{js_decko_function}('#{config_json}')"
     end
   end
+
+  def javascript_include_tag *args
+    "\n<!-- #{card.name} -->#{super}"
+  end
 end

data/set/right/script.rb

@@ -1,22 +1,9 @@
-include_set Abstract::Pointer
+include_set Type::List
 
 def ok_to_read
   true
 end
 
-def refresh_output force: false
-  item_cards.each do |item_card|
-    # puts "refreshing #{item_card.name}".yellow
-    item_card.try :refresh_output, force: force
-  end
-end
-
-def regenerate_machine_output
-  item_cards.each do |item_card|
-    item_card.try :regenerate_machine_output
-  end
-end
-
 format :html do
   view :javascript_include_tag do
     card.item_cards.map do |script|

data/set/type/local_script_folder_group.rb

@@ -1,2 +1,2 @@
-include_set Abstract::LocalFolderGroup
-include_set Abstract::ScriptAssetList
+include_set Abstract::FolderGroup
+include_set Abstract::ScriptGroup

data/set/type/local_script_manifest_group.rb

@@ -1,2 +1,2 @@
 include_set Abstract::LocalManifestGroup
-include_set Abstract::ScriptAssetList
+include_set Abstract::ScriptGroup

data/set/type_plus_right/mod/script.rb

@@ -0,0 +1,56 @@
+include_set Abstract::AssetOutputter, output_format: :js
+include_set Abstract::ModAssets
+
+def make_asset_output_coded
+  super mod_name
+end
+
+def subpath
+  "script"
+end
+
+def folder_group_type_id
+  ::Card::LocalScriptFolderGroupID
+end
+
+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 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
+  end
+
+  def remote_include_tags
+    remote_items = card.manifest_group_items "remote"
+    return unless remote_items
+
+    remote_items.map do |args|
+      tag_args = args.clone
+      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

@@ -0,0 +1,7 @@
+# include_set Abstract::AssetOutputter, output_format: :js
+
+def input_item_cards
+  item_cards.reject do |item_card|
+    item_card.is_a? Abstract::ModAssets
+  end
+end

data/vendor/jquery_file_upload/LICENSE.txt

@@ -2,20 +2,19 @@ MIT License
 
 Copyright © 2010 Sebastian Tschan, https://blueimp.net
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.