Skip to content

Commit a38b82e

Browse files
committed
version 0.3.1
Signed-off-by: Josh Crawford <[email protected]>
1 parent 0901512 commit a38b82e

File tree

6 files changed

+22
-12
lines changed

6 files changed

+22
-12
lines changed

README.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ A Super Table field can be set to be static, which turns the field into a non-re
7171

7272
- Test more third-party fieldtypes, purely for a complete list.
7373
- Add ability to collapse rows.
74-
- Fix issue with Redactor - requires full rewrite using non tables [#3](https://github.com/engram-design/SuperTable/issues/3).
7574
- New settings layout, including drag/drop, full control over field layout. Allows you to set out the field exactly as you like.
7675
- Add template hook to allow other plugins to provide layouts for editing field.
7776
- Allow for SuperTable-in-SuperTable - because why not.
@@ -84,6 +83,13 @@ Thanks go to [@brandonkelly](https://github.com/brandonkelly) and [@benparizek](
8483

8584
## Changelog
8685

86+
#### 0.3.1
87+
88+
- Fix for field labels on inner-Matrix field being hidden [#16](https://github.com/engram-design/SuperTable/issues/16).
89+
- Latest Redactor version fixes [#3](https://github.com/engram-design/SuperTable/issues/3).
90+
- Fix for width not being applied for columns [#15](https://github.com/engram-design/SuperTable/issues/15).
91+
- Fix issues with multiple Matrix Configurators causing many javascript issues [see Craft 2.4.2677](https://buildwithcraft.com/updates#build2677).
92+
8793
#### 0.3.0
8894

8995
- Added composer support.

supertable/SuperTablePlugin.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public function getName()
1414

1515
public function getVersion()
1616
{
17-
return '0.3.0';
17+
return '0.3.1';
1818
}
1919

2020
public function getDeveloper()

supertable/resources/css/SuperTableInput.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ table.editable.superTable tbody tr td {
77
text-align: left;
88
}
99

10-
table.editable.superTable tbody tr td .field .heading {
10+
table.editable.superTable tbody tr td > .field > .heading {
1111
display: none;
1212
}
1313

supertable/resources/js/MatrixConfiguratorAlt.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ Craft.MatrixConfiguratorAlt = Garnish.Base.extend({
4444
this.inputIdPrefix = Craft.formatInputId(this.inputNamePrefix);
4545

4646
// Fix to support more than one Matrix in a single field
47-
this.$container = $('.fieldtype-settings[name="'+inputNamePrefix+'"] .matrix-configurator > .field > .input');
47+
this.$container = $('#' + this.inputIdPrefix + '-matrix-configurator:first .input:first');
48+
//this.$container = $('.matrix-configurator:first .input:first');
4849

4950
this.$blockTypesColumnContainer = this.$container.children('.block-types').children();
5051
this.$fieldsColumnContainer = this.$container.children('.fields').children();

supertable/templates/fields.html

+10-7
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
{% if element is not defined %}{% set element = null %}{% endif %}
22
{% if namespace is not defined %}{% set namespace = 'fields' %}{% endif %}
33

4+
{% set columnSettings = [] %}
5+
{% if settings is defined and settings %}
6+
{% for col in settings.columns %}
7+
{% set columnSettings = columnSettings | merge([col]) %}
8+
{% endfor %}
9+
{% endif %}
10+
411
{% namespace namespace %}
5-
{% for field in fields %}
12+
{% for index, field in fields %}
613

714
{# Additional field settings #}
8-
{% if settings is defined and settings %}
9-
{% set fieldId = field.getField().id %}
10-
11-
{% if settings[fieldId] is defined %}
12-
{% set width = settings[fieldId].width %}
13-
{% endif %}
15+
{% if columnSettings[index] is defined %}
16+
{% set width = columnSettings[index].width %}
1417
{% endif %}
1518

1619
{% if settings is defined and settings.fieldLayout == 'row' %}

supertable/templates/settings.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
</td>
5959

6060
<td class="settings-col hidden">
61-
<div class="fieldtype-settings" name="{{ fieldName }}[typesettings]">
61+
<div class="fieldtype-settings">
6262
<div>
6363
{% namespace fieldName~'[typesettings]' %}
6464
{{ fieldType.getSettingsHtml()|raw }}

0 commit comments

Comments
 (0)