card 1.99.6 → 1.100.0

data/mod/pointer/spec/set/abstract/paging_params_spec.rb

@@ -2,7 +2,7 @@ RSpec.describe Card::Set::Abstract::PagingParams do
   describe "offset_param" do
     it "doesn't allow anonymous users to use extremely high values" do
       Card::Auth.signin Card::AnonymousID
-      with_params offset: 10_000 do
+      Card::Env.with_params offset: 10_000 do
         expect { Card[:all].format(:json).offset_param }
           .to raise_error(Card::Error::PermissionDenied,
                           "offset parameter exceeds maximum")

data/mod/pointer/spec/set/abstract/pointer/html_views_spec.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::Abstract::Pointer do
+RSpec.describe Card::Set::Abstract::Pointer do
   context "with simple Pointer" do
     def card_subject
       pointer = Card["Sample Pointer"]
@@ -8,9 +8,8 @@ describe Card::Set::Abstract::Pointer do
       pointer
     end
 
-    check_views_for_errors :core, :one_line_content, :input,
-                           :list, :autocomplete, :checkbox,
-                           :radio, :select, :multiselect
+    check_views_for_errors :core, :one_line_content, :input, :list, :autocomplete,
+                           :checkbox, :radio, :select, :multiselect
   end
 
   describe "editors" do

data/mod/pointer/spec/set/type/mirror_list_spec.rb

@@ -6,9 +6,12 @@ RSpec.describe Card::Set::Type::MirrorList do
   before do
     Card::Auth.as_bot do
       #create_mirrored_list "Parry Hotter+authors", "[[Darles Chickens]]"
-      Card.create! name: "Parry Hotter+authors", content: "[[Darles Chickens]]", type_id: Card::MirroredListID
-      Card.create! name: "50 grades of shy+authors", content: "[[Darles Chickens]]\n[[Stam Broker]]", type_id: Card::MirroredListID
-      #create_mirrored_list "50 grades of shy+authors", "[[Darles Chickens]]\n[[Stam Broker]]"
+      Card.create! name: "Parry Hotter+authors",
+                   content: "[[Darles Chickens]]",
+                   type_id: Card::MirroredListID
+      Card.create! name: "50 grades of shy+authors",
+                   content: "[[Darles Chickens]]\n[[Stam Broker]]",
+                   type_id: Card::MirroredListID
     end
   end
   it "doesn't allow non-cardtype as right part" do

data/mod/rules/set/rule/rules.rb

@@ -1,5 +1,4 @@
-event :save_recently_edited_settings, :integrate,
-      on: :save, changed: %i[type content] do
+event :save_recently_edited_settings, :integrate, on: :save, changed: %i[type content] do
   if (recent = Card[:recent_settings])
     recent.insert_item 0, name.right
     attach_subcard recent

data/mod/search/lib/card/filter_query.rb

@@ -63,8 +63,7 @@ class Card
     def build_nested_hash key, values
       return { key => values[0] } if values.one?
       val = values.pop
-      { key => val,
-        and: build_nested_hash(key, values) }
+      { key => val, and: build_nested_hash(key, values) }
     end
 
     def name_wql name

data/mod/search/set/abstract/00_filter_helper.rb

@@ -17,7 +17,7 @@ def filter_hash
 end
 
 def sort_param
-  safe_sql_param :sort
+  @sort_param ||= safe_sql_param :sort
 end
 
 def safe_sql_param key

data/mod/search/set/abstract/03_filter/filter_form.rb

@@ -68,7 +68,7 @@ format :html do
   end
 
   def default_filter? field
-    card.default_filter_hash.key?(field)
+    card.default_filter_hash.key? field
   end
 
   def filter_label field

data/mod/search/set/abstract/03_filter/form_helper.rb

@@ -93,7 +93,7 @@ format :html do
   end
 
   def type_options type_codename, order="asc", max_length=nil
-    Card.cache.fetch "#{type_codename}-#{order}-#{max_length}-TYPE-OPTIONS" do
+    Card.cache.fetch "#{type_codename}-TYPE-OPTIONS" do
       res = Card.search type: type_codename, return: :name, sort: "name", dir: order
       max_length ? (res.map { |i| [trim_option(i, max_length), i] }) : res
     end

data/mod/settings/set/right/read.rb

@@ -2,68 +2,78 @@ include Abstract::Permission
 
 format :html do include Abstract::Permission::HtmlFormat end
 
-event :cascade_read_rule, :finalize, after: :update_rule_cache,
-                                     when: :is_rule? do
+event :cascade_read_rule, :finalize, after: :update_rule_cache, when: :is_rule? do
   return unless name_is_changing? || trash_is_changing?
 
-  update_read_ruled_cards rule_set
+  update_read_ruled_cards
 end
 
-def reset_patterns_if_rule saving=false
-  return unless (set = super)
-  add_to_read_rule_update_queue set.item_cards(limit: 0) if saving
-end
-
-# TODO: the following really needs a refactor.
-#
-# It was written (long ago) to handle different kinds of changes, but this
-# could be significantly simplified with smarter events.
-
-def update_read_ruled_cards set
+def update_read_ruled_cards
   Card::Rule.clear_read_rule_cache
   Card.cache.reset # maybe be more surgical, just Auth.user related
   expire # probably shouldn't be necessary,
   # but was sometimes getting cached version when card should be in the
   # trash.  could be related to other bugs?
 
-  updated = update_read_rules_of_set_members set
-
-  # then find all cards with me as read_rule_id that were not just updated
-  # and regenerate their read_rules
-  return if new_card?
-
-  Card.search(read_rule_id: id) do |card|
-    card.update_read_rule unless updated.include?(card.key)
-  end
+  processed = update_read_rules_of_set_members
+  update_cards_with_read_rule_id processed unless new?
 end
 
-def update_read_rules_not_overridden_by_narrower_rules cur_index,
-                                                       rule_class_index, set
-  set.item_cards(limit: 0).each_with_object(::Set.new) do |item_card, in_set|
-    in_set << item_card.key
-    next if cur_index < rule_class_index
+def update_read_rules_of_set_members
+  return unless rule_pattern_index
 
-    item_card.update_read_rule
+  each_member do |member, processed|
+    processed << member.key
+    member.update_read_rule unless member_has_overriding_rule?(member)
   end
 end
 
-event :process_read_rule_update_queue, :finalize do
-  Array.wrap(@read_rule_update_queue).each(&:update_read_rule)
-  @read_rule_update_queue = []
+def member_has_overriding_rule? member
+  pattern_index(Card.fetch_id(member.read_rule_class)) < rule_pattern_index
 end
 
-def update_read_rules_of_set_members set
-  return ::Set.new if trash || !(class_id = set&.tag&.id)
+# cards with this card as a read_rule_id
+# These may include cards that are no longer set members if the card was renamed
+# (edge case)
+def update_cards_with_read_rule_id processed
+  processed ||= ::Set.new
+  Card::Auth.as_bot do
+    Card.search(read_rule_id: id) do |card|
+      card.update_read_rule unless processed.include?(card.key)
+    end
+  end
+end
 
-  rule_class_ids = set_patterns.map(&:pattern_id)
+def each_member
   Auth.as_bot do
-    if (rule_class_index = rule_class_ids.index(class_id))
-      cur_index = rule_class_ids.index Card[read_rule_class].id
-      update_read_rules_not_overridden_by_narrower_rules cur_index,
-                                                         rule_class_index, set
-    else
-      warn "No current rule index #{class_id}, #{rule_class_ids.inspect}"
-      ::Set.new
+    all_members.each_with_object(::Set.new) do |member, processed|
+      yield member, processed
     end
   end
 end
+
+def all_members
+  rule_set.item_cards limit: 0
+end
+
+def rule_pattern_index
+  return if trash
+
+  @rule_pattern_index ||= pattern_index rule_set&.tag&.id
+end
+
+def pattern_index pattern_id
+  pattern_ids.index(pattern_id) || invalid_pattern_id(pattern_id)
+end
+
+def pattern_ids
+  @pattern_ids ||= set_patterns.map(&:pattern_id)
+end
+
+def invalid_pattern_id pattern_id
+  Rails.logger.info "invalid pattern id for read rule: #{pattern_id}"
+end
+
+event :process_read_rule_update_queue, :finalize do
+  left&.update_read_rule
+end

