card 1.93.4 → 1.93.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (37) hide show
  1. checksums.yaml +4 -4
  2. data/VERSION +1 -1
  3. data/config/initializers/01_core_extensions/match_data.rb +12 -0
  4. data/config/initializers/core_extensions.rb +1 -0
  5. data/db/migrate_core_cards/data/cards.yml +2 -2
  6. data/db/schema.rb +2 -2
  7. data/db/seed/new/card_actions.yml +1028 -1020
  8. data/db/seed/new/card_acts.yml +2 -2
  9. data/db/seed/new/card_references.yml +112 -91
  10. data/db/seed/new/cards.yml +1781 -1762
  11. data/db/seed/test/fixtures/card_actions.yml +2128 -2120
  12. data/db/seed/test/fixtures/card_acts.yml +438 -438
  13. data/db/seed/test/fixtures/card_changes.yml +66 -66
  14. data/db/seed/test/fixtures/card_references.yml +853 -832
  15. data/db/seed/test/fixtures/cards.yml +3075 -3056
  16. data/db/version.txt +1 -1
  17. data/lib/card/format/nest.rb +7 -0
  18. data/lib/card/query/run.rb +21 -17
  19. data/lib/card/tasks/card/file_card_creator/abstract_file_card.rb +1 -1
  20. data/mod/basic_formats/set/all/base.rb +4 -0
  21. data/mod/bootstrap/lib/stylesheets/style_bootstrap_cards.scss +11 -7
  22. data/mod/bootstrap/set/all/bootstrap/form.rb +1 -1
  23. data/mod/carrierwave/set/abstract/attachment/storage_type.rb +4 -0
  24. data/mod/carrierwave/set/all/file_utils.rb +11 -2
  25. data/mod/machines/file/all_script_machine_output/file.js +16 -6
  26. data/mod/machines/file/all_style_machine_output/file.css +2 -2
  27. data/mod/machines/lib/stylesheets/style_cards.scss +12 -1
  28. data/mod/pointer/set/abstract/01_paging.rb +11 -1
  29. data/mod/standard/set/all/rich_html/content.rb +15 -5
  30. data/mod/standard/set/all/rich_html/form_elements.rb +1 -0
  31. data/mod/standard/set/all/rich_html/menu.rb +2 -0
  32. data/mod/standard/set/all/rich_html/toolbar.rb +11 -14
  33. data/mod/standard/set/rstar/rules_editor.rb +4 -3
  34. data/mod/standard/set/self/rules_toolbar_button.rb +1 -1
  35. data/mod/standard/set/type/session.rb +4 -0
  36. data/mod/tinymce_editor/lib/javascript/script_tinymce_config.js.coffee +1 -0
  37. metadata +5 -4
@@ -1,7 +1,7 @@
1
1
  include_set Abstract::ToolbarSplitButton
2
2
 
3
3
  format :html do
4
- view :core do
4
+ view :core, cache: :never do
5
5
  subject.toolbar_split_button("rules", view: :edit_rules, icon: :list) do
6
6
  dropdown_items
7
7
  end
@@ -22,6 +22,10 @@ def content
22
22
  Env.session[key]
23
23
  end
24
24
 
25
+ def content= val
26
+ Env.session[key] = val
27
+ end
28
+
25
29
  format :html do
26
30
  def default_core_args args
27
31
  args[:items] = { view: :name }
@@ -35,4 +35,5 @@ $.extend decko,
35
35
  $.extend conf, user_conf, hard_conf
36
36
  tinyMCE.baseURL = '/assets/tinymce'
37
37
  tinyMCE.suffix = '.min'
38
+ tinyMCE.remove("##{el_id}")
38
39
  tinyMCE.init conf
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: card
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.93.4
4
+ version: 1.93.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2017-11-29 00:00:00.000000000 Z
14
+ date: 2017-12-16 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: cardname
@@ -19,14 +19,14 @@ dependencies:
19
19
  requirements:
20
20
  - - '='
21
21
  - !ruby/object:Gem::Version
22
- version: 0.3.4
22
+ version: 0.3.5
23
23
  type: :runtime
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
26
26
  requirements:
27
27
  - - '='
28
28
  - !ruby/object:Gem::Version
29
- version: 0.3.4
29
+ version: 0.3.5
30
30
  - !ruby/object:Gem::Dependency
31
31
  name: haml
32
32
  requirement: !ruby/object:Gem::Requirement
@@ -254,6 +254,7 @@ files:
254
254
  - config/initializers/01_core_extensions/array.rb
255
255
  - config/initializers/01_core_extensions/hash.rb
256
256
  - config/initializers/01_core_extensions/kernel.rb
257
+ - config/initializers/01_core_extensions/match_data.rb
257
258
  - config/initializers/01_core_extensions/module.rb
258
259
  - config/initializers/01_core_extensions/object.rb
259
260
  - config/initializers/01_core_extensions/persistent_identifiers.rb