Menu
▾
▴
openutils-svn
|
From: <die...@us...> - 2009-12-01 14:33:26
|
Revision: 1509
http://openutils.svn.sourceforge.net/openutils/?rev=1509&view=rev
Author: diego_schivo
Date: 2009-12-01 14:33:15 +0000 (Tue, 01 Dec 2009)
Log Message:
-----------
CONTROLS-8 Extra char '\r' (carriage return) in last column's values
Modified Paths:
--------------
trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
Modified: trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2009-11-30 10:22:20 UTC (rev 1508)
+++ trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2009-12-01 14:33:15 UTC (rev 1509)
@@ -92,7 +92,7 @@
var numOfRows= ${configuration.rows};
var hidden = document.getElementById('${name}');
- var rows = hidden.value.split('\n');
+ var rows = hidden.value.split(/\r?\n/);
var i, myData = [];
for (i = 0; i < numOfRows; i++) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-01-08 11:31:57
|
Revision: 1601
http://openutils.svn.sourceforge.net/openutils/?rev=1601&view=rev
Author: diego_schivo
Date: 2010-01-08 11:31:50 +0000 (Fri, 08 Jan 2010)
Log Message:
-----------
CONTROLS-15 Custom width/height of preview-image for media-picker in grid control
Modified Paths:
--------------
trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
Modified: trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2010-01-08 11:29:42 UTC (rev 1600)
+++ trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2010-01-08 11:31:50 UTC (rev 1601)
@@ -155,7 +155,7 @@
[#if (colmap.valueType??)]valueType: '${colmap.valueType}'[/#if]
})),
renderer : function(v, p, record){
- return v ? '<img border="0" alt="" src="${request.contextPath}/mediaObject' + v + '/resolutions/thumbnail/data.jpg"/>' : v;
+ return v ? '<img border="0" alt="" src="${request.contextPath}/mediaObject' + v + '/resolutions/thumbnail/data.jpg" [#if (colmap.previewWidth??)]width="${colmap.previewWidth}"[/#if] [#if (colmap.previewHeight??)]height="${colmap.previewHeight}"[/#if]/>' : v;
}
[#elseif (colmap.type?? && colmap.type = 'fckedit')]
editor: new Ed(new FckEditorField({
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-03-05 18:12:58
|
Revision: 2098
http://openutils.svn.sourceforge.net/openutils/?rev=2098&view=rev
Author: diego_schivo
Date: 2010-03-05 18:12:50 +0000 (Fri, 05 Mar 2010)
Log Message:
-----------
CONTROLS-19 javascript string escaping
Modified Paths:
--------------
trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
Modified: trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2010-03-05 14:56:56 UTC (rev 2097)
+++ trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2010-03-05 18:12:50 UTC (rev 2098)
@@ -112,7 +112,7 @@
[#list configuration.columns?values as colmap]
[#if (colmap.type?? && colmap.type = 'checkbox')]
checkColumns.push(new Ext.grid.CheckColumn({
- header: '${colmap.header}',
+ header: '${colmap.header?js_string}',
dataIndex: '${colmap_index}',
width: 40
}));
@@ -126,7 +126,7 @@
checkColumns[checkIndex++]
[#else]
{
- header: '${colmap.header}',
+ header: '${colmap.header?js_string}',
dataIndex: '${colmap_index}',
sortable: false,
[#if (colmap.type?? && (colmap.type = 'link' || colmap.type = 'uuidLink'))]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <car...@us...> - 2010-04-23 14:49:12
|
Revision: 2297
http://openutils.svn.sourceforge.net/openutils/?rev=2297&view=rev
Author: carlocolombo
Date: 2010-04-23 14:49:06 +0000 (Fri, 23 Apr 2010)
Log Message:
-----------
[CONTROLS-22]Column headers get through messages
Modified Paths:
--------------
trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
Modified: trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2010-04-23 14:46:11 UTC (rev 2296)
+++ trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2010-04-23 14:49:06 UTC (rev 2297)
@@ -112,7 +112,7 @@
[#list configuration.columns?values as colmap]
[#if (colmap.type?? && colmap.type = 'checkbox')]
checkColumns.push(new Ext.grid.CheckColumn({
- header: '${colmap.header?js_string}',
+ header: '${msgs.get(colmap.header?js_string)}',
dataIndex: '${colmap_index}',
width: 40
}));
@@ -126,7 +126,7 @@
checkColumns[checkIndex++]
[#else]
{
- header: '${colmap.header?js_string}',
+ header: '${msgs.get(colmap.header?js_string)}',
dataIndex: '${colmap_index}',
sortable: false,
[#if (colmap.type?? && (colmap.type = 'link' || colmap.type = 'uuidLink'))]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-05-03 08:56:39
|
Revision: 2335
http://openutils.svn.sourceforge.net/openutils/?rev=2335&view=rev
Author: fgiust
Date: 2010-05-03 08:56:33 +0000 (Mon, 03 May 2010)
Log Message:
-----------
CONTROLS-25 Add a default row number for the grid control
Modified Paths:
--------------
trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
Modified: trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2010-05-02 19:51:57 UTC (rev 2334)
+++ trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2010-05-03 08:56:33 UTC (rev 2335)
@@ -90,7 +90,7 @@
// <![CDATA[
function loadTable${key}(action) {
- var numOfRows= ${configuration.rows};
+ var numOfRows= ${configuration.rows!10};
var hidden = document.getElementById('${name}');
var rows = hidden.value.split(/\r?\n/);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-05-03 09:38:35
|
Revision: 2336
http://openutils.svn.sourceforge.net/openutils/?rev=2336&view=rev
Author: fgiust
Date: 2010-05-03 09:38:29 +0000 (Mon, 03 May 2010)
Log Message:
-----------
CONTROLS-22 load i18n labels with default
Modified Paths:
--------------
trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
Modified: trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2010-05-03 08:56:33 UTC (rev 2335)
+++ trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2010-05-03 09:38:29 UTC (rev 2336)
@@ -112,7 +112,7 @@
[#list configuration.columns?values as colmap]
[#if (colmap.type?? && colmap.type = 'checkbox')]
checkColumns.push(new Ext.grid.CheckColumn({
- header: '${msgs.get(colmap.header?js_string)}',
+ header: '${msgs.getWithDefault(colmap.header?js_string, colmap.header?js_string)}',
dataIndex: '${colmap_index}',
width: 40
}));
@@ -126,7 +126,7 @@
checkColumns[checkIndex++]
[#else]
{
- header: '${msgs.get(colmap.header?js_string)}',
+ header: '${msgs.getWithDefault(colmap.header?js_string, colmap.header?js_string)}',
dataIndex: '${colmap_index}',
sortable: false,
[#if (colmap.type?? && (colmap.type = 'link' || colmap.type = 'uuidLink'))]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-06-17 16:29:48
|
Revision: 2657
http://openutils.svn.sourceforge.net/openutils/?rev=2657&view=rev
Author: diego_schivo
Date: 2010-06-17 16:29:42 +0000 (Thu, 17 Jun 2010)
Log Message:
-----------
CONTROLS-26 grid rows number initialization
Modified Paths:
--------------
trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
Modified: trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2010-06-17 14:56:06 UTC (rev 2656)
+++ trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2010-06-17 16:29:42 UTC (rev 2657)
@@ -86,14 +86,21 @@
[/#if]
[/#list]
+
<script type="text/javascript">
// <![CDATA[
function loadTable${key}(action) {
- var numOfRows= ${configuration.rows!10};
-
var hidden = document.getElementById('${name}');
var rows = hidden.value.split(/\r?\n/);
+
+ [#assign addRowEnabled = (configuration['addRowEnabled']!false)?string == 'true']
+ [#assign cfgRows = configuration.rows!10]
+ [#if (addRowEnabled)]
+ var numOfRows= Math.max(${cfgRows}, rows.length);
+ [#else]
+ var numOfRows= ${cfgRows};
+ [/#if]
var i, myData = [];
for (i = 0; i < numOfRows; i++) {
@@ -253,7 +260,7 @@
handler: function() {
dataStore.add(new dataStore.recordType({}));
},
- disabled: ${((configuration['addRowEnabled']!false)?string == 'false')?string}
+ disabled: ${(!addRowEnabled)?string}
}],
viewConfig: {
forceFit: true
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-06-17 16:33:58
|
Revision: 2659
http://openutils.svn.sourceforge.net/openutils/?rev=2659&view=rev
Author: diego_schivo
Date: 2010-06-17 16:33:52 +0000 (Thu, 17 Jun 2010)
Log Message:
-----------
CONTROLS-26 button moved to first position
Modified Paths:
--------------
trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
Modified: trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2010-06-17 16:31:24 UTC (rev 2658)
+++ trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2010-06-17 16:33:52 UTC (rev 2659)
@@ -200,6 +200,15 @@
clicksToEdit: 1,
renderTo: 'grid-${name}',
tbar: [{
+ text: 'Add row',
+ tooltip: 'Add row',
+ icon: '${request.contextPath}/.resources/controls/img/icon-add.png',
+ iconCls: 'button-add',
+ handler: function() {
+ dataStore.add(new dataStore.recordType({}));
+ },
+ disabled: ${(!addRowsEnabled)?string}
+ }, {
text: 'Clear all',
tooltip: 'Clear all',
icon: '${request.contextPath}/.resources/controls/img/icon-delete.png',
@@ -252,15 +261,6 @@
handler: function() {
gridMoveRow(grid, 1);
}
- }, {
- text: 'Add row',
- tooltip: 'Add row',
- icon: '${request.contextPath}/.resources/controls/img/icon-add.png',
- iconCls: 'button-add',
- handler: function() {
- dataStore.add(new dataStore.recordType({}));
- },
- disabled: ${(!addRowsEnabled)?string}
}],
viewConfig: {
forceFit: true
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-06-17 17:08:32
|
Revision: 2660
http://openutils.svn.sourceforge.net/openutils/?rev=2660&view=rev
Author: diego_schivo
Date: 2010-06-17 17:08:26 +0000 (Thu, 17 Jun 2010)
Log Message:
-----------
CONTROLS-26 initialization of new record
Modified Paths:
--------------
trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
Modified: trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2010-06-17 16:33:52 UTC (rev 2659)
+++ trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2010-06-17 17:08:26 UTC (rev 2660)
@@ -205,7 +205,7 @@
icon: '${request.contextPath}/.resources/controls/img/icon-add.png',
iconCls: 'button-add',
handler: function() {
- dataStore.add(new dataStore.recordType({}));
+ dataStore.add(new dataStore.recordType({[#list configuration.columns?values as colmap]'${colmap_index}':''[#if colmap_has_next],[/#if][/#list]}));
},
disabled: ${(!addRowsEnabled)?string}
}, {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-06-17 18:17:40
|
Revision: 2661
http://openutils.svn.sourceforge.net/openutils/?rev=2661&view=rev
Author: diego_schivo
Date: 2010-06-17 18:17:29 +0000 (Thu, 17 Jun 2010)
Log Message:
-----------
CONTROLS-29 adjusting grid width on window resize
Modified Paths:
--------------
trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
Modified: trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2010-06-17 17:08:26 UTC (rev 2660)
+++ trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2010-06-17 18:17:29 UTC (rev 2661)
@@ -270,6 +270,11 @@
grid.view.fitColumns();
grid.view.onHeaderChange();
+ window.onresize = function() {
+ eventHandlerOnResize();
+ grid.setWidth(grid.container.getWidth());
+ };
+
grid.on('afteredit', function(grid) {
var dat = grid.grid.store.data;
var cm = grid.grid.getColumnModel();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-06-18 06:58:07
|
Revision: 2668
http://openutils.svn.sourceforge.net/openutils/?rev=2668&view=rev
Author: diego_schivo
Date: 2010-06-18 06:58:01 +0000 (Fri, 18 Jun 2010)
Log Message:
-----------
CONTROLS-29 Ext.EventManager.onWindowResize
Modified Paths:
--------------
trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
Modified: trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2010-06-18 06:51:48 UTC (rev 2667)
+++ trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2010-06-18 06:58:01 UTC (rev 2668)
@@ -270,10 +270,9 @@
grid.view.fitColumns();
grid.view.onHeaderChange();
- window.onresize = function() {
- eventHandlerOnResize();
+ Ext.EventManager.onWindowResize(function(){
grid.setWidth(grid.container.getWidth());
- };
+ });
grid.on('afteredit', function(grid) {
var dat = grid.grid.store.data;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-09-01 14:00:54
|
Revision: 2989
http://openutils.svn.sourceforge.net/openutils/?rev=2989&view=rev
Author: diego_schivo
Date: 2010-09-01 14:00:48 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
CONTROLS-35 fix freemarker error when column type is not found
Modified Paths:
--------------
trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
Modified: trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2010-09-01 13:44:13 UTC (rev 2988)
+++ trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2010-09-01 14:00:48 UTC (rev 2989)
@@ -175,7 +175,7 @@
var colModel = new Ext.grid.ColumnModel([
[#list configuration.columns?values as colmap]
- ${gridColumnTypes[colmap.type!'text'].drawColumnJs(name, colmap_index, colmap, msgs)}[#if colmap_has_next],[/#if]
+ ${(gridColumnTypes[colmap.type!'text']!gridColumnTypes['text']).drawColumnJs(name, colmap_index, colmap, msgs)}[#if colmap_has_next],[/#if]
[/#list]
]);
colModel.defaultSortable = true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-10-27 10:13:38
|
Revision: 3674
http://openutils.svn.sourceforge.net/openutils/?rev=3674&view=rev
Author: diego_schivo
Date: 2011-10-27 10:13:29 +0000 (Thu, 27 Oct 2011)
Log Message:
-----------
gridInsertRow
Modified Paths:
--------------
trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
Modified: trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2011-10-22 06:20:23 UTC (rev 3673)
+++ trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2011-10-27 10:13:29 UTC (rev 3674)
@@ -53,11 +53,9 @@
row = cell0 + i;
record = grid.store.getAt(row);
if (!record && expand) {
- if (!rt) {
- rt = {};
- for (j = 0; j < J; j++) {
- rt[''+j] = '';
- }
+ rt = {};
+ for (j = 0; j < J; j++) {
+ rt[''+j] = '';
}
record = new grid.store.recordType(rt);
grid.store.add(record);
@@ -128,6 +126,62 @@
}
}
+function gridInsertRow(grid) {
+ if (grid.selModel.selection) {
+ var j = grid.selModel.selection.cell[0], k, K = grid.colModel.getColumnCount(), rt = {};
+ for (k = 0; k < K; k++) {
+ rt[''+k] = '';
+ }
+ record = new grid.store.recordType(rt);
+ grid.store.insert(j, record);
+ }
+}
+
+function gridDeleteRow(grid) {
+ if (grid.selModel.selection) {
+ var dat = grid.store.data, r1, r2, j1, j2, k, K = grid.colModel.getColumnCount(), field, e1, e2;
+ for (j1 = grid.selModel.selection.cell[0]; j1 < dat.length - 2; j1++) {
+ j2 = j1 + 1;
+ r1 = grid.store.getAt(j1);
+ r2 = grid.store.getAt(j2);
+ for (k = 0; k < K; k++) {
+ field = grid.colModel.getDataIndex(k);
+ e1 = {
+ grid: grid,
+ record: r1,
+ field: field,
+ originalValue: r1.data[field],
+ value: r2.data[field],
+ row: j1,
+ column: k,
+ cancel: false
+ };
+ e2 = {
+ grid: grid,
+ record: r2,
+ field: field,
+ originalValue: r2.data[field],
+ value: '',
+ row: j2,
+ column: k,
+ cancel: false
+ };
+ if(grid.fireEvent("validateedit", e1) !== false && !e1.cancel && grid.fireEvent("validateedit", e2) !== false && !e2.cancel){
+ r1.set(field, e1.value);
+ delete e1.cancel;
+ grid.fireEvent("afteredit", e1);
+
+ r2.set(field, e2.value);
+ delete e2.cancel;
+ grid.fireEvent("afteredit", e2);
+
+ grid.selModel.select(j2, grid.selModel.selection.cell[1]);
+ }
+ }
+ }
+ }
+}
+
// ]]>
</script>
@@ -247,21 +301,37 @@
mgnlOpenWindow('/.resources/controls/clipboard.html?name=${name}&expand=${addRowsEnabled?string}', 320, 200);
}
}, {
- text: 'Move up',
- tooltip: 'Move up',
+ text: '',
+ tooltip: 'Move row up',
icon: '${request.contextPath}/.resources/controls/img/icon-move-up.png',
iconCls: 'button-move-up',
handler: function() {
gridMoveRow(grid, -1);
}
}, {
- text: 'Move down',
- tooltip: 'Move down',
+ text: '',
+ tooltip: 'Move row down',
icon: '${request.contextPath}/.resources/controls/img/icon-move-down.png',
iconCls: 'button-move-down',
handler: function() {
gridMoveRow(grid, 1);
}
+ }, {
+ text: '',
+ tooltip: 'Insert row',
+ icon: '${request.contextPath}/.resources/controls/img/icon-add.png',
+ iconCls: 'button-insert-row',
+ handler: function() {
+ gridInsertRow(grid);
+ }
+ }, {
+ text: '',
+ tooltip: 'Delete row',
+ icon: '${request.contextPath}/.resources/controls/img/icon-delete.png',
+ iconCls: 'button-delete-row',
+ handler: function() {
+ gridDeleteRow(grid);
+ }
}],
[#if (configuration.height??)]
height: ${configuration.height},
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-10-27 10:16:37
|
Revision: 3675
http://openutils.svn.sourceforge.net/openutils/?rev=3675&view=rev
Author: diego_schivo
Date: 2011-10-27 10:16:26 +0000 (Thu, 27 Oct 2011)
Log Message:
-----------
gridInsertRow
Modified Paths:
--------------
trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
Modified: trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2011-10-27 10:13:29 UTC (rev 3674)
+++ trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2011-10-27 10:16:26 UTC (rev 3675)
@@ -132,8 +132,10 @@
for (k = 0; k < K; k++) {
rt[''+k] = '';
}
+ k = grid.selModel.selection.cell[1];
record = new grid.store.recordType(rt);
grid.store.insert(j, record);
+ grid.selModel.select(j, k);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-10-27 10:29:32
|
Revision: 3676
http://openutils.svn.sourceforge.net/openutils/?rev=3676&view=rev
Author: diego_schivo
Date: 2011-10-27 10:29:26 +0000 (Thu, 27 Oct 2011)
Log Message:
-----------
gridInsertRow
Modified Paths:
--------------
trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
Modified: trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2011-10-27 10:16:26 UTC (rev 3675)
+++ trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2011-10-27 10:29:26 UTC (rev 3676)
@@ -126,13 +126,17 @@
}
}
-function gridInsertRow(grid) {
+function gridInsertRow(grid, expand) {
if (grid.selModel.selection) {
- var j = grid.selModel.selection.cell[0], k, K = grid.colModel.getColumnCount(), rt = {};
+ var j = grid.selModel.selection.cell[0], k, K = grid.colModel.getColumnCount(), rt = {}, record;
for (k = 0; k < K; k++) {
rt[''+k] = '';
}
k = grid.selModel.selection.cell[1];
+ if (!expand) {
+ record = grid.store.getAt(grid.store.data.length - 1);
+ grid.store.remove(record);
+ }
record = new grid.store.recordType(rt);
grid.store.insert(j, record);
grid.selModel.select(j, k);
@@ -324,7 +328,7 @@
icon: '${request.contextPath}/.resources/controls/img/icon-add.png',
iconCls: 'button-insert-row',
handler: function() {
- gridInsertRow(grid);
+ gridInsertRow(grid, ${addRowsEnabled?string});
}
}, {
text: '',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-10-27 10:44:15
|
Revision: 3677
http://openutils.svn.sourceforge.net/openutils/?rev=3677&view=rev
Author: diego_schivo
Date: 2011-10-27 10:44:06 +0000 (Thu, 27 Oct 2011)
Log Message:
-----------
gridDeleteRow
Modified Paths:
--------------
trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
Modified: trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2011-10-27 10:29:26 UTC (rev 3676)
+++ trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2011-10-27 10:44:06 UTC (rev 3677)
@@ -126,65 +126,37 @@
}
}
-function gridInsertRow(grid, expand) {
+function gridInsertRow(grid, fixedRows) {
if (grid.selModel.selection) {
- var j = grid.selModel.selection.cell[0], k, K = grid.colModel.getColumnCount(), rt = {}, record;
+ var c0 = grid.selModel.selection.cell[0], c1 = grid.selModel.selection.cell[1], k, K = grid.colModel.getColumnCount(), rt, record;
+ rt = {};
for (k = 0; k < K; k++) {
rt[''+k] = '';
}
- k = grid.selModel.selection.cell[1];
- if (!expand) {
+ if (fixedRows) {
record = grid.store.getAt(grid.store.data.length - 1);
grid.store.remove(record);
}
record = new grid.store.recordType(rt);
- grid.store.insert(j, record);
- grid.selModel.select(j, k);
+ grid.store.insert(c0, record);
+ grid.selModel.select(c0, c1);
}
}
-function gridDeleteRow(grid) {
+function gridDeleteRow(grid, fixedRows) {
if (grid.selModel.selection) {
- var dat = grid.store.data, r1, r2, j1, j2, k, K = grid.colModel.getColumnCount(), field, e1, e2;
- for (j1 = grid.selModel.selection.cell[0]; j1 < dat.length - 2; j1++) {
- j2 = j1 + 1;
- r1 = grid.store.getAt(j1);
- r2 = grid.store.getAt(j2);
+ var c0 = grid.selModel.selection.cell[0], c1 = grid.selModel.selection.cell[1], k, K = grid.colModel.getColumnCount(), rt, record;
+ record = grid.store.getAt(c0);
+ grid.store.remove(record);
+ if (fixedRows) {
+ rt = {};
for (k = 0; k < K; k++) {
- field = grid.colModel.getDataIndex(k);
- e1 = {
- grid: grid,
- record: r1,
- field: field,
- originalValue: r1.data[field],
- value: r2.data[field],
- row: j1,
- column: k,
- cancel: false
- };
- e2 = {
- grid: grid,
- record: r2,
- field: field,
- originalValue: r2.data[field],
- value: '',
- row: j2,
- column: k,
- cancel: false
- };
- if(grid.fireEvent("validateedit", e1) !== false && !e1.cancel && grid.fireEvent("validateedit", e2) !== false && !e2.cancel){
- r1.set(field, e1.value);
- delete e1.cancel;
- grid.fireEvent("afteredit", e1);
-
- r2.set(field, e2.value);
- delete e2.cancel;
- grid.fireEvent("afteredit", e2);
-
- grid.selModel.select(j2, grid.selModel.selection.cell[1]);
- }
+ rt[''+k] = '';
}
+ record = new grid.store.recordType(rt);
+ grid.store.add(record);
}
+ grid.selModel.select(c0, c1);
}
}
@@ -328,7 +300,7 @@
icon: '${request.contextPath}/.resources/controls/img/icon-add.png',
iconCls: 'button-insert-row',
handler: function() {
- gridInsertRow(grid, ${addRowsEnabled?string});
+ gridInsertRow(grid, ${(!addRowsEnabled)?string});
}
}, {
text: '',
@@ -336,7 +308,7 @@
icon: '${request.contextPath}/.resources/controls/img/icon-delete.png',
iconCls: 'button-delete-row',
handler: function() {
- gridDeleteRow(grid);
+ gridDeleteRow(grid, ${(!addRowsEnabled)?string});
}
}],
[#if (configuration.height??)]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-10-27 12:10:44
|
Revision: 3679
http://openutils.svn.sourceforge.net/openutils/?rev=3679&view=rev
Author: diego_schivo
Date: 2011-10-27 12:10:38 +0000 (Thu, 27 Oct 2011)
Log Message:
-----------
afteredit
Modified Paths:
--------------
trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
Modified: trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2011-10-27 11:04:18 UTC (rev 3678)
+++ trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2011-10-27 12:10:38 UTC (rev 3679)
@@ -140,6 +140,7 @@
record = new grid.store.recordType(rt);
grid.store.insert(c0, record);
grid.selModel.select(c0, c1);
+ grid.fireEvent("afteredit", { grid: grid });
}
}
@@ -157,6 +158,7 @@
grid.store.add(record);
}
grid.selModel.select(c0, c1);
+ grid.fireEvent("afteredit", { grid: grid });
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2012-03-05 14:40:28
|
Revision: 3743
http://openutils.svn.sourceforge.net/openutils/?rev=3743&view=rev
Author: diego_schivo
Date: 2012-03-05 14:40:19 +0000 (Mon, 05 Mar 2012)
Log Message:
-----------
CONTROLS-43 fix
Modified Paths:
--------------
trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
Modified: trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2012-02-27 11:23:07 UTC (rev 3742)
+++ trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2012-03-05 14:40:19 UTC (rev 3743)
@@ -167,7 +167,7 @@
<link rel="stylesheet" type="text/css" href="${request.contextPath}/.resources/ext/css/ext-all.css" />
<link rel="stylesheet" type="text/css" href="${request.contextPath}/.resources/controls/css/grid.css" />
- <!--[if IE 6]>
+ <!--[if lte IE 7]>
<link rel="stylesheet" type="text/css" href="${request.contextPath}/.resources/controls/css/grid-ie6fix.css" />
<![endif]-->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X