Commit 545b2f41 authored by LE GAC Renaud's avatar LE GAC Renaud
Browse files

Merge branch 'master' into 'production'

Release 0.6.2

* Update to `plugin_extjs 6.2.0` and `plugin_dbui 0.9.5`

See merge request !22
parents 5df2bbd5 87ddde6b
......@@ -2,9 +2,9 @@
HEAD
0.6.1 (Oct 2016)
0.6.2 (Nov 2016)
- Migrate to ExtJS 6.
- Require plugin_dbui 0.9.3.1 and plugin_extjs 6.0.1 or higher.
- Require plugin_dbui 0.9.5 and plugin_extjs 6.2.0 or higher.
- New syntax for grid column configuration property:
renderer and summaryRenderer.
- Redesing the JavaScript class UserDataMultiDefault.
......
0.6.1
\ No newline at end of file
0.6.2
\ No newline at end of file
......@@ -37,6 +37,9 @@ Ext.onReady(function(){
Ext.QuickTips.init();
// Supress ARIA warning
Ext.ariaWarn = Ext.emptyFn;
// Expose the remote methods
Ext.direct.Manager.addProvider(Dbui.REMOTE_API);
......
......@@ -83,24 +83,6 @@
nColumns = columns.length,
i, grid;
// backward compatibility
// Ext JS 4.2.1 the width of the column is defined using the property flex
// Ext JS 6.0.1 this cause crash of the grid when a hidden column is activated
// The workaround is to destroy the flex property and to use the
// columnWidth instead. the latter is a percentage ranging from 0 to 1.
//
for (i = 0; i < nColumns; i += 1) {
column = columns[i];
if (column.flex !== undefined && column.columnWidth === undefined) {
if (column.flex <= 1) {
column.columnWidth = column.flex * 0.1;
} else {
column.columnWidth = 1;
}
}
delete column.flex;
}
// convert renderer / summaryRenderer properties
// typicaly a string to a function
//
......@@ -117,9 +99,17 @@
}
// instantiate the grid
// NOTE ExtJS 6.2.0
// With ExtJS 6.2.0, the configuration is not working:
//
// plugins: ['pGridExport', 'pMathJax']
//
// It is related to layout and pMathJax !
// Remove pMathJax since its use is marginal in that application.
cfgGrid = Ext.apply(cfgGrid, {
plugins: ['pGridExport', 'pMathJax'],
plugins: ['pGridExport'],
store: cfgStore,
forceFit: true,
padding: "10 40 20 30",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment