card 1.93.9 → 1.93.10
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.
- checksums.yaml +4 -4
- data/VERSION +1 -1
- data/mod/ace_editor/lib/javascript/script_ace_config.js.coffee +1 -1
- data/mod/machines/lib/javascript/decko.js.coffee +11 -7
- data/mod/machines/lib/javascript/decko_filter.js.coffee +3 -3
- data/mod/machines/lib/javascript/decko_mod.js.coffee +2 -2
- data/mod/machines/lib/javascript/decko_navbox.js.coffee +2 -2
- data/mod/machines/lib/javascript/decko_slot.js.coffee +5 -5
- data/mod/machines/lib/javascript/decko_slotter.js.coffee +1 -1
- data/mod/pointer/lib/javascript/script_pointer_config.js.coffee +2 -2
- data/mod/standard/set/all/rich_html/wrapper.rb +2 -2
- data/mod/tinymce_editor/lib/javascript/script_tinymce_config.js.coffee +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 43bd41e752cf0643c750a9a20d097d074a770a94
|
4
|
+
data.tar.gz: 627c47e59e6b3f14bb99ca7f4a018d20e7d95aee
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 9764725368834acc3ab2704d6cd8325de299c47583381815ce07ca6c464900aaf1b0ec562109f6940b73f4bb945c70d63ac4b1d17a395239b545153d24b46429
|
7
|
+
data.tar.gz: 6397847006fcad2d800e5a1ffdd829ce4b2e86ab317abe145f91a91f0c9698fdeecf9d7295d35110d3b0f14b9e1e8bb0a06027160726e4d306c14ab59880d187
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.3.
|
1
|
+
0.3.10
|
@@ -43,7 +43,7 @@ $.extend decko,
|
|
43
43
|
).insertBefore(textarea)
|
44
44
|
textarea.css "visibility", "hidden"
|
45
45
|
textarea.css "height", "0px"
|
46
|
-
ace.config.set('basePath','
|
46
|
+
ace.config.set('basePath', decko.path('assets/ace'))
|
47
47
|
editor = ace.edit(editDiv[0])
|
48
48
|
editor.getSession().setValue textarea.val()
|
49
49
|
decko.configAceEditor(editor, mode)
|
@@ -1,4 +1,10 @@
|
|
1
1
|
$.extend decko,
|
2
|
+
# returns full path, including relative root
|
3
|
+
# leading slash on relative path is optional
|
4
|
+
path: (relative_path) ->
|
5
|
+
slash = (if relative_path.match /^\// then '' else '/')
|
6
|
+
decko.rootPath + slash + relative_path
|
7
|
+
|
2
8
|
initializeEditors: (range, map) ->
|
3
9
|
map = decko.editorInitFunctionMap unless map?
|
4
10
|
$.each map, (selector, fn) ->
|
@@ -6,9 +12,7 @@ $.extend decko,
|
|
6
12
|
fn.call $(this)
|
7
13
|
|
8
14
|
pingName: (name, success)->
|
9
|
-
$.getJSON decko.
|
10
|
-
format: 'json', view: 'status', 'card[name]': name,
|
11
|
-
success
|
15
|
+
$.getJSON decko.path(''), format: 'json', view: 'status', 'card[name]': name, success
|
12
16
|
|
13
17
|
isTouchDevice: ->
|
14
18
|
if 'ontouchstart' of window or window.DocumentTouch and
|
@@ -55,8 +59,8 @@ jQuery.fn.extend {
|
|
55
59
|
id = slot.data 'cardId'
|
56
60
|
reportee = ''
|
57
61
|
|
58
|
-
#
|
59
|
-
submit_url
|
62
|
+
# might be better to put this href base in the html
|
63
|
+
submit_url = decko.path 'update/~' + id
|
60
64
|
form_data = $('#edit_card_'+id).serializeArray().reduce( ((obj, item) ->
|
61
65
|
obj[item.name] = item.value
|
62
66
|
return obj
|
@@ -133,7 +137,7 @@ $(window).ready ->
|
|
133
137
|
return false unless s.data('cardId')
|
134
138
|
# fail if slot has not card id
|
135
139
|
s.addClass 'slotter'
|
136
|
-
s.attr 'href', decko.
|
140
|
+
s.attr 'href', decko.path('card/edit/~' + s.data('cardId'))
|
137
141
|
$.rails.handleRemote(s)
|
138
142
|
false # don't propagate up to next slot
|
139
143
|
|
@@ -181,7 +185,7 @@ $(window).ready ->
|
|
181
185
|
'in virtual'
|
182
186
|
else
|
183
187
|
'already in'
|
184
|
-
msg.html '"<a href="' + decko.
|
188
|
+
msg.html '"<a href="' + decko.path(data['url_key']) + '">' +
|
185
189
|
name + '</a>" ' + qualifier + ' use'
|
186
190
|
else
|
187
191
|
msg.html ''
|
@@ -47,14 +47,14 @@ $(window).ready ->
|
|
47
47
|
$(this).closest('li').remove()
|
48
48
|
|
49
49
|
newFilteredListContent = (el) ->
|
50
|
-
|
50
|
+
$.map(prefilteredIds(el).concat(selectedIds el), (id) -> "~" + id).join "\n"
|
51
51
|
|
52
52
|
addSelectedButtonUrl = (btn, content) ->
|
53
53
|
view = btn.slot().data("slot")["view"]
|
54
54
|
card_args = { content: content, type: "Pointer" }
|
55
55
|
query = { assign: true, view: view, card: card_args }
|
56
|
-
|
57
|
-
decko.
|
56
|
+
path_base = btn.attr("href") + "&" + $.param(query)
|
57
|
+
decko.slotPath path_base, btn.slot()
|
58
58
|
|
59
59
|
updateAfterSelection = (el) ->
|
60
60
|
trackSelectedIds el
|
@@ -87,7 +87,7 @@ $(window).ready ->
|
|
87
87
|
if $(event.target).attr('id') != 'modal-main-slot'
|
88
88
|
slot = $( event.target ).slot()
|
89
89
|
menu_slot = slot.find '.menu-slot:first'
|
90
|
-
url
|
90
|
+
url = decko.path('~' + slot.data('card-id'))
|
91
91
|
params = { view: 'menu' }
|
92
92
|
params['is_main'] = true if slot.isMain()
|
93
93
|
modal_content.empty()
|
@@ -145,7 +145,7 @@ $(window).ready ->
|
|
145
145
|
$('body').on 'change', '.go-to-selected select', ->
|
146
146
|
val = $(this).val()
|
147
147
|
if val != ''
|
148
|
-
window.location = decko.
|
148
|
+
window.location = decko.path(escape(val))
|
149
149
|
|
150
150
|
# performance log mod
|
151
151
|
$('body').on 'click', '.open-slow-items', ->
|
@@ -17,7 +17,7 @@ navbox_results = (request, response) ->
|
|
17
17
|
formData = f.serialize() + '&view=complete'
|
18
18
|
|
19
19
|
this.xhr = $.ajax {
|
20
|
-
url: decko.
|
20
|
+
url: decko.path ':search.json'
|
21
21
|
data: formData
|
22
22
|
dataType: "json"
|
23
23
|
wagReq: ++reqIndex
|
@@ -67,6 +67,6 @@ navbox_select = (event, ui) ->
|
|
67
67
|
if ui.item.term
|
68
68
|
$(this).closest('form').submit()
|
69
69
|
else
|
70
|
-
window.location = decko.
|
70
|
+
window.location = decko.path(ui.item.href)
|
71
71
|
|
72
72
|
$(this).attr('disabled', 'disabled')
|
@@ -1,5 +1,6 @@
|
|
1
1
|
$.extend decko,
|
2
|
-
|
2
|
+
# returns full path with slot parameters
|
3
|
+
slotPath: (path, slot)->
|
3
4
|
xtra = {}
|
4
5
|
main = $('#main').children('.card-slot').data 'cardName'
|
5
6
|
xtra['main'] = main if main?
|
@@ -8,7 +9,7 @@ $.extend decko,
|
|
8
9
|
slotdata = slot.data 'slot'
|
9
10
|
decko.slotParams slotdata, xtra, 'slot' if slotdata?
|
10
11
|
|
11
|
-
|
12
|
+
decko.path(path) + ( (if path.match /\?/ then '&' else '?') + $.param(xtra) )
|
12
13
|
|
13
14
|
slotParams: (raw, processed, prefix)->
|
14
15
|
$.each raw, (key, value)->
|
@@ -55,9 +56,8 @@ jQuery.fn.extend {
|
|
55
56
|
$slot = $(this)
|
56
57
|
$slot = $slot.slot() unless $slot.isSlot
|
57
58
|
unless url?
|
58
|
-
|
59
|
-
|
60
|
-
url = decko.prepUrl url, $slot
|
59
|
+
path = '~' + $slot.data('cardId') + "?view=" + $slot.data("slot")["view"]
|
60
|
+
url = decko.slotPath path, $slot
|
61
61
|
$slot.addClass 'slotter'
|
62
62
|
$slot.attr 'href', url
|
63
63
|
$.rails.handleRemote($slot)
|
@@ -33,7 +33,7 @@ $(window).ready ->
|
|
33
33
|
|
34
34
|
# avoiding duplication. could be better test?
|
35
35
|
unless opt.url.match /home_view/
|
36
|
-
opt.url = decko.
|
36
|
+
opt.url = decko.slotPath opt.url, $(this).slot()
|
37
37
|
|
38
38
|
if $(this).is('form')
|
39
39
|
if decko.recaptchaKey and $(this).attr('recaptcha')=='on' and
|
@@ -35,8 +35,8 @@ $.extend decko,
|
|
35
35
|
initAutoCardPlete: (input) ->
|
36
36
|
optionsCard = input.data 'options-card'
|
37
37
|
return unless !!optionsCard
|
38
|
-
|
39
|
-
input.autocomplete { source: decko.
|
38
|
+
path = optionsCard + '.json?view=name_complete'
|
39
|
+
input.autocomplete { source: decko.slotPath(path) }
|
40
40
|
|
41
41
|
pointerContent: (vals) ->
|
42
42
|
list = $.map $.makeArray(vals), (v) -> if v then '[[' + v + ']]'
|
@@ -7,8 +7,8 @@ format :html do
|
|
7
7
|
method_wrap :wrap_with, slot, slot_attr, &block
|
8
8
|
end
|
9
9
|
|
10
|
-
def haml_wrap slot=true, &block
|
11
|
-
method_wrap :haml_tag, slot, &block
|
10
|
+
def haml_wrap slot=true, slot_attr={}, &block
|
11
|
+
method_wrap :haml_tag, slot, slot_attr, &block
|
12
12
|
end
|
13
13
|
|
14
14
|
def method_wrap method, slot, slot_attr, &block
|
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
|
+
version: 1.93.10
|
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: 2018-02-
|
14
|
+
date: 2018-02-19 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.
|
22
|
+
version: 0.3.10
|
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.
|
29
|
+
version: 0.3.10
|
30
30
|
- !ruby/object:Gem::Dependency
|
31
31
|
name: haml
|
32
32
|
requirement: !ruby/object:Gem::Requirement
|