Skip to content

Commit 04b68ed

Browse files
pascalwengerterpascalwengerter
authored
Merge branch 'develop' into dependabot/bundler/nokogiri-1.10.4
2 parents 2a95161 + a32e586 commit 04b68ed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+2397
-1700
lines changed

‎Gemfile.lock

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
matestack-ui-core (0.7.0)
4+
matestack-ui-core (0.7.1)
55
cells-haml
66
cells-rails
77
haml
@@ -13,43 +13,43 @@ PATH
1313
GEM
1414
remote: https://rubygems.org/
1515
specs:
16-
actioncable (5.2.1)
17-
actionpack (= 5.2.1)
16+
actioncable (5.2.3)
17+
actionpack (= 5.2.3)
1818
nio4r (~> 2.0)
1919
websocket-driver (>= 0.6.1)
20-
actionmailer (5.2.1)
21-
actionpack (= 5.2.1)
22-
actionview (= 5.2.1)
23-
activejob (= 5.2.1)
20+
actionmailer (5.2.3)
21+
actionpack (= 5.2.3)
22+
actionview (= 5.2.3)
23+
activejob (= 5.2.3)
2424
mail (~> 2.5, >= 2.5.4)
2525
rails-dom-testing (~> 2.0)
26-
actionpack (5.2.1)
27-
actionview (= 5.2.1)
28-
activesupport (= 5.2.1)
26+
actionpack (5.2.3)
27+
actionview (= 5.2.3)
28+
activesupport (= 5.2.3)
2929
rack (~> 2.0)
3030
rack-test (>= 0.6.3)
3131
rails-dom-testing (~> 2.0)
3232
rails-html-sanitizer (~> 1.0, >= 1.0.2)
33-
actionview (5.2.1)
34-
activesupport (= 5.2.1)
33+
actionview (5.2.3)
34+
activesupport (= 5.2.3)
3535
builder (~> 3.1)
3636
erubi (~> 1.4)
3737
rails-dom-testing (~> 2.0)
3838
rails-html-sanitizer (~> 1.0, >= 1.0.3)
39-
activejob (5.2.1)
40-
activesupport (= 5.2.1)
39+
activejob (5.2.3)
40+
activesupport (= 5.2.3)
4141
globalid (>= 0.3.6)
42-
activemodel (5.2.1)
43-
activesupport (= 5.2.1)
44-
activerecord (5.2.1)
45-
activemodel (= 5.2.1)
46-
activesupport (= 5.2.1)
42+
activemodel (5.2.3)
43+
activesupport (= 5.2.3)
44+
activerecord (5.2.3)
45+
activemodel (= 5.2.3)
46+
activesupport (= 5.2.3)
4747
arel (>= 9.0)
48-
activestorage (5.2.1)
49-
actionpack (= 5.2.1)
50-
activerecord (= 5.2.1)
48+
activestorage (5.2.3)
49+
actionpack (= 5.2.3)
50+
activerecord (= 5.2.3)
5151
marcel (~> 0.3.1)
52-
activesupport (5.2.1)
52+
activesupport (5.2.3)
5353
concurrent-ruby (~> 1.0, >= 1.0.2)
5454
i18n (>= 0.7, < 2)
5555
minitest (~> 5.1)
@@ -81,7 +81,7 @@ GEM
8181
childprocess (0.9.0)
8282
ffi (~> 1.0, >= 1.0.11)
8383
cliver (0.3.2)
84-
concurrent-ruby (1.0.5)
84+
concurrent-ruby (1.1.5)
8585
crack (0.4.3)
8686
safe_yaml (~> 1.0.0)
8787
crass (1.0.4)
@@ -97,7 +97,7 @@ GEM
9797
representable (>= 2.4.0, <= 3.1.0)
9898
uber (< 0.2.0)
9999
docile (1.3.1)
100-
erubi (1.7.1)
100+
erubi (1.8.0)
101101
ffi (1.9.25)
102102
generator_spec (0.9.4)
103103
activesupport (>= 3.0.0)
@@ -108,23 +108,23 @@ GEM
108108
temple (>= 0.8.0)
109109
tilt
110110
hashdiff (0.3.8)
111-
i18n (1.1.0)
111+
i18n (1.6.0)
112112
concurrent-ruby (~> 1.0)
113113
json (2.1.0)
114-
loofah (2.2.2)
114+
loofah (2.2.3)
115115
crass (~> 1.0.2)
116116
nokogiri (>= 1.5.9)
117117
mail (2.7.1)
118118
mini_mime (>= 0.1.1)
119119
marcel (0.3.3)
120120
mimemagic (~> 0.3.2)
121-
method_source (0.9.0)
121+
method_source (0.9.2)
122122
mimemagic (0.3.3)
123123
mini_mime (1.0.1)
124124
mini_portile2 (2.4.0)
125125
minitest (5.11.3)
126-
nio4r (2.3.1)
127-
nokogiri (1.10.4)
126+
nio4r (2.4.0)
127+
nokogiri (1.10.3)
128128
mini_portile2 (~> 2.4.0)
129129
pipetree (0.1.1)
130130
poltergeist (1.18.1)
@@ -133,36 +133,36 @@ GEM
133133
websocket-driver (>= 0.2.0)
134134
public_suffix (3.0.3)
135135
puma (3.12.0)
136-
rack (2.0.5)
136+
rack (2.0.7)
137137
rack-proxy (0.6.5)
138138
rack
139139
rack-test (1.1.0)
140140
rack (>= 1.0, < 3)
141-
rails (5.2.1)
142-
actioncable (= 5.2.1)
143-
actionmailer (= 5.2.1)
144-
actionpack (= 5.2.1)
145-
actionview (= 5.2.1)
146-
activejob (= 5.2.1)
147-
activemodel (= 5.2.1)
148-
activerecord (= 5.2.1)
149-
activestorage (= 5.2.1)
150-
activesupport (= 5.2.1)
141+
rails (5.2.3)
142+
actioncable (= 5.2.3)
143+
actionmailer (= 5.2.3)
144+
actionpack (= 5.2.3)
145+
actionview (= 5.2.3)
146+
activejob (= 5.2.3)
147+
activemodel (= 5.2.3)
148+
activerecord (= 5.2.3)
149+
activestorage (= 5.2.3)
150+
activesupport (= 5.2.3)
151151
bundler (>= 1.3.0)
152-
railties (= 5.2.1)
152+
railties (= 5.2.3)
153153
sprockets-rails (>= 2.0.0)
154154
rails-dom-testing (2.0.3)
155155
activesupport (>= 4.2.0)
156156
nokogiri (>= 1.6)
157157
rails-html-sanitizer (1.0.4)
158158
loofah (~> 2.2, >= 2.2.2)
159-
railties (5.2.1)
160-
actionpack (= 5.2.1)
161-
activesupport (= 5.2.1)
159+
railties (5.2.3)
160+
actionpack (= 5.2.3)
161+
activesupport (= 5.2.3)
162162
method_source
163163
rake (>= 0.8.7)
164164
thor (>= 0.19.0, < 2.0)
165-
rake (12.3.2)
165+
rake (12.3.3)
166166
reform (2.2.4)
167167
disposable (>= 0.4.1)
168168
representable (>= 2.4.0, < 3.1.0)
@@ -210,7 +210,7 @@ GEM
210210
sprockets (>= 3.0.0)
211211
sqlite3 (1.3.13)
212212
temple (0.8.0)
213-
thor (0.20.0)
213+
thor (0.20.3)
214214
thread_safe (0.3.6)
215215
tilt (2.0.8)
216216
trailblazer (2.0.7)
@@ -239,9 +239,9 @@ GEM
239239
activesupport (>= 4.2)
240240
rack-proxy (>= 0.6.1)
241241
railties (>= 4.2)
242-
websocket-driver (0.7.0)
242+
websocket-driver (0.7.1)
243243
websocket-extensions (>= 0.1.0)
244-
websocket-extensions (0.1.3)
244+
websocket-extensions (0.1.4)
245245
xpath (3.2.0)
246246
nokogiri (~> 1.8)
247247

