Skip to content

Commit d54e8b3

Browse files
committed
using rc2 version of core and vuejs, removed temp patches
1 parent 5a649b3 commit d54e8b3

File tree

15 files changed

+56
-2524
lines changed

15 files changed

+56
-2524
lines changed

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ PATH
33
specs:
44
matestack-ui-bootstrap (3.0.0.rc1)
55
matestack-ui-core (~> 3.0.0.rc2)
6-
matestack-ui-vuejs (~> 3.0.0.rc1)
6+
matestack-ui-vuejs (~> 3.0.0.rc2)
77

88
GEM
99
remote: https://rubygems.org/
@@ -124,7 +124,7 @@ GEM
124124
marcel (1.0.2)
125125
matestack-ui-core (3.0.0.rc2)
126126
rails (>= 5.2)
127-
matestack-ui-vuejs (3.0.0.rc1)
127+
matestack-ui-vuejs (3.0.0.rc2)
128128
matestack-ui-core (~> 3.0.0.rc1)
129129
rails (>= 5.2)
130130
matrix (0.4.2)

lib/matestack/ui/bootstrap/components/collapse.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const collapseComponent = {
3434

3535
mounted: function() {
3636
const self = this;
37-
const collapseElement = self.getElement().firstChild
37+
const collapseElement = self.getElement()
3838
self.collapseInstance = new bootstrap.Collapse(collapseElement, {
3939
toggle: false
4040
})

lib/matestack/ui/bootstrap/components/modal.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const modalComponent = {
3131

3232
mounted: function() {
3333
const self = this
34-
const modalElement = self.getElement().firstChild
34+
const modalElement = self.getElement()
3535
self.modalInstance = new bootstrap.Modal(modalElement)
3636
},
3737

lib/matestack/ui/bootstrap/components/popover.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const popoverComponent = {
1616
},
1717
mounted: function() {
1818
const self = this;
19-
const popoverElement = self.getElement().firstChild
19+
const popoverElement = self.getElement()
2020
self.popoverInstance = new bootstrap.Popover(popoverElement, {})
2121
},
2222
created: function() {

lib/matestack/ui/bootstrap/components/toast.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const toastComponent = {
4444
},
4545
mounted: function() {
4646
const self = this;
47-
var myToasts = self.getElement().firstChild
47+
var myToasts = self.getElement()
4848
self.toastsInstance = new bootstrap.Toast(myToasts)
4949
},
5050
created: function() {

lib/matestack/ui/bootstrap/components/tooltip.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const tooltipComponent = {
1515
},
1616
mounted: function() {
1717
const self = this;
18-
var tooltip = self.getElement().firstChild
18+
var tooltip = self.getElement()
1919
self.tooltipInstance = new bootstrap.Tooltip(tooltip)
2020
}
2121
// created: function() {

lib/matestack/ui/bootstrap/form/checkbox.rb

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,4 @@ def render_form_text
8787
end
8888
end
8989

90-
def id
91-
if ctx.id.present?
92-
"'#{ctx.id}'"
93-
else
94-
if form_context.is_nested_form?
95-
"'#{key}'+vc.parentNestedFormRuntimeId"
96-
else
97-
"'#{key}'"
98-
end
99-
end
100-
end
101-
10290
end

lib/matestack/ui/bootstrap/form/input.rb

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -115,16 +115,4 @@ def render_form_text
115115
end
116116
end
117117

118-
def id
119-
if ctx.id.present?
120-
"'#{ctx.id}'"
121-
else
122-
if form_context.is_nested_form?
123-
"'#{key}'+vc.parentNestedFormRuntimeId"
124-
else
125-
"'#{key}'"
126-
end
127-
end
128-
end
129-
130118
end

lib/matestack/ui/bootstrap/form/radio.rb

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,4 @@ def input_error_class
5454
'is-invalid'
5555
end
5656

57-
def id
58-
if ctx.id.present?
59-
"'#{ctx.id}'"
60-
else
61-
if form_context.is_nested_form?
62-
"'#{key}'+vc.parentNestedFormRuntimeId"
63-
else
64-
"'#{key}'"
65-
end
66-
end
67-
end
68-
6957
end

lib/matestack/ui/bootstrap/form/select.rb

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,4 @@ def render_form_text
6060
end
6161
end
6262

63-
def id
64-
if ctx.id.present?
65-
"'#{ctx.id}'"
66-
else
67-
if form_context.is_nested_form?
68-
"'#{key}'+vc.parentNestedFormRuntimeId"
69-
else
70-
"'#{key}'"
71-
end
72-
end
73-
end
74-
7563
end

0 commit comments

Comments
 (0)