data/mod/solid_cache/set/abstract/solid_cache.rb

@@ -8,7 +8,7 @@
 # The cache expiration can be controlled with the cache_update_trigger and
 # cache_expire_trigger methods.
 
-card_accessor :solid_cache, type: :html
+card_accessor :solid_cache, type: HtmlID
 
 def self.included host_class
   host_class.format(host_class.try(:cached_format) || :base) do

data/mod/standard/set/all/comment.rb

@@ -1,5 +1,5 @@
 def commenting?
-  comment && @action != :delete
+  comment && action != :delete
 end
 
 event :add_comment, :prepare_to_store, on: :save, when: :comment do

data/mod/standard/set/all/list_changes.rb

@@ -18,9 +18,8 @@ def codename_list_exist?
 end
 
 event :trunk_cardtype_of_a_list_relation_changed, :finalize,
-      changed: :type, on: :update,
-      when: :codename_list_exist? do
-  type_key_was = (tk = Card.quick_fetch(type_id_before_last_save)) && tk.key
+      changed: :type, on: :update, when: :codename_list_exist? do
+  type_key_was = Card.quick_fetch(type_id_before_act)&.key
 
   list_fields.each do |card|
     card.update_listed_by_cache_for card.item_keys, type_key: type_key_was

data/mod/standard/set/all/path.rb

@@ -105,7 +105,8 @@ format do
   end
 
   # normalizes certain path opts to specified data types
-  def cast_path_opts opts, cast_hash=CAST_PARAMS
+  def cast_path_opts opts, cast_hash=nil
+    cast_hash ||= CAST_PARAMS
     return opts unless opts.is_a?(::Hash)
     opts.each do |key, value|
       next unless (cast_to = cast_hash[key])

data/mod/standard/set/all/rich_html/modal.rb

@@ -91,8 +91,8 @@ format :html do
     classes = [classy("modal-dialog")]
     return classes unless opts.present?
 
-    add_modal_size_class classes, opts.delete(:size)
-    classes << "modal-dialog-centered" if opts.delete(:vertically_centered)
+    add_modal_size_class classes, opts[:size]
+    classes << "modal-dialog-centered" if opts[:vertically_centered]
     classes.join " "
   end
 

data/mod/standard/set/all/rich_html/show.rb

@@ -6,7 +6,7 @@ format :html do
   # TODO: remove the following after tracking down wikirate encoding bug
   rescue Card::Error::ServerError => e
     if e.message.match?(/invalid byte sequence/)
-      Card::Name.reset_cache
+      Card::Lexicon.cache.reset
       Rails.logger.info "reset name cache to prevent encoding freakiness"
     end
     raise e

data/mod/standard/spec/set/all/history_spec.rb

@@ -35,8 +35,11 @@ RSpec.describe Card::Set::All::History do
       name: "single card",
       type_id: Card::BasicID.to_s,
       db_content: "Nobody expects the Spanish inquisition",
-      trash: "f"
-    }
+      trash: "f",
+      left_id: nil,
+      right_id: nil
+    }.freeze
+
     context "for single card" do
       before do
         @card = Card::Auth.as_bot do
@@ -58,7 +61,6 @@ RSpec.describe Card::Set::All::History do
         end
         it "fetches card changes from cards table" do
           expect(action.changed_values).to eq(INITIAL_VALUES)
-
         end
       end
 

data/mod/standard/spec/set/type/phrase_spec.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::Type::Phrase do
+RSpec.describe Card::Set::Type::Phrase do
   it "has special editor" do
     assert_view_select render_input("Phrase"),
                        'input[type="text"][class~="d0-card-content"]'

data/mod/tinymce_editor/public/assets/tinymce/skins/ui/oxide-dark/content.mobile.min.css

@@ -0,0 +1,7 @@
+/**
+ * Copyright (c) Tiny Technologies, Inc. All rights reserved.
+ * Licensed under the LGPL or a commercial license.
+ * For LGPL see License.txt in the project root for license information.
+ * For commercial licenses see https://www.tiny.cloud/
+ */
+.tinymce-mobile-unfocused-selections .tinymce-mobile-unfocused-selection{background-color:green;display:inline-block;opacity:.5;position:absolute}body{-webkit-text-size-adjust:none}body img{max-width:96vw}body table img{max-width:95%}body{font-family:sans-serif}table{border-collapse:collapse}

data/mod/tinymce_editor/public/assets/tinymce/skins/ui/oxide-dark/skin.mobile.min.css

@@ -0,0 +1,7 @@
+/**
+ * Copyright (c) Tiny Technologies, Inc. All rights reserved.
+ * Licensed under the LGPL or a commercial license.
+ * For LGPL see License.txt in the project root for license information.
+ * For commercial licenses see https://www.tiny.cloud/
+ */
+.tinymce-mobile-outer-container{all:initial;display:block}.tinymce-mobile-outer-container *{border:0;box-sizing:initial;cursor:inherit;float:none;line-height:1;margin:0;outline:0;padding:0;-webkit-tap-highlight-color:transparent;text-shadow:none;white-space:nowrap}.tinymce-mobile-icon-arrow-back::before{content:"\e5cd"}.tinymce-mobile-icon-image::before{content:"\e412"}.tinymce-mobile-icon-cancel-circle::before{content:"\e5c9"}.tinymce-mobile-icon-full-dot::before{content:"\e061"}.tinymce-mobile-icon-align-center::before{content:"\e234"}.tinymce-mobile-icon-align-left::before{content:"\e236"}.tinymce-mobile-icon-align-right::before{content:"\e237"}.tinymce-mobile-icon-bold::before{content:"\e238"}.tinymce-mobile-icon-italic::before{content:"\e23f"}.tinymce-mobile-icon-unordered-list::before{content:"\e241"}.tinymce-mobile-icon-ordered-list::before{content:"\e242"}.tinymce-mobile-icon-font-size::before{content:"\e245"}.tinymce-mobile-icon-underline::before{content:"\e249"}.tinymce-mobile-icon-link::before{content:"\e157"}.tinymce-mobile-icon-unlink::before{content:"\eca2"}.tinymce-mobile-icon-color::before{content:"\e891"}.tinymce-mobile-icon-previous::before{content:"\e314"}.tinymce-mobile-icon-next::before{content:"\e315"}.tinymce-mobile-icon-large-font::before,.tinymce-mobile-icon-style-formats::before{content:"\e264"}.tinymce-mobile-icon-undo::before{content:"\e166"}.tinymce-mobile-icon-redo::before{content:"\e15a"}.tinymce-mobile-icon-removeformat::before{content:"\e239"}.tinymce-mobile-icon-small-font::before{content:"\e906"}.tinymce-mobile-format-matches::after,.tinymce-mobile-icon-readonly-back::before{content:"\e5ca"}.tinymce-mobile-icon-small-heading::before{content:"small"}.tinymce-mobile-icon-large-heading::before{content:"large"}.tinymce-mobile-icon-large-heading::before,.tinymce-mobile-icon-small-heading::before{font-family:sans-serif;font-size:80%}.tinymce-mobile-mask-edit-icon::before{content:"\e254"}.tinymce-mobile-icon-back::before{content:"\e5c4"}.tinymce-mobile-icon-heading::before{content:"Headings";font-family:sans-serif;font-size:80%;font-weight:700}.tinymce-mobile-icon-h1::before{content:"H1";font-weight:700}.tinymce-mobile-icon-h2::before{content:"H2";font-weight:700}.tinymce-mobile-icon-h3::before{content:"H3";font-weight:700}.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask{align-items:center;display:flex;justify-content:center;background:rgba(51,51,51,.5);height:100%;position:absolute;top:0;width:100%}.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container{align-items:center;border-radius:50%;display:flex;flex-direction:column;font-family:sans-serif;font-size:1em;justify-content:space-between}.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .mixin-menu-item{align-items:center;display:flex;justify-content:center;border-radius:50%;height:2.1em;width:2.1em}.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section{align-items:center;display:flex;justify-content:center;flex-direction:column;font-size:1em}@media only screen and (min-device-width:700px){.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section{font-size:1.2em}}.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section .tinymce-mobile-mask-tap-icon{align-items:center;display:flex;justify-content:center;border-radius:50%;height:2.1em;width:2.1em;background-color:#fff;color:#207ab7}.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section .tinymce-mobile-mask-tap-icon::before{content:"\e900";font-family:tinymce-mobile,sans-serif}.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section:not(.tinymce-mobile-mask-tap-icon-selected) .tinymce-mobile-mask-tap-icon{z-index:2}.tinymce-mobile-android-container.tinymce-mobile-android-maximized{background:#fff;border:none;bottom:0;display:flex;flex-direction:column;left:0;position:fixed;right:0;top:0}.tinymce-mobile-android-container:not(.tinymce-mobile-android-maximized){position:relative}.tinymce-mobile-android-container .tinymce-mobile-editor-socket{display:flex;flex-grow:1}.tinymce-mobile-android-container .tinymce-mobile-editor-socket iframe{display:flex!important;flex-grow:1;height:auto!important}.tinymce-mobile-android-scroll-reload{overflow:hidden}:not(.tinymce-mobile-readonly-mode)>.tinymce-mobile-android-selection-context-toolbar{margin-top:23px}.tinymce-mobile-toolstrip{background:#fff;display:flex;flex:0 0 auto;z-index:1}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar{align-items:center;background-color:#fff;border-bottom:1px solid #ccc;display:flex;flex:1;height:2.5em;width:100%}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group{align-items:center;display:flex;height:100%;flex-shrink:1}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group>div{align-items:center;display:flex;height:100%;flex:1}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group.tinymce-mobile-exit-container{background:#f44336}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group.tinymce-mobile-toolbar-scrollable-group{flex-grow:1}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item{padding-left:.5em;padding-right:.5em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item.tinymce-mobile-toolbar-button{align-items:center;display:flex;height:80%;margin-left:2px;margin-right:2px}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item.tinymce-mobile-toolbar-button.tinymce-mobile-toolbar-button-selected{background:#c8cbcf;color:#ccc}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group:first-of-type,.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group:last-of-type{background:#207ab7;color:#eceff1}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group{align-items:center;display:flex;height:100%;flex:1;padding-bottom:.4em;padding-top:.4em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog{display:flex;min-height:1.5em;overflow:hidden;padding-left:0;padding-right:0;position:relative;width:100%}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain{display:flex;height:100%;transition:left cubic-bezier(.4,0,1,1) .15s;width:100%}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen{display:flex;flex:0 0 auto;justify-content:space-between;width:100%}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen input{font-family:Sans-serif}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-input-container{display:flex;flex-grow:1;position:relative}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-input-container .tinymce-mobile-input-container-x{align-self:center;background:inherit;border:none;border-radius:50%;color:#888;font-size:.6em;font-weight:700;height:100%;padding-right:2px;position:absolute;right:0}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-input-container.tinymce-mobile-input-container-empty .tinymce-mobile-input-container-x{display:none}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-next,.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-previous{align-items:center;display:flex}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-next::before,.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-previous::before{align-items:center;display:flex;font-weight:700;height:100%;padding-left:.5em;padding-right:.5em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-next.tinymce-mobile-toolbar-navigation-disabled::before,.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-previous.tinymce-mobile-toolbar-navigation-disabled::before{visibility:hidden}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-dot-item{color:#ccc;font-size:10px;line-height:10px;margin:0 2px;padding-top:3px}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-dot-item.tinymce-mobile-dot-active{color:#c8cbcf}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-icon-large-font::before,.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-icon-large-heading::before{margin-left:.5em;margin-right:.9em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-icon-small-font::before,.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-icon-small-heading::before{margin-left:.9em;margin-right:.5em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider{display:flex;flex:1;margin-left:0;margin-right:0;padding:.28em 0;position:relative}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider .tinymce-mobile-slider-size-container{align-items:center;display:flex;flex-grow:1;height:100%}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider .tinymce-mobile-slider-size-container .tinymce-mobile-slider-size-line{background:#ccc;display:flex;flex:1;height:.2em;margin-bottom:.3em;margin-top:.3em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container{padding-left:2em;padding-right:2em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container .tinymce-mobile-slider-gradient-container{align-items:center;display:flex;flex-grow:1;height:100%}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container .tinymce-mobile-slider-gradient-container .tinymce-mobile-slider-gradient{background:linear-gradient(to right,red 0,#feff00 17%,#0f0 33%,#00feff 50%,#00f 67%,#ff00fe 83%,red 100%);display:flex;flex:1;height:.2em;margin-bottom:.3em;margin-top:.3em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container .tinymce-mobile-hue-slider-black{background:#000;height:.2em;margin-bottom:.3em;margin-top:.3em;width:1.2em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container .tinymce-mobile-hue-slider-white{background:#fff;height:.2em;margin-bottom:.3em;margin-top:.3em;width:1.2em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider .tinymce-mobile-slider-thumb{align-items:center;background-clip:padding-box;background-color:#455a64;border:.5em solid rgba(136,136,136,0);border-radius:3em;bottom:0;color:#fff;display:flex;height:.5em;justify-content:center;left:-10px;margin:auto;position:absolute;top:0;transition:border 120ms cubic-bezier(.39,.58,.57,1);width:.5em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider .tinymce-mobile-slider-thumb.tinymce-mobile-thumb-active{border:.5em solid rgba(136,136,136,.39)}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serializer-wrapper,.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group>div{align-items:center;display:flex;height:100%;flex:1}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serializer-wrapper{flex-direction:column;justify-content:center}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item{align-items:center;display:flex}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item:not(.tinymce-mobile-serialised-dialog){height:100%}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-dot-container{display:flex}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group input{background:#fff;border:none;border-radius:0;color:#455a64;flex-grow:1;font-size:.85em;padding-bottom:.1em;padding-left:5px;padding-top:.1em}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group input::-webkit-input-placeholder{color:#888}.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group input::placeholder{color:#888}.tinymce-mobile-dropup{background:#fff;display:flex;overflow:hidden;width:100%}.tinymce-mobile-dropup.tinymce-mobile-dropup-shrinking{transition:height .3s ease-out}.tinymce-mobile-dropup.tinymce-mobile-dropup-growing{transition:height .3s ease-in}.tinymce-mobile-dropup.tinymce-mobile-dropup-closed{flex-grow:0}.tinymce-mobile-dropup.tinymce-mobile-dropup-open:not(.tinymce-mobile-dropup-growing){flex-grow:1}.tinymce-mobile-ios-container .tinymce-mobile-dropup:not(.tinymce-mobile-dropup-closed){min-height:200px}@media only screen and (orientation:landscape){.tinymce-mobile-dropup:not(.tinymce-mobile-dropup-closed){min-height:200px}}@media only screen and (min-device-width :320px) and (max-device-width :568px) and (orientation :landscape){.tinymce-mobile-ios-container .tinymce-mobile-dropup:not(.tinymce-mobile-dropup-closed){min-height:150px}}.tinymce-mobile-styles-menu{font-family:sans-serif;outline:4px solid #000;overflow:hidden;position:relative;width:100%}.tinymce-mobile-styles-menu [role=menu]{display:flex;flex-direction:column;height:100%;position:absolute;width:100%}.tinymce-mobile-styles-menu [role=menu].transitioning{transition:transform .5s ease-in-out}.tinymce-mobile-styles-menu .tinymce-mobile-styles-item{border-bottom:1px solid #ddd;color:#455a64;cursor:pointer;display:flex;padding:1em 1em;position:relative}.tinymce-mobile-styles-menu .tinymce-mobile-styles-collapser .tinymce-mobile-styles-collapse-icon::before{color:#455a64;content:"\e314";font-family:tinymce-mobile,sans-serif}.tinymce-mobile-styles-menu .tinymce-mobile-styles-item.tinymce-mobile-styles-item-is-menu::after{color:#455a64;content:"\e315";font-family:tinymce-mobile,sans-serif;padding-left:1em;padding-right:1em;position:absolute;right:0}.tinymce-mobile-styles-menu .tinymce-mobile-styles-item.tinymce-mobile-format-matches::after{font-family:tinymce-mobile,sans-serif;padding-left:1em;padding-right:1em;position:absolute;right:0}.tinymce-mobile-styles-menu .tinymce-mobile-styles-collapser,.tinymce-mobile-styles-menu .tinymce-mobile-styles-separator{align-items:center;background:#fff;border-top:#455a64;color:#455a64;display:flex;min-height:2.5em;padding-left:1em;padding-right:1em}.tinymce-mobile-styles-menu [data-transitioning-destination=before][data-transitioning-state],.tinymce-mobile-styles-menu [data-transitioning-state=before]{transform:translate(-100%)}.tinymce-mobile-styles-menu [data-transitioning-destination=current][data-transitioning-state],.tinymce-mobile-styles-menu [data-transitioning-state=current]{transform:translate(0)}.tinymce-mobile-styles-menu [data-transitioning-destination=after][data-transitioning-state],.tinymce-mobile-styles-menu [data-transitioning-state=after]{transform:translate(100%)}@font-face{font-family:tinymce-mobile;font-style:normal;font-weight:400;src:url(fonts/tinymce-mobile.woff?8x92w3) format('woff')}@media (min-device-width:700px){.tinymce-mobile-outer-container,.tinymce-mobile-outer-container input{font-size:25px}}@media (max-device-width:700px){.tinymce-mobile-outer-container,.tinymce-mobile-outer-container input{font-size:18px}}.tinymce-mobile-icon{font-family:tinymce-mobile,sans-serif}.mixin-flex-and-centre{align-items:center;display:flex;justify-content:center}.mixin-flex-bar{align-items:center;display:flex;height:100%}.tinymce-mobile-outer-container .tinymce-mobile-editor-socket iframe{background-color:#fff;width:100%}.tinymce-mobile-editor-socket .tinymce-mobile-mask-edit-icon{background-color:#207ab7;border-radius:50%;bottom:1em;color:#fff;font-size:1em;height:2.1em;position:fixed;right:2em;width:2.1em;align-items:center;display:flex;justify-content:center}@media only screen and (min-device-width:700px){.tinymce-mobile-editor-socket .tinymce-mobile-mask-edit-icon{font-size:1.2em}}.tinymce-mobile-outer-container:not(.tinymce-mobile-fullscreen-maximized) .tinymce-mobile-editor-socket{height:300px;overflow:hidden}.tinymce-mobile-outer-container:not(.tinymce-mobile-fullscreen-maximized) .tinymce-mobile-editor-socket iframe{height:100%}.tinymce-mobile-outer-container:not(.tinymce-mobile-fullscreen-maximized) .tinymce-mobile-toolstrip{display:none}input[type=file]::-webkit-file-upload-button{display:none}@media only screen and (min-device-width :320px) and (max-device-width :568px) and (orientation :landscape){.tinymce-mobile-ios-container .tinymce-mobile-editor-socket .tinymce-mobile-mask-edit-icon{bottom:50%}}

data/mod/tinymce_editor/set/all/reference_editor/nest_editor/nest_parser.rb

@@ -14,8 +14,10 @@ class NestParser
   end
 
   def self.new_image name
-    OpenStruct.new(name: name, field?: true, options: [%i[size medium]], item_options: [],
-                   raw: "{{+#{name}|size: medium}}")
+    OpenStruct.new(name: name, field?: true,
+                   options: [%i[view content], %i[size medium]],
+                   item_options: [],
+                   raw: "{{+#{name}|view: content; size: medium}}")
   end
 
   def field?

data/mod/tinymce_editor/set/all/reference_editor/nest_image.rb

@@ -64,7 +64,7 @@ format :js do
             end
     <<-JAVASCRIPT.strip_heredoc
       tm = tinymce.get(#{tm_id});
-      nest.insertNest(tm, "{{+#{card.name.tag}|size: medium}}");
+      nest.insertNest(tm, "{{+#{card.name.tag}|view: content; size: medium}}");
     JAVASCRIPT
   end
 end

data/mod/virtual/lib/card/virtual.rb

@@ -65,7 +65,7 @@ class Card
 
       def left_id card
         if card.junction?
-          card.left_id || ((l = card.left) && l.id)
+          card.left_id&.positive? ? card.left_id : card.left&.id
         else
           card.id
         end
@@ -73,9 +73,9 @@ class Card
 
       def right_id card
         if card.junction?
-          card.right_id || ((r = card.right) && r.id)
+          card.right_id&.positive? ? card.right_id : card.right&.id
         else
-          -1
+          -2
         end
       end
 

data/tmpsets/set/mod001-utility/abstract/bs_badge.rb

@@ -0,0 +1,31 @@
+# -*- encoding : utf-8 -*-
+class Card; module Set; class Abstract
+# Set: Abstract (BsBadge)
+#
+module BsBadge;
+extend Card::Set
+def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/utility/set/abstract/bs_badge.rb"; end
+module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
+  def labeled_badge count, label, opts={}
+    haml :labeled_badge, badge_haml_opts(count, label, opts)
+  end
+
+  def tab_badge count, label, opts={}
+    haml :tab_badge, badge_haml_opts(count, label, opts)
+  end
+
+  def badge_haml_opts count, label, opts
+    process_badge_opts count, opts
+    { count: count, label: label, klass: opts[:klass], color: opts[:color],
+      title: opts[:title] }
+  end
+
+  def process_badge_opts count, opts
+    if count.try(:zero?) && !opts[:zero_ok]
+      opts[:klass] = [opts[:klass], "disabled-o"].compact.join " "
+    end
+    opts[:color] ||= "secondary"
+  end
+end
+end;end;end;end;
+# ~~ generated from /Users/ethan/dev/decko/gem/card/mod/utility/set/abstract/bs_badge.rb ~~

data/tmpsets/set/mod001-utility/abstract/filterable.rb

@@ -0,0 +1,22 @@
+# -*- encoding : utf-8 -*-
+class Card; module Set; class Abstract
+# Set: Abstract (Filterable)
+#
+module Filterable;
+extend Card::Set
+def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/utility/set/abstract/filterable.rb"; end
+module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
+  def filterable filter_hash={}, html_opts={}
+    add_class html_opts, "_filterable _noFilterUrlUpdates"
+    html_opts[:data] ||= {}
+    html_opts[:data][:filter] = filter_hash
+    wrap_with :div, yield, html_opts
+  end
+
+  def filtering selector=nil
+    selector ||= "._filter-widget:visible"
+    wrap_with :div, yield, class: "_filtering", "data-filter-selector": selector
+  end
+end
+end;end;end;end;
+# ~~ generated from /Users/ethan/dev/decko/gem/card/mod/utility/set/abstract/filterable.rb ~~

data/tmpsets/set/mod001-utility/abstract/filterable_bar.rb

@@ -0,0 +1,20 @@
+# -*- encoding : utf-8 -*-
+class Card; module Set; class Abstract
+# Set: Abstract (FilterableBar)
+#
+module FilterableBar;
+extend Card::Set
+def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/utility/set/abstract/filterable_bar.rb"; end
+include_set Abstract::Filterable
+
+before :bar do
+  class_up "bar-body", "_filterable"
+  super()
+end
+
+before :expanded_bar do
+  class_up "bar", "_filterable"
+  super()
+end
+end;end;end;end;
+# ~~ generated from /Users/ethan/dev/decko/gem/card/mod/utility/set/abstract/filterable_bar.rb ~~