card-mod-script 0.13.2 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 740c8b43709f696ea82eb875a37d92dc4c29aaf193c35dd084472817574dcb24
-  data.tar.gz: cddc64356e56ede909a08cd2a6988e3f0b0f63c7e727de9bf123e2bedc5b1a25
+  metadata.gz: 7b8ffb63a43e4b60b749ea28e9494fa61727018ba01e3beb5a979bc525963c3e
+  data.tar.gz: 674f5afebe7b06a850b9a32f63c1ef5ff135b48febfc3ec3eb630d417b457b44
 SHA512:
-  metadata.gz: 0b12a2aed352d954774cb731bf79ce89ae345962343762682246abd605a253d5e8556291c49790189a7975cd558e56626007ee7b2f6117191759e94d366fb436
-  data.tar.gz: 26181f4a51408bec334a90b4b782d68680903cb3ba68a81191d634411063747b82ab5788b4cb56980c24e5e080bbc1614223e7a7d305e8478c9ff6b24e9473bd
+  metadata.gz: c99cb1d7f7087e345f8553f2b0825e467c532bd9dd172e173b069956ce0734f595d24478f9d98b0ed465082b988d93b6624a7e61ee17b23e190074632515bf60
+  data.tar.gz: 5ca294c81721eff117a5a65d7e51d4f6cb3aac63410b94b250c54979c2a919fafcfe1a636198e8ba91c971f49e4f1e1ce6e58736afec3ed36a4b8723ccdeb66b

data/assets/script/decko/components.js.coffee

@@ -42,5 +42,8 @@ $(window).ready ->
     $(event.target).closest('form').submit()
     false
 
+  $("body").on "click", "._popover_link", (event) ->
+    event.preventDefault();
+
 
 

data/assets/script/decko/decko.js.coffee

@@ -45,16 +45,6 @@ $(window).ready ->
   $('body').on 'click', 'button.redirecter', ->
     window.location = $(this).attr('href')
 
-  $('body').on  "change", '.live-type-field', ->
-    $this = $(this)
-
-    setSlotMode($this)
-    $this.data 'params', $(this).closest('form').serialize()
-    $this.data 'url', $(this).attr 'href'
-
-  $('body').on 'change', '.edit-type-field', ->
-    $(this).closest('form').submit()
-
   $('body').on 'mouseenter', '[hover_content]', ->
     $(this).attr 'hover_restore', $(this).html()
     $(this).html $(this).attr( 'hover_content' )
@@ -83,11 +73,6 @@ decko.slotReady (slot) ->
 #     #ajaxEnabled: false
 #   }
 
-setSlotMode = ($el, mode=null) ->
-  $slotter =  $el.closest(".slotter")
-  if $slotter.length && $slotter.attr('data-slotter-mode')
-    $slotter.attr 'data-original-slotter-mode', $slotter.attr('slotter-mode')
-    $slotter.attr 'data-slotter-mode', mode
 
 
 warn = (stuff) -> console.log stuff if console?

data/assets/script/decko/editor.js.coffee

@@ -28,8 +28,10 @@ jQuery.fn.extend
   setContentFields: (selector, fn) ->
     $.each @find(selector), ->
       $(this).setContentField(fn)
+  contentField: ->
+    @closest('.card-editor').find '.d0-card-content'
   setContentField: (fn) ->
-    field = @closest('.card-editor').find('.d0-card-content')
+    field = @contentField()
     init_val = field.val() # tinymce-jquery overrides val();
     # that's why we're not using it.
     new_val = fn.call this

data/assets/script/decko/filter.js.coffee

@@ -9,11 +9,19 @@ decko.filter = (el) ->
     else
       $(el).closest("._filtered-content").find "._filter-widget"
 
+
+  # the filter form includes the below
+  @form = @widget.find "._filter-form"
+
+  # one-click filter links
+  @quickFilter = @widget.find "._quick-filter"
+
+  # include filters field, more-fields dropdown, and reset button
   @activeContainer = @widget.find "._filter-container"
+
+  # the "More Filters" Dropdown
   @dropdown = @widget.find "._add-filter-dropdown"
   @dropdownItems = @widget.find "._filter-category-select"
