card 1.99.1 → 1.99.6

data/mod/machines/lib/javascript/decko/nest_editor_name.js.coffee

@@ -12,12 +12,12 @@ $(document).ready ->
 
     unless event.which == 13
       clearTimeout(nestNameTimeout) if nestNameTimeout
-      nestNameTimeout = setTimeout nest.updateRulesTab, 700
+      nestNameTimeout = setTimeout (-> nest.updateNameRelatedTabs()), 700
 
   $('body').on 'keydown', 'input._nest-name', (event) ->
     if event.which == 13
       clearTimeout(nestNameTimeout) if nestNameTimeout
-      nest.updateRulesTab()
+      nest.updateNameRelatedTabs()
 
 $.extend nest,
   name: () ->
@@ -44,7 +44,10 @@ $.extend nest,
     $(".input-group.show-prefix").removeClass("show-prefix").addClass("hide-prefix")
 
   rulesTabSlot: () ->
-    $("._nest-editor .tab-pane-rule > .card-slot")
+    $("._nest-editor .tab-pane-rules > .card-slot")
+
+  contentTabSlot: () ->
+    $("._nest-editor .tab-pane-content > .card-slot")
 
   emptyNameAlert: (show) ->
     if show
@@ -52,19 +55,39 @@ $.extend nest,
     else
       $("._empty-nest-name-alert:not(.d-none)").addClass("d-none")
 
+  updateNameRelatedTabs: () ->
+    nest.updateRulesTab()
+    nest.updateContentTab()
+
+  updateContentTab: () ->
+    $contentTab = nest.contentTabSlot()
+    if $contentTab.length > 0
+      url = decko.path "#{nest.fullName()}?view=nest_content"
+      nest.updateNameDependentSlot($contentTab, url)
+
   updateRulesTab: () ->
-    name = $("input._nest-name").val()
     $rulesTab = nest.rulesTabSlot()
+    url = decko.path "#{nest.setNameForRules()}?view=nest_rules"
+    nest.updateNameDependentSlot($rulesTab, url)
 
+  updateNameDependentSlot: ($slot, url) ->
+    name = $("input._nest-name").val()
     if name? && name.length > 0
-      url = decko.path "#{nest.setNameForRules()}?view=nest_rules"
       nest.emptyNameAlert(false)
-      $rulesTab.reloadSlot url
+      $slot.reloadSlot url
     else
-      $rulesTab.clearSlot()
+      $slot.clearSlot()
       nest.emptyNameAlert(true)
 
-  #  set in the sense of card set
+  fullName: () ->
+    input = $('input._nest-name')
+    nest_name = input.val()
+    if nest.isField() and input.attr("data-left-name")
+      "#{input.attr("data-left-name")}+#{nest_name}"
+    else
+      nest_name
+
+#  set in the sense of card set
   setNameForRules: () ->
     input = $('input._nest-name')
     nest_name = input.val()

data/mod/machines/lib/javascript/decko/selectable_filtered_content.js.coffee

@@ -0,0 +1,12 @@
+$(window).ready ->
+
+  # TODO: generalize so this works with item views other than bar
+  $("body").on "click", "._selectable-filtered-content .bar-body", (e) ->
+    item = $(this)
+    name = item.slot().data("card-name")
+    container = item.closest("._selectable-filtered-content")
+    input = $(container.data("input-selector"))
+    input.val name
+    item.closest('.modal').modal('hide')
+    e.preventDefault()
+    e.stopPropagation()

data/mod/machines/lib/javascript/decko/slot.js.coffee

@@ -8,10 +8,13 @@ $.extend decko,
     xtra = {}
     main = $('#main').children('.card-slot').data 'cardName'
     xtra['main'] = main if main?
+
     if slot
       xtra['is_main'] = true if slot.isMain()
       slotdata = slot.data 'slot'