‎app/concepts/matestack/ui/core/abbr/abbr.haml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
%abbr{@tag_attributes}
2+
- if options[:text].blank? && block_given?
3+
= yield
4+
- else
5+
= options[:text]

‎app/concepts/matestack/ui/core/abbr/abbr.rb

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
module Matestack::Ui::Core::Abbr
2+
class Abbr < Matestack::Ui::Core::Component::Static
3+
REQUIRED_KEYS = [:title]
4+
5+
def setup
6+
@tag_attributes.merge!({
7+
"title": options[:title]
8+
})
9+
end
10+
11+
end
12+
end

‎app/concepts/matestack/ui/core/app/app.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ def self.views_dir
5353
return ""
5454
end
5555

56-
5756
def initialize(model=nil, options={})
5857
super
5958
@nodes = {}

‎app/concepts/matestack/ui/core/app/store.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import Vue from 'vue/dist/vue.esm'
22
import Vuex from 'vuex'
33
import axios from 'axios'
4-
54
import matestackEventHub from 'js/event-hub'
65

76
Vue.use(Vuex)

‎app/concepts/matestack/ui/core/article/article.haml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
%article{@tag_attributes}
2+
- if options[:text].nil? && block_given?
3+
= yield
4+
- else
5+
= options[:text]

‎app/concepts/matestack/ui/core/article/article.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
module Matestack::Ui::Core::Article
2+
class Article < Matestack::Ui::Core::Component::Static
3+
4+
end
5+
end

‎app/concepts/matestack/ui/core/async/async.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import Vue from 'vue/dist/vue.esm'
2-
32
import matestackEventHub from 'js/event-hub'
4-
53
import componentMixin from 'component/component'
64

75
const componentDef = {

‎app/concepts/matestack/ui/core/async/async.rb

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
module Matestack::Ui::Core::Async
2-
class Async < Matestack::Ui::Core::Component::Dynamic
3-
4-
def setup
5-
@rerender = true
6-
end
7-
2+
class Async < Matestack::Ui::Core::Component::Dynamic
83

4+
def setup
5+
@rerender = true
96
end
7+
108
end
9+
end

‎app/concepts/matestack/ui/core/blockquote/blockquote.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
module Matestack::Ui::Core::Blockquote
22
class Blockquote < Matestack::Ui::Core::Component::Static
3+
34
def setup
45
@tag_attributes.merge!({
56
"cite": options[:cite]
6-
})
7+
})
78
end
9+
810
end
911
end

‎app/concepts/matestack/ui/core/button/button.haml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
- if options[:text].nil?
2-
%button{@tag_attributes}
3-
- if block_given?
4-
= yield
5-
- else
6-
%button{@tag_attributes}
1+
%button{@tag_attributes}
2+
- if options[:text].nil? && block_given?
3+
= yield
4+
- else
75
= options[:text]

‎app/concepts/matestack/ui/core/caption/caption.haml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
%caption{@tag_attributes}
2-
- if options[:text].nil?
3-
- if block_given?
4-
= yield
2+
- if options[:text].nil? && block_given?
3+
= yield
54
- else
65
= options[:text]

‎app/concepts/matestack/ui/core/collection/content/content.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import Vue from 'vue/dist/vue.esm'
2-
32
import matestackEventHub from 'js/event-hub'
43
import queryParamsHelper from 'js/helpers/query-params-helper'
5-
64
import componentMixin from 'component/component'
75
import asyncMixin from 'async/async'
86

‎app/concepts/matestack/ui/core/collection/filter/filter.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import Vue from 'vue/dist/vue.esm'
2-
32
import matestackEventHub from 'js/event-hub'
43
import queryParamsHelper from 'js/helpers/query-params-helper'
5-
64
import componentMixin from 'component/component'
75

86
const componentDef = {

‎app/concepts/matestack/ui/core/collection/helper.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ def config
5959

6060
end
6161

62-
6362
module Helper
6463

6564
def get_collection_filter collection_id, key=nil

‎app/concepts/matestack/ui/core/collection/order/order.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import Vue from 'vue/dist/vue.esm'
2-
32
import matestackEventHub from 'js/event-hub'
43
import queryParamsHelper from 'js/helpers/query-params-helper'
5-
64
import componentMixin from 'component/component'
75

86
const componentDef = {

‎app/concepts/matestack/ui/core/collection/order/toggle/toggle.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
module Matestack::Ui::Core::Collection::Order::Toggle
22
class Toggle < Matestack::Ui::Core::Component::Static
33

4-
54
end
65
end

‎app/concepts/matestack/ui/core/component/component.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import Vue from 'vue/dist/vue.esm'
22
import axios from 'axios'
33
import VRuntimeTemplate from "v-runtime-template"
4-
54
import matestackEventHub from 'js/event-hub'
65

76
const componentMixin = {

‎app/concepts/matestack/ui/core/component/dynamic.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
module Matestack::Ui::Core::Component
22
class Dynamic < Trailblazer::Cell
33

4-
54
include ActionView::Helpers::ActiveModelHelper
65
include ActionView::Helpers::ActiveModelInstanceTag
76
include ActionView::Helpers::AssetTagHelper
@@ -26,8 +25,6 @@ class Dynamic < Trailblazer::Cell
2625
include ActionView::Helpers::TextHelper
2726
include ActionView::Helpers::TranslationHelper
2827
include ActionView::Helpers::UrlHelper
29-
# include ActionView::Helpers::UrlHelper
30-
# include ActionView::Helpers::TranslationHelper
3128
include ::Cell::Haml
3229
include Matestack::Ui::Core::ApplicationHelper
3330
include Matestack::Ui::Core::ToCell
@@ -193,7 +190,6 @@ def modifiers
193190
result.join(" ")
194191
end
195192

196-
197193
private
198194

199195
def generate_children_cells

‎app/concepts/matestack/ui/core/details/details.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
module Matestack::Ui::Core::Details
22
class Details < Matestack::Ui::Core::Component::Static
3+
34
end
45
end

‎app/concepts/matestack/ui/core/div/div.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
module Matestack::Ui::Core::Div
22
class Div < Matestack::Ui::Core::Component::Static
33

4-
54
end
65
end

‎app/concepts/matestack/ui/core/form/select/select.haml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
%select{"#{model_binding}" => input_key,
88
id: component_id,
99
ref: "select.#{attr_key}",
10+
class: options[:class],
1011
"@change": "inputChanged(\"#{attr_key}\")",
1112
"init-value": init_value,
1213
"value-type": options_type}

0 commit comments

Comments
 (0)