Skip to content

Commit

Permalink
Updates to Autosize Code - fixes #688 (#693)
Browse files Browse the repository at this point in the history
  • Loading branch information
@6pac
6pac committed Sep 14, 2022
1 parent bcc55a0 commit af513e2
Show file tree
Hide file tree
Showing 3 changed files with 200 additions and 104 deletions.
48 changes: 40 additions & 8 deletions examples/example-size-to-content.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,8 @@ <h2>Column Options:</h2>
<span class="spacer"></span>
<input type="radio" id="col1_asmCON" name="col1_autosizeMode" value="CON"><label for="col1_asmCON">Content</label>
<span class="spacer"></span>
<input type="radio" id="col1_asmCXO" name="col1_autosizeMode" value="CXO"><label for="col1_asmCXO">Content (expand only)</label>
<span class="spacer"></span>
<input type="radio" id="col1_asmCTI" name="col1_autosizeMode" value="CTI" checked="checked"><label for="col1_asmCTI">ContentIntelligent</label>
</div>
<div class="spaced-para">
Expand Down Expand Up @@ -166,7 +168,9 @@ <h2>Column Options:</h2>
<span class="label">widthEvalMode</span>
<input type="radio" id="col1_wemCANV" name="col1_widthEvalMode" value="CANV"><label for="col1_wemCANV">CanvasTextSize</label>
<span class="spacer"></span>
<input type="radio" id="col1_wemHTML" name="col1_widthEvalMode" value="HTML" checked="checked"><label for="col1_wemHTML">HTML</label>
<input type="radio" id="col1_wemHTML" name="col1_widthEvalMode" value="HTML"><label for="col1_wemHTML">HTML</label>
<span class="spacer"></span>
<input type="radio" id="col1_wemAuto" name="col1_widthEvalMode" value="AUTO" checked="checked"><label for="col1_wemAuto">Auto</label>
</div>
<div class="spaced-para">
<span class="label">ignoreHeaderText</span>
Expand Down Expand Up @@ -202,6 +206,8 @@ <h2>Column Options:</h2>
<span class="spacer"></span>
<input type="radio" id="col2_asmCON" name="col2_autosizeMode" value="CON"><label for="col2_asmCON">Content</label>
<span class="spacer"></span>
<input type="radio" id="col2_asmCXO" name="col2_autosizeMode" value="CXO"><label for="col2_asmCXO">Content (expand only)</label>
<span class="spacer"></span>
<input type="radio" id="col2_asmCTI" name="col2_autosizeMode" value="CTI" checked="checked"><label for="col2_asmCTI">ContentIntelligent</label>
</div>
<div class="spaced-para">
Expand Down Expand Up @@ -234,7 +240,9 @@ <h2>Column Options:</h2>
<span class="label">widthEvalMode</span>
<input type="radio" id="col2_wemCANV" name="col2_widthEvalMode" value="CANV"><label for="col2_wemCANV">CanvasTextSize</label>
<span class="spacer"></span>
<input type="radio" id="col2_wemHTML" name="col2_widthEvalMode" value="HTML" checked="checked"><label for="col2_wemHTML">HTML</label>
<input type="radio" id="col2_wemHTML" name="col2_widthEvalMode" value="HTML"><label for="col2_wemHTML">HTML</label>
<span class="spacer"></span>
<input type="radio" id="col2_wemAuto" name="col2_widthEvalMode" value="AUTO" checked="checked"><label for="col2_wemAuto">Auto</label>
</div>
<div class="spaced-para">
<span class="label">ignoreHeaderText</span>
Expand Down Expand Up @@ -270,6 +278,8 @@ <h2>Column Options:</h2>
<span class="spacer"></span>
<input type="radio" id="col3_asmCON" name="col3_autosizeMode" value="CON"><label for="col3_asmCON">Content</label>
<span class="spacer"></span>
<input type="radio" id="col3_asmCXO" name="col3_autosizeMode" value="CXO"><label for="col3_asmCXO">Content (expand only)</label>
<span class="spacer"></span>
<input type="radio" id="col3_asmCTI" name="col3_autosizeMode" value="CTI" checked="checked"><label for="col3_asmCTI">ContentIntelligent</label>
</div>
<div class="spaced-para">
Expand Down Expand Up @@ -302,7 +312,9 @@ <h2>Column Options:</h2>
<span class="label">widthEvalMode</span>
<input type="radio" id="col3_wemCANV" name="col3_widthEvalMode" value="CANV"><label for="col3_wemCANV">CanvasTextSize</label>
<span class="spacer"></span>
<input type="radio" id="col3_wemHTML" name="col3_widthEvalMode" value="HTML" checked="checked"><label for="col3_wemHTML">HTML</label>
<input type="radio" id="col3_wemHTML" name="col3_widthEvalMode" value="HTML"><label for="col3_wemHTML">HTML</label>
<span class="spacer"></span>
<input type="radio" id="col3_wemAuto" name="col3_widthEvalMode" value="AUTO" checked="checked"><label for="col3_wemAuto">Auto</label>
</div>
<div class="spaced-para">
<span class="label">ignoreHeaderText</span>
Expand Down Expand Up @@ -338,6 +350,8 @@ <h2>Column Options:</h2>
<span class="spacer"></span>
<input type="radio" id="col4_asmCON" name="col4_autosizeMode" value="CON"><label for="col4_asmCON">Content</label>
<span class="spacer"></span>
<input type="radio" id="col4_asmCXO" name="col4_autosizeMode" value="CXO"><label for="col4_asmCXO">Content (expand only)</label>
<span class="spacer"></span>
<input type="radio" id="col4_asmCTI" name="col4_autosizeMode" value="CTI" checked="checked"><label for="col4_asmCTI">ContentIntelligent</label>
</div>
<div class="spaced-para">
Expand Down Expand Up @@ -370,7 +384,9 @@ <h2>Column Options:</h2>
<span class="label">widthEvalMode</span>
<input type="radio" id="col4_wemCANV" name="col4_widthEvalMode" value="CANV"><label for="col4_wemCANV">CanvasTextSize</label>
<span class="spacer"></span>
<input type="radio" id="col4_wemHTML" name="col4_widthEvalMode" value="HTML" checked="checked"><label for="col4_wemHTML">HTML</label>
<input type="radio" id="col4_wemHTML" name="col4_widthEvalMode" value="HTML"><label for="col4_wemHTML">HTML</label>
<span class="spacer"></span>
<input type="radio" id="col4_wemAuto" name="col4_widthEvalMode" value="AUTO" checked="checked"><label for="col4_wemAuto">Auto</label>
</div>
<div class="spaced-para">
<span class="label">ignoreHeaderText</span>
Expand Down Expand Up @@ -406,6 +422,8 @@ <h2>Column Options:</h2>
<span class="spacer"></span>
<input type="radio" id="col5_asmCON" name="col5_autosizeMode" value="CON"><label for="col5_asmCON">Content</label>
<span class="spacer"></span>
<input type="radio" id="col5_asmCXO" name="col5_autosizeMode" value="CXO"><label for="col5_asmCXO">Content (expand only)</label>
<span class="spacer"></span>
<input type="radio" id="col5_asmCTI" name="col5_autosizeMode" value="CTI" checked="checked"><label for="col5_asmCTI">ContentIntelligent</label>
</div>
<div class="spaced-para">
Expand Down Expand Up @@ -438,7 +456,9 @@ <h2>Column Options:</h2>
<span class="label">widthEvalMode</span>
<input type="radio" id="col5_wemCANV" name="col5_widthEvalMode" value="CANV"><label for="col5_wemCANV">CanvasTextSize</label>
<span class="spacer"></span>
<input type="radio" id="col5_wemHTML" name="col5_widthEvalMode" value="HTML" checked="checked"><label for="col5_wemHTML">HTML</label>
<input type="radio" id="col5_wemHTML" name="col5_widthEvalMode" value="HTML"><label for="col5_wemHTML">HTML</label>
<span class="spacer"></span>
<input type="radio" id="col5_wemAuto" name="col5_widthEvalMode" value="AUTO" checked="checked"><label for="col5_wemAuto">Auto</label>
</div>
<div class="spaced-para">
<span class="label">ignoreHeaderText</span>
Expand Down Expand Up @@ -474,6 +494,8 @@ <h2>Column Options:</h2>
<span class="spacer"></span>
<input type="radio" id="col6_asmCON" name="col6_autosizeMode" value="CON"><label for="col6_asmCON">Content</label>
<span class="spacer"></span>
<input type="radio" id="col6_asmCXO" name="col6_autosizeMode" value="CXO"><label for="col6_asmCXO">Content (expand only)</label>
<span class="spacer"></span>
<input type="radio" id="col6_asmCTI" name="col6_autosizeMode" value="CTI" checked="checked"><label for="col6_asmCTI">ContentIntelligent</label>
</div>
<div class="spaced-para">
Expand Down Expand Up @@ -506,7 +528,9 @@ <h2>Column Options:</h2>
<span class="label">widthEvalMode</span>
<input type="radio" id="col6_wemCANV" name="col6_widthEvalMode" value="CANV"><label for="col6_wemCANV">CanvasTextSize</label>
<span class="spacer"></span>
<input type="radio" id="col6_wemHTML" name="col6_widthEvalMode" value="HTML" checked="checked"><label for="col6_wemHTML">HTML</label>
<input type="radio" id="col6_wemHTML" name="col6_widthEvalMode" value="HTML"><label for="col6_wemHTML">HTML</label>
<span class="spacer"></span>
<input type="radio" id="col6_wemAuto" name="col6_widthEvalMode" value="AUTO" checked="checked"><label for="col6_wemAuto">Auto</label>
</div>
<div class="spaced-para">
<span class="label">ignoreHeaderText</span>
Expand Down Expand Up @@ -542,6 +566,8 @@ <h2>Column Options:</h2>
<span class="spacer"></span>
<input type="radio" id="col7_asmCON" name="col7_autosizeMode" value="CON"><label for="col7_asmCON">Content</label>
<span class="spacer"></span>
<input type="radio" id="col7_asmCXO" name="col7_autosizeMode" value="CXO"><label for="col7_asmCXO">Content (expand only)</label>
<span class="spacer"></span>
<input type="radio" id="col7_asmCTI" name="col7_autosizeMode" value="CTI" checked="checked"><label for="col7_asmCTI">ContentIntelligent</label>
</div>
<div class="spaced-para">
Expand Down Expand Up @@ -574,7 +600,9 @@ <h2>Column Options:</h2>
<span class="label">widthEvalMode</span>
<input type="radio" id="col7_wemCANV" name="col7_widthEvalMode" value="CANV"><label for="col7_wemCANV">CanvasTextSize</label>
<span class="spacer"></span>
<input type="radio" id="col7_wemHTML" name="col7_widthEvalMode" value="HTML" checked="checked"><label for="col7_wemHTML">HTML</label>
<input type="radio" id="col7_wemHTML" name="col7_widthEvalMode" value="HTML"><label for="col7_wemHTML">HTML</label>
<span class="spacer"></span>
<input type="radio" id="col7_wemAuto" name="col7_widthEvalMode" value="AUTO" checked="checked"><label for="col7_wemAuto">Auto</label>
</div>
<div class="spaced-para">
<span class="label">ignoreHeaderText</span>
Expand Down Expand Up @@ -610,6 +638,8 @@ <h2>Column Options:</h2>
<span class="spacer"></span>
<input type="radio" id="col8_asmCON" name="col8_autosizeMode" value="CON"><label for="col8_asmCON">Content</label>
<span class="spacer"></span>
<input type="radio" id="col8_asmCXO" name="col8_autosizeMode" value="CXO"><label for="col8_asmCXO">Content (expand only)</label>
<span class="spacer"></span>
<input type="radio" id="col8_asmCTI" name="col8_autosizeMode" value="CTI" checked="checked"><label for="col8_asmCTI">ContentIntelligent</label>
</div>
<div class="spaced-para">
Expand Down Expand Up @@ -642,7 +672,9 @@ <h2>Column Options:</h2>
<span class="label">widthEvalMode</span>
<input type="radio" id="col8_wemCANV" name="col8_widthEvalMode" value="CANV"><label for="col8_wemCANV">CanvasTextSize</label>
<span class="spacer"></span>
<input type="radio" id="col8_wemHTML" name="col8_widthEvalMode" value="HTML" checked="checked"><label for="col8_wemHTML">HTML</label>
<input type="radio" id="col8_wemHTML" name="col8_widthEvalMode" value="HTML"><label for="col8_wemHTML">HTML</label>
<span class="spacer"></span>
<input type="radio" id="col8_wemAuto" name="col8_widthEvalMode" value="AUTO" checked="checked"><label for="col8_wemAuto">Auto</label>
</div>
<div class="spaced-para">
<span class="label">ignoreHeaderText</span>
Expand Down
40 changes: 21 additions & 19 deletions slick.core.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -729,31 +729,33 @@
},