-      decko.slotParams slotdata, xtra, 'slot' if slotdata?
+      if slotdata?
+        decko.slotParams slotdata, xtra, 'slot'
+        xtra['type'] = slotdata['type'] if slotdata['type']
     xtra
 
   slotEditView: (slot) ->

data/mod/machines/lib/javascript/decko/slotter.js.coffee

@@ -28,7 +28,7 @@
 #        updated after the request.
 #    update-foreign-slot-url
 #        a url to fetch the new content for the additional slot
-#        if not given the slot is updated with the same card and view that used before
+#        if not given the slot is updated with the same card and view that was used before
 #    update-origin
 #        if present then the slot from where the current modal or overlay slot was opened
 #        will be updated
@@ -45,7 +45,7 @@
 #          update-origin
 #             update closest slot of the slotter that opened the modal or overlay
 #             (assumes that the request was triggered from a modal or overlay)
-#             If you need the update origin together with another mode then use
+#             If you need the update-origin mode together with another mode then use
 #             data-update-origin="true".
 #          silent-success
 #             do nothing
@@ -115,7 +115,10 @@ jQuery.fn.extend
     return if event.slotSuccessful
 
     if @data("reload")
-      window.locacation.reload(true)
+      window.location.reload(true)
+
+    if @data("update-modal-origin")
+      @updateModalOrigin()
 
     if @data("update-origin")
       @updateOrigin()
@@ -145,6 +148,8 @@ jQuery.fn.extend
   showSuccessResponse: (data, mode) ->
     if mode == "silent-success"
       return
+    else if mode == "update-modal-origin"
+      @updateModalOrigin()
     else if mode == "update-origin"
       @updateOrigin()
     else if data.redirect
@@ -167,6 +172,14 @@ jQuery.fn.extend
           @slot().find('.new-current-revision-id').text()
         )
 
+  updateModalOrigin: () ->
+    debugger
+    if @overlaySlot()
+      overlayOrigin = @findOriginSlot("overlay")
+      overlayOrigin.updateOrigin()
+    else if @closest("#modal-container")[0]
+      @updateOrigin()
+
   updateOrigin: () ->
     type = if @overlaySlot()
       "overlay"

data/mod/machines/lib/stylesheets/style_cards.scss

@@ -244,15 +244,15 @@ $d-yellow-1: #ffd;
   display: inline-block;
 }
 .fileinput-button input {
-    position: absolute;
-    top: 0;
-    right: 0;
-    margin: 0;
-    opacity: 0;
-    -ms-filter: 'alpha(opacity=0)';
-    font-size: 200px;
-    direction: ltr;
-    cursor: pointer;
+  position: absolute;
+  top: 0;
+  right: 0;
+  margin: 0;
+  opacity: 0;
+  -ms-filter: 'alpha(opacity=0)';
+  font-size: 200px;
+  direction: ltr;
+  cursor: pointer;
 }
 
 
@@ -481,8 +481,16 @@ textarea {
   cursor: pointer;
 }
 
