card 1.93.9 → 1.93.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d97e9a8bdbc62bb6e83b73233ab7d8758434d512
-  data.tar.gz: c738c8845121d50e29923d8780cfeb60edbec69c
+  metadata.gz: 43bd41e752cf0643c750a9a20d097d074a770a94
+  data.tar.gz: 627c47e59e6b3f14bb99ca7f4a018d20e7d95aee
 SHA512:
-  metadata.gz: a554da67a3c9fc600c12eb27aaf66eb0d78b16286da7e92879ebb7d6a34e081f17ebb574794f6e323f8799f602a184e1dfbf6f55ac2fec8e1a3fc9cba9e63f18
-  data.tar.gz: cc29b872412d2619c33661f03b167b8626af7e8889158a182903242755ca39df80c416dc05fa1861181552d35878cf17c44b4bc3499e2958f42432e3d81ee516
+  metadata.gz: 9764725368834acc3ab2704d6cd8325de299c47583381815ce07ca6c464900aaf1b0ec562109f6940b73f4bb945c70d63ac4b1d17a395239b545153d24b46429
+  data.tar.gz: 6397847006fcad2d800e5a1ffdd829ce4b2e86ab317abe145f91a91f0c9698fdeecf9d7295d35110d3b0f14b9e1e8bb0a06027160726e4d306c14ab59880d187

data/VERSION

@@ -1 +1 @@
-0.3.9
+0.3.10

data/mod/ace_editor/lib/javascript/script_ace_config.js.coffee

@@ -43,7 +43,7 @@ $.extend decko,
     ).insertBefore(textarea)
     textarea.css "visibility", "hidden"
     textarea.css "height", "0px"
-    ace.config.set('basePath','/assets/ace')
+    ace.config.set('basePath', decko.path('assets/ace'))
     editor = ace.edit(editDiv[0])
     editor.getSession().setValue textarea.val()
     decko.configAceEditor(editor, mode)

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

@@ -1,4 +1,10 @@
 $.extend decko,