"ColAutosizeMode": {
Locked: 'LCK',
Guide: 'GUI',
Content: 'CON',
ContentIntelligent: 'CTI'
Locked: 'LCK',
Guide: 'GUI',
Content: 'CON',
ContentExpandOnly: 'CXO',
ContentIntelligent: 'CTI'
},

"RowSelectionMode": {
FirstRow: 'FS1',
FirstNRows: 'FSN',
AllRows: 'ALL',
LastRow: 'LS1'
FirstRow: 'FS1',
FirstNRows: 'FSN',
AllRows: 'ALL',
LastRow: 'LS1'
},

"ValueFilterMode": {
None: 'NONE',
DeDuplicate: 'DEDP',
GetGreatestAndSub: 'GR8T',
GetLongestTextAndSub: 'LNSB',
GetLongestText: 'LNSC'
None: 'NONE',
DeDuplicate: 'DEDP',
GetGreatestAndSub: 'GR8T',
GetLongestTextAndSub: 'LNSB',
GetLongestText: 'LNSC'
},

"WidthEvalMode": {
CanvasTextSize: 'CANV',
HTML: 'HTML'
}
Auto: 'AUTO',
TextOnly: 'CANV',
HTML: 'HTML'
}
}
});
})(jQuery);
Expand Down

0 comments on commit af513e2

Please sign in to comment.