-.search-checkbox-item .checkbox-side {
-  width: 32px;
+.checkbox-list-item {
+  > .checkbox-side {
+    width: 32px;
+    min-width: 32px;
+  }
+  > .item-view-side {
+    width: 100%;
+    max-width: 100%;
+    overflow: hidden;
+  }
 }
 
 .new-account-link {
@@ -508,7 +516,7 @@ a.unknown-link {
 /*-------------------- */
 
 .pointer-radio-list, .filtered-list-review {
-    list-style-type: none;
+  list-style-type: none;
 }
 
 /*-------------------- */
@@ -996,15 +1004,15 @@ $bridge-line-color: $border-color;
 
 .overlay-container {
   .card-slot.overlay_rule-view {
-      border-left: 5px solid $primary;
+    border-left: 5px solid $primary;
   }
 
   .d0-card-overlay
   > .d0-card-frame
   > .d0-card-content {
-      overflow-y: scroll;
-      height: 100%;
-      padding: 1rem 1.5rem; // px-4
+    overflow-y: scroll;
+    height: 100%;
+    padding: 1rem 1.5rem; // px-4
   }
 }
 
@@ -1029,7 +1037,7 @@ $bridge-line-color: $border-color;
     margin-bottom: -1px;
 
     &:hover, &.active, &:focus {
-       border-left-color: $nav-pills-link-active-bg;
+      border-left-color: $nav-pills-link-active-bg;
     }
   }
 }
@@ -1071,8 +1079,8 @@ $bridge-line-color: $border-color;
 }
 
 .overlay-container {
-    height: 100%;
-    overflow: auto;
+  height: 100%;
+  overflow: auto;
 }
 
 .help-text.rule-instruction > div p:last-child {
@@ -1247,3 +1255,7 @@ body.right-sidebar, body.left-sidebar, body.two-sidebar {
   float: left;
   padding: 0.5rem;
 }
+
+.tm-icon {
+  color: #000;
+}

data/mod/machines/set/abstract/machine/output_update.rb

@@ -1,7 +1,10 @@
 def reset_machine_output
   Auth.as_bot do
-    (moc = machine_output_card) && moc.real? && moc.delete!
+    moc = machine_output_card
+    @updated_at = output_updated_at
+    moc.delete! if moc.real?
     update_input_card
+    expire_if_source_file_changed @updated_at
   end
 end
 
@@ -14,12 +17,13 @@ def update_machine_output
   return unless ok?(:read)
   lock do
     update_input_card
+    expire_if_source_file_changed output_updated_at
     run_machine
   end
 end
 
 def ensure_machine_output
-  output = fetch trait: :machine_output
+  output = fetch :machine_output
   return if output&.selected_content_action_id
   update_machine_output
 end
@@ -40,12 +44,17 @@ def input_cards_with_changed_source output_updated
   end
 end
 
-# regenerates the machine output if a source file of a input card has been changed
-def update_if_source_file_changed
-  return unless (output_updated = output_updated_at)
-  changed = input_cards_with_changed_source(output_updated)
+def expire_if_source_file_changed output_updated_at
+  return unless output_updated_at
+  changed = input_cards_with_changed_source(output_updated_at)
   return if changed.empty?
   changed.each(&:expire_machine_cache)
+  true
+end
+
+# regenerates the machine output if a source file of a input card has been changed
+def update_if_source_file_changed
+  return unless expire_if_source_file_changed output_updated_at
   regenerate_machine_output
 end
 

data/mod/machines/set/self/script_decko.rb

@@ -4,8 +4,9 @@ def source_files
   %w[mod editor name_editor autosave doubleclick layout navbox upload
      slot modal overlay recaptcha slotter bridge
      nest_editor nest_editor_rules nest_editor_options nest_editor_name
+     link_editor
      components decko follow card_menu slot_ready
-     filter filter_links filter_items].map do |n|
+     filter filter_links filter_items selectable_filtered_content].map do |n|
     "decko/#{n}.js.coffee"
   end
 end

data/mod/media/set/abstract/media.rb

@@ -1,6 +1,6 @@
 format :html do
   def image_card
-    @image_card ||= card.fetch(trait: :image, new: {})
+    @image_card ||= card.fetch(:image, new: {})
   end
 
   def text_with_image opts={}

data/mod/media/set/type/image.rb

@@ -33,6 +33,6 @@ format :html do
   end
 
   def image_box_title
-    image_box_card_name
+    voo.title || image_box_card_name
   end
 end

data/mod/navbar/set/abstract/account_dropdown.rb

@@ -8,11 +8,15 @@ format :html do
     split_button link_to_mycard, nil do
       [
         link_to_card([Auth.current, :account_settings], "Account"),
-        (["Roles", role_items(&render_role_item)] unless Auth.no_special_roles?)
+        (["Roles", role_items(&render_role_item)] if special_roles?)
       ]
     end
   end
 