-  @form = @widget.find "._filter-form"
-  @quickFilter = @widget.find "._quick-filter"
 
   @showWithStatus = (status) ->
     f = this
@@ -23,11 +31,10 @@ decko.filter = (el) ->
         f.activate item.data("category")
 
   @reset = () ->
-    # @clear()
-    @dropdownItems.show()
     @restrict @form.find("._reset-filter").data("reset")
 
   @clear = () ->
+    @dropdownItems.show()
     @activeContainer.find(".input-group").remove()
 
   @activate = (category, value) ->
@@ -59,7 +66,7 @@ decko.filter = (el) ->
     field.find("input, select").first().focus()
 
   @fieldValue = (field, value) ->
-    if typeof(value) == "object"
+    if typeof(value) == "object" && !Array.isArray(value)
       @compoundFieldValue field, value
     else
       @simpleFieldValue field, value
@@ -83,11 +90,10 @@ decko.filter = (el) ->
     # only has effect if there is a data-options-card value
 
   @initSelectField = (field) ->
-    field.find("select").select2(
+    field.find("select").select2
       containerCssClass: ":all:"
       width: "auto"
       dropdownAutoWidth: "true"
-    )
 
   @activeField = (category) ->
     @activeContainer.find("._filter-input-#{category}")
@@ -95,6 +101,7 @@ decko.filter = (el) ->
   @isActive = (category) ->
     @activeField(category).length
 
+  # clear filter and use restrictions in data
   @restrict = (data) ->
     @clear()
     for key of data

data/assets/script/decko/filter_links.js.coffee

@@ -61,8 +61,8 @@ $(window).ready ->
     f = targetFilter this
     if f.widget.length
       f.restrict filterableData(this)
-    e.preventDefault()
-    e.stopPropagation()
+      e.preventDefault()
+      e.stopPropagation()
 
   $('body').on 'click', '._filter-link', (e) ->
     f = filterFor this

data/assets/script/decko/mod.js.coffee

@@ -17,10 +17,10 @@ window.decko ||= {} #needed to run w/o *head.  eg. jasmine
 #  initfunc()
 
 $(window).ready ->
-  $('body').on 'click', '._stop_propagation', (event)->
+  $(document).on 'click', '._stop_propagation', (event)->
     event.stopPropagation()
 
-  $('body').on 'click', '._prevent_default', (event)->
+  $(document).on 'click', '._prevent_default', (event)->
     event.preventDefault()
 
   $('body').on 'mouseenter', 'a[data-hover-text]', ->
@@ -77,9 +77,3 @@ $.extend decko,
   toggleShade: (shadeSlot) ->
     shadeSlot.find('.shade-content').slideToggle 1000
     shadeSlot.find('.glyphicon').toggleClass 'glyphicon-triangle-right glpyphicon-triangle-bottom'
-
-
-
-
-
-

data/assets/script/decko/name_editor.js.coffee

@@ -1,17 +1,6 @@
 checkNameAfterTyping = null
 
 $(window).ready ->
-  $('body').on 'click', '._renamer-updater', ->
-    $(this).closest('form').find('#card_update_referers').val 'true'
-
-  $('body').on 'submit', '._rename-form', ->
-    f = $(this)
-    confirm = f.find '.alert'
-    if confirm.is ':hidden'
-      referenceConfirm f
-      confirm.show 'blind'
-      false
-
   $('body').on 'keyup', '.name-editor input', (event) ->
     clearTimeout(checkNameAfterTyping) if checkNameAfterTyping
     input = $(this)
@@ -24,13 +13,6 @@ $(window).ready ->
           checkNameAfterTyping = null
         , 400
 
-referenceConfirm = (form)->
-  confirm = form.find '._rename-reference-confirm'
-  return unless confirm.data('referer-count') > 0
-  confirm.show()
-  btn = form.find '._renamer-updater'
-  btn.show()
-  btn.focus()
 
 checkName = (box) ->
   name = box.val()

data/assets/script/decko/overlay.js.coffee

@@ -13,9 +13,6 @@ jQuery.fn.extend
         $("._overlay-origin").removeClass("_overlay-origin")
         @replaceOverlay(overlay)
     else
-      #@find(".tinymce-textarea").each ->
-      #  tinymce.remove("##{$(this).attr("id")}")
-      #  #tinyMCE.execCommand('mceRemoveControl', false, $(this).attr("id"))
       if @parent().hasClass("_overlay-container-placeholder")
         @parent().addClass("overlay-container")
       else

data/assets/script/{script_pointer_config.js.coffee → decko/pointer_config.js.coffee}

@@ -45,8 +45,7 @@ $.extend decko,
     input.autocomplete { source: decko.slotPath(path) }
 
   pointerContent: (vals) ->
-    list = $.map $.makeArray(vals), (v) -> if v then '[[' + v + ']]'
-    $.makeArray(list).join "\n"
+    $.makeArray(vals).join "\n"
 
   linkListContent: (input_groups) ->
     vals = input_groups.map( ->

data/assets/script/decko/slot.js.coffee

@@ -88,7 +88,7 @@ jQuery.fn.extend
   isMainOrMainModal: ->
     el = $(this)
     el = el.findOriginSlot("modal") if el.closest(".modal")[0]
-    el.isMain()
+    el && el.isMain()
 
   findSlot: (selector) ->
     if selector == "modal-origin"
@@ -148,8 +148,8 @@ jQuery.fn.extend
   slotMark: ->
     if @data('cardId') then "~#{@data('cardId')}" else @data("cardName")
 
-  setSlotContent: (val, mode, $slotter) ->
-    v = $(val)[0] && $(val) || val
+  setSlotContent: (newContent, mode, $slotter) ->
+    v = $(newContent)[0] && $(newContent) || newContent
 
     if typeof(v) == "string"
       # Needed to support "TEXT: result" pattern in success (eg deleting nested cards)

data/assets/script/decko/slot_ready.js.coffee

@@ -9,3 +9,4 @@ decko.slotReady (slot) ->
     )
 
 
+

data/assets/script/decko/slotter.js.coffee

@@ -63,7 +63,7 @@
 #
 #
 $(window).ready ->
-  $('body').on 'ajax:success', '.slotter', (event, data, c, d) ->
+  $('body').on 'ajax:success', '.slotter', (event, data) ->
     $(this).slotterSuccess event, data
 
   $('body').on 'ajax:error', '.slotter', (event, xhr) ->
@@ -114,27 +114,15 @@ jQuery.fn.extend
         form.append input
       input.val value
 
-  slotterSuccess: (event, data) ->
+  slotterSuccess: (event, responseData) ->
+    debugger
     unless @hasClass("slotter")
       console.log "warning: slotterSuccess called on non-slotter element #{this}"
       return
 
     return if event.slotSuccessful
 
-    if @data("reload")
-      window.location.reload(true)
-
-    if @data("update-modal-origin")
-      @updateModalOrigin()
-
-    if @data("update-origin")
-      @updateOrigin()
-
-    if @data('original-slotter-mode')
-      @attr 'data-slotter-mode', @data('original-slotter-mode')
-
-    mode = @data("slotter-mode")
-    @showSuccessResponse data, mode
+    @showSuccessResponse responseData, @data("slotter-mode")
 
     if @hasClass "_close-overlay"
       @removeOverlay()
@@ -150,21 +138,24 @@ jQuery.fn.extend
       reload_url = @data("update-foreign-slot-url")
       $slot.reloadSlot reload_url
 
+    if @data('original-slotter-mode')
+      @attr 'data-slotter-mode', @data('original-slotter-mode')
+    if @data('original-slot-selector')
+      @attr 'data-slot-selector', @data('original-slot-selector')
+
     event.slotSuccessful = true
 
-  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
-      window.location = data.redirect
-    else if data.reload
+  showSuccessResponse: (responseData, mode) ->
+    if responseData.redirect
+      window.location = responseData.redirect
+    else if responseData.reload
       window.location.reload(true)
     else