+  # returns full path, including relative root
+  # leading slash on relative path is optional
+  path: (relative_path) ->
+    slash = (if relative_path.match /^\// then '' else '/')
+    decko.rootPath + slash + relative_path
+
   initializeEditors: (range, map) ->
     map = decko.editorInitFunctionMap unless map?
     $.each map, (selector, fn) ->
@@ -6,9 +12,7 @@ $.extend decko,
         fn.call $(this)
 
   pingName: (name, success)->
-    $.getJSON decko.rootPath + '/',
-              format: 'json', view: 'status', 'card[name]': name,
-              success
+    $.getJSON decko.path(''), format: 'json', view: 'status', 'card[name]': name, success
 
   isTouchDevice: ->
     if 'ontouchstart' of window or window.DocumentTouch and
@@ -55,8 +59,8 @@ jQuery.fn.extend {
       id = slot.data 'cardId'
       reportee = ''
 
-    # #might be better to put this href base in the html
-    submit_url  = decko.rootPath + '/update/~' + id
+    # might be better to put this href base in the html
+    submit_url = decko.path 'update/~' + id
     form_data = $('#edit_card_'+id).serializeArray().reduce( ((obj, item) ->
       obj[item.name] = item.value
       return obj
@@ -133,7 +137,7 @@ $(window).ready ->
       return false unless s.data('cardId')
       # fail if slot has not card id
       s.addClass 'slotter'
-      s.attr 'href', decko.rootPath + '/card/edit/~' + s.data('cardId')
+      s.attr 'href', decko.path('card/edit/~' + s.data('cardId'))
       $.rails.handleRemote(s)
       false # don't propagate up to next slot
 
@@ -181,7 +185,7 @@ $(window).ready ->
             'in virtual'
           else
             'already in'
-          msg.html '"<a href="' + decko.rootPath + '/' + data['url_key'] + '">' +
+          msg.html '"<a href="' + decko.path(data['url_key']) + '">' +
                    name + '</a>" ' + qualifier + ' use'
         else
           msg.html ''

data/mod/machines/lib/javascript/decko_filter.js.coffee

@@ -47,14 +47,14 @@ $(window).ready ->
     $(this).closest('li').remove()
 
 newFilteredListContent = (el) ->
-  decko.pointerContent prefilteredNames(el).concat(selectedNames el)
+  $.map(prefilteredIds(el).concat(selectedIds el), (id) -> "~" + id).join "\n"
 
 addSelectedButtonUrl = (btn, content) ->
   view = btn.slot().data("slot")["view"]
   card_args = { content: content, type: "Pointer" }
   query = { assign: true, view: view, card: card_args }
-  url_base = decko.rootPath + btn.attr("href") + "&" + $.param(query)
-  decko.prepUrl url_base, btn.slot()
+  path_base = btn.attr("href") + "&" + $.param(query)
+  decko.slotPath path_base, btn.slot()
 
 updateAfterSelection = (el) ->
   trackSelectedIds el

data/mod/machines/lib/javascript/decko_mod.js.coffee

@@ -87,7 +87,7 @@ $(window).ready ->
     if $(event.target).attr('id') != 'modal-main-slot'
       slot = $( event.target ).slot()
       menu_slot = slot.find '.menu-slot:first'
-      url  = decko.rootPath + '/~' + slot.data('card-id')
+      url = decko.path('~' + slot.data('card-id'))
       params = { view: 'menu' }
       params['is_main'] = true if slot.isMain()
       modal_content.empty()
@@ -145,7 +145,7 @@ $(window).ready ->
   $('body').on 'change', '.go-to-selected select', ->
     val = $(this).val()
     if val != ''
-      window.location = decko.rootPath + escape( val )
+      window.location = decko.path(escape(val))
 
   # performance log mod
   $('body').on 'click', '.open-slow-items', ->

data/mod/machines/lib/javascript/decko_navbox.js.coffee

@@ -17,7 +17,7 @@ navbox_results = (request, response) ->
   formData = f.serialize() + '&view=complete'
 
   this.xhr = $.ajax {
-    url: decko.prepUrl decko.rootPath + '/:search.json'
+    url: decko.path ':search.json'
     data: formData
     dataType: "json"
     wagReq: ++reqIndex
@@ -67,6 +67,6 @@ navbox_select = (event, ui) ->
   if ui.item.term
     $(this).closest('form').submit()
   else
-    window.location = decko.rootPath + ui.item.href
+    window.location = decko.path(ui.item.href)
 
   $(this).attr('disabled', 'disabled')

data/mod/machines/lib/javascript/decko_slot.js.coffee

@@ -1,5 +1,6 @@
 $.extend decko,
-  prepUrl: (url, slot)->
+  # returns full path with slot parameters
+  slotPath: (path, slot)->
     xtra = {}
     main = $('#main').children('.card-slot').data 'cardName'
     xtra['main'] = main if main?
@@ -8,7 +9,7 @@ $.extend decko,
       slotdata = slot.data 'slot'
       decko.slotParams slotdata, xtra, 'slot' if slotdata?
 
-    url + ( (if url.match /\?/ then '&' else '?') + $.param(xtra) )
+    decko.path(path) + ( (if path.match /\?/ then '&' else '?') + $.param(xtra) )
 
   slotParams: (raw, processed, prefix)->
     $.each raw, (key, value)->
@@ -55,9 +56,8 @@ jQuery.fn.extend {
     $slot = $(this)
     $slot = $slot.slot() unless $slot.isSlot
     unless url?
-      url = decko.rootPath + '/~' + $slot.data('cardId') + "?view=" +
-        $slot.data("slot")["view"]
-      url = decko.prepUrl url, $slot
+      path = '~' + $slot.data('cardId') + "?view=" + $slot.data("slot")["view"]
+      url = decko.slotPath path, $slot
     $slot.addClass 'slotter'
     $slot.attr 'href', url
     $.rails.handleRemote($slot)

data/mod/machines/lib/javascript/decko_slotter.js.coffee

@@ -33,7 +33,7 @@ $(window).ready ->
 
     # avoiding duplication. could be better test?
     unless opt.url.match /home_view/
-      opt.url = decko.prepUrl opt.url, $(this).slot()
+      opt.url = decko.slotPath opt.url, $(this).slot()
 
     if $(this).is('form')
       if decko.recaptchaKey and $(this).attr('recaptcha')=='on' and

data/mod/pointer/lib/javascript/script_pointer_config.js.coffee

@@ -35,8 +35,8 @@ $.extend decko,
   initAutoCardPlete: (input) ->
     optionsCard = input.data 'options-card'
     return unless !!optionsCard
-    url = decko.rootPath + '/' + optionsCard + '.json?view=name_complete'
-    input.autocomplete { source: decko.prepUrl(url) }
+    path = optionsCard + '.json?view=name_complete'
+    input.autocomplete { source: decko.slotPath(path) }
 
   pointerContent: (vals) ->
     list = $.map $.makeArray(vals), (v) -> if v then '[[' + v + ']]'

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

@@ -7,8 +7,8 @@ format :html do
     method_wrap :wrap_with, slot, slot_attr, &block
   end
 
-  def haml_wrap slot=true, &block
-    method_wrap :haml_tag, slot, &block
+  def haml_wrap slot=true, slot_attr={}, &block
+    method_wrap :haml_tag, slot, slot_attr, &block
   end
 
   def method_wrap method, slot, slot_attr, &block

data/mod/tinymce_editor/lib/javascript/script_tinymce_config.js.coffee

@@ -33,7 +33,7 @@ $.extend decko,
       entity_encoding: 'raw'
     }
     $.extend conf, user_conf, hard_conf
-    tinyMCE.baseURL = '/assets/tinymce'
+    tinyMCE.baseURL = decko.path('assets/tinymce')
     tinyMCE.suffix = '.min'
     tinyMCE.remove("##{el_id}")
     tinyMCE.init conf

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.93.9
+  version: 1.93.10
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-14 00:00:00.000000000 Z
+date: 2018-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cardname
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.9
+        version: 0.3.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.9
+        version: 0.3.10
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement