Skip to content

Commit 80e729f

Browse files
Merge branch 'develop' into es5-transpiling
2 parents 7c23489 + 338104b commit 80e729f

File tree

191 files changed

+4467
-868
lines changed

Some content is hidden

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

191 files changed

+4467
-868
lines changed

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ gemspec
1313

1414
# To use a debugger
1515
# gem 'byebug', group: [:development, :test]
16+
# gem 'pry-byebug', group: [:development, :test]
1617

1718
gem "trailblazer"
1819
gem "trailblazer-rails"
@@ -31,6 +32,7 @@ group :development, :test do
3132
gem 'simplecov', require: false, group: :test
3233
gem 'byebug'
3334
gem 'webmock'
35+
gem 'webdrivers', '~> 4.1'
3436
end
3537

3638
group :test do

Gemfile.lock

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ GEM
133133
mimemagic (0.3.3)
134134
mini_mime (1.0.2)
135135
mini_portile2 (2.4.0)
136-
minitest (5.12.2)
136+
minitest (5.11.3)
137137
nio4r (2.5.2)
138138
nokogiri (1.10.4)
139139
mini_portile2 (~> 2.4.0)
@@ -245,7 +245,11 @@ GEM
245245
tzinfo (1.2.5)
246246
thread_safe (~> 0.1)
247247
uber (0.1.0)
248-
webmock (3.7.6)
248+
webdrivers (4.1.2)
249+
nokogiri (~> 1.6)
250+
rubyzip (~> 1.0)
251+
selenium-webdriver (>= 3.0, < 4.0)
252+
webmock (3.5.1)
249253
addressable (>= 2.3.6)
250254
crack (>= 0.3.2)
251255
hashdiff (>= 0.4.0, < 2.0.0)
@@ -279,6 +283,7 @@ DEPENDENCIES
279283
trailblazer
280284
trailblazer-cells
281285
trailblazer-rails
286+
webdrivers (~> 4.1)
282287
webmock
283288
webpacker (~> 4.0)
284289

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ class App < Trailblazer::Cell
1717
include ActionView::Helpers::JavaScriptHelper
1818
include ActionView::Helpers::NumberHelper
1919
include ActionView::Helpers::OutputSafetyHelper
20-
include ActionView::Helpers::RecordTagHelper
2120
# include ActionView::Helpers::RenderingHelper
2221
include ActionView::Helpers::SanitizeHelper
2322
include ActionView::Helpers::TagHelper
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
%area{@tag_attributes}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
module Matestack::Ui::Core::Area
2+
class Area < Matestack::Ui::Core::Component::Static
3+
def setup
4+
@tag_attributes.merge!({
5+
alt: options[:alt],
6+
coords: options[:coords].join(','),
7+
download: options[:download],
8+
href: options[:href],
9+
hreflang: options[:hreflang],
10+
media: options[:media],
11+
rel: options[:rel],
12+
shape: options[:shape],
13+
target: options[:target],
14+
type: options[:type]
15+
})
16+
end
17+
end
18+
end
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
%aside{@tag_attributes}
2+
- if block_given?
3+
= yield
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
module Matestack::Ui::Core::Aside
2+
class Aside < Matestack::Ui::Core::Component::Static
3+
4+
end
5+
end
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
%b{@tag_attributes}
2+
- if options[:text].nil? && block_given?
3+
= yield
4+
- else
5+
= options[:text]

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
module Matestack::Ui::Core::B
2+
class B < Matestack::Ui::Core::Component::Static
3+
4+
end
5+
end
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
%cite{@tag_attributes}
2+
- if options[:text].nil? && block_given?
3+
= yield
4+
- else
5+
= options[:text]

0 commit comments

Comments
 (0)