-      @updateSlot data, mode
+      switch mode
+        when "silent-success" then return
+        when "update-modal-origin" then @updateModalOrigin()
+        when "update-origin" then @updateOrigin()
+        else @updateSlot responseData, mode
 
   showErrorResponse: (status, result) ->
     if status == 403 #permission denied
@@ -200,12 +191,13 @@ jQuery.fn.extend
 
   registerAsOrigin: (type, slot) ->
     if slot.hasClass("_modal-slot")
-      slot = slot.find(".modal-body .card-slot")
+      slot = slot.find(".modal-body")  # put the origin slot id on the modal-body instead
+                                        # of on the slot, so that it survives slot reloads
     slot.attr("data-#{type}-origin-slot-id", @closest(".card-slot").data("slot-id"))
 
-  updateSlot: (data, mode) ->
+  updateSlot: (newContent, mode) ->
     mode ||= "replace"
-    @setSlotContent data, mode, $(this)
+    @setSlotContent newContent, mode, $(this)
 
   # close modal or overlay
   closeOnSuccess: (type) ->
@@ -236,7 +228,7 @@ jQuery.fn.extend
       )
       return false
 
-    widget = input.data 'blueimpFileupload' #jQuery UI widget
+    widget = input.data 'wblueimpFileupload' #jQuery UI widget
 
     # browsers that can't do ajax uploads use iframe
     unless widget._isXHRUpload(widget.options)

data/assets/script/decko/type_editor.js.coffee

@@ -0,0 +1,21 @@
+$(window).ready ->
+  $('body').on  "change", '._live-type-field', ->
+    $this = $(this)
+
+    setSlotMode($this)
+    debugger
+    $this.data 'params', $this.closest('form').serialize()
+    $this.data 'url', $this.attr 'href'
+
+  $('body').on 'change', '.edit-type-field', ->
+    $(this).closest('form').submit()
+
+setSlotMode = ($el, mode=null) ->
+  $slotter =  $el.closest(".slotter")
+  if $slotter.length
+    if $slotter.attr('data-slotter-mode')
+      $slotter.attr 'data-original-slotter-mode', $slotter.attr('data-slotter-mode')
+      $slotter.attr 'data-slotter-mode', mode
+    if $slotter.attr('data-slot-selector')
+      $slotter.attr 'data-original-slot-selector', $slotter.attr('data-slot-selector')
+      $slotter.removeAttr 'data-slot-selector'

data/assets/script/decko/upload.js.coffee

@@ -1,10 +1,10 @@
 $.extend decko,
   upload_file: (fileupload) ->
-# for file as a subcard in a form,
-# excess parameters are included in the request which cause errors.
-# only the file, type_id and attachment_card_name are needed
-# attachment_card_name is the original card name,
-# ex: card[subcards][+logo][image], card[file]
+    # for file as a subcard in a form,
+    # excess parameters are included in the request which cause errors.
+    # only the file, type_id and attachment_card_name are needed
+    # attachment_card_name is the original card name,
+    # ex: card[subcards][+logo][image], card[file]
     $(fileupload).on 'fileuploadsubmit', (e,data) ->
       $_this = $(this)
       card_name = $_this.siblings(".attachment_card_name:first").attr("name")
@@ -36,6 +36,7 @@ $.extend decko,
                   'value="preview_editor" name="view">'
     data.submit()
     editor.find('.choose-file').hide()
+    # editor.find(".file-upload").prop "disabled", true
     editor.find('.extra_upload_param').remove()
 
   progressallFile: (e, data) ->
@@ -51,7 +52,13 @@ $(window).ready ->
   $('body').on 'click', '.cancel-upload', ->
     editor = $(this).closest '.card-editor'
     editor.find('.choose-file').show()
+    # editor.find(".file-upload").prop "disabled", false
     editor.find('.chosen-file').empty()
     editor.find('.progress').show()
     editor.find('#progress .progress-bar').css('width', '0%')
     editor.find('#progress').hide()
+
+  $('body').on "submit", "form", ->
+    uploader = $(this).find ".file-upload[type=file]"
+    if uploader[0]
+      uploader.prop "disabled", true