+  def special_roles?
+    Auth.current_roles.size > 1
+  end
+
   def role_items
     Auth.current_roles.map do |role_name|
       yield role_name

data/mod/navbar/set/self/account_links.rb

@@ -67,7 +67,7 @@ format :html do
   end
 
   def enabled_roles_card
-    Auth.current.fetch trait: :enabled_roles, new: { type_id: SessionID }
+    Auth.current.fetch :enabled_roles, new: { type_id: SessionID }
   end
 
   def role_list
@@ -89,7 +89,7 @@ format :html do
   end
 
   def show_signup_link?
-    !Auth.signed_in? && Card.new(type_id: Card::SignupID).ok?(:create)
+    !Auth.signed_in? && Card.new(type_id: SignupID).ok?(:create)
   end
 
   def show_invite_link?

data/mod/pointer/set/abstract/00_paging_params.rb

@@ -26,8 +26,6 @@ format do
   end
 
   def voo_search_param param
-    return unless voo&.wql
-
-    voo.wql[param]
+    voo&.wql&.dig param
   end
 end

data/mod/pointer/set/abstract/02_pointer.rb

@@ -5,5 +5,5 @@ def diff_args
 end
 
 def count
-  all_raw_item_strings.size
+  item_strings.size
 end

data/mod/pointer/set/abstract/02_pointer/events.rb

@@ -22,29 +22,50 @@ end
 # it' still pointer content.  The "when" clause helps with that (but is a hack)
 event :standardize_items, :prepare_to_validate,
       on: :save, changed: :content, when: :still_pointer? do
-  self.content = item_names(context: :raw).map do |name|
-    "[[#{name}]]"
-  end.join "\n"
+  items_to_content item_strings
 end
 
 def still_pointer?
-  type_id == Card::PointerID
+  type_id == PointerID
+  # Card.new(type_id: type_id).is_a? Abstract::Pointer
 end
 
-stage_method :changed_item_names do
+def changed_item_names
   dropped_item_names + added_item_names
 end
 
-stage_method :dropped_item_names do
-  old_items = item_names content: db_content_before_act
+def dropped_item_names
+  return item_names if trash
+  return [] unless (old_content = db_content_before_act)
+
+  old_items = item_names content: old_content
   old_items - item_names
 end
 
-stage_method :added_item_names do
-  old_items = item_names content: db_content_before_act
+def added_item_names
+  return [] if trash
+  return item_names unless (old_content = db_content_before_act)
+
+  old_items = item_names content: old_content
   item_names - old_items
 end
 
-stage_method :changed_item_cards do
-  item_cards content: changed_item_names
+# TODO: refactor. many of the above could be written more elegantly with improved
+# handling of :content in item_names. If content is nil here, we would expect an
+# empty set of cards, but in fact we get items based on self.content.
+
+def changed_item_cards
+  dropped_item_cards + added_item_cards
+end
+
+def dropped_item_cards
+  return [] unless db_content_before_act
+
+  all_item_cards item_names: dropped_item_names
+end
+
+def added_item_cards
+  return item_cards unless db_content_before_act
+
+  all_item_cards item_names: added_item_names
 end

data/mod/pointer/set/abstract/02_pointer/html_views.rb

@@ -98,14 +98,18 @@ format :html do
                        slot_selector: filtered_list_slot_class,
                        item_selector: "_filtered-list-item",
                        slot: { hide: [:modal_footer] },
-                       filter: { not_ids: card.item_ids.map(&:to_s).join(",") } }
+                       filter: { not_ids: not_ids_value } }
+  end
+
+  def not_ids_value
+    card.item_ids.map(&:to_s).join(",")
   end
 
   def add_item_overlay_link; end
 
   def one_line_content
     if count == 1
-      card.item_names.first
+      card.first_name
     else
       short_content
     end