Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[3496] trunk/openutils-mgnlcontrols/src/main
|
From: <die...@us...> - 2011-05-27 06:28:20
|
Revision: 3496
http://openutils.svn.sourceforge.net/openutils/?rev=3496&view=rev
Author: diego_schivo
Date: 2011-05-27 06:28:14 +0000 (Fri, 27 May 2011)
Log Message:
-----------
CONTROLS-37 Handle enterMode (p/br) setting for FCKEditor column on grid control
Modified Paths:
--------------
trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java
trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/grid-fckeditor.html
trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/FckEditorField.js
Modified: trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java 2011-05-27 06:25:04 UTC (rev 3495)
+++ trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java 2011-05-27 06:28:14 UTC (rev 3496)
@@ -51,6 +51,13 @@
protected void addColumnData(Map<String, String> column, String propertyName, int colIndex, Map colMap,
Messages msgs)
{
- column.put("editor", "new Ed(new FckEditorField({contextPath: '" + MgnlContext.getContextPath() + "'}))");
+ StringBuilder sb = new StringBuilder();
+ sb.append("new Ed(new FckEditorField({contextPath: '" + MgnlContext.getContextPath() + "'");
+ if (colMap.get("enterMode") != null)
+ {
+ sb.append(", enterMode: '" + String.valueOf(colMap.get("enterMode")) + "'");
+ }
+ sb.append("}))");
+ column.put("editor", sb.toString());
}
}
Modified: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/grid-fckeditor.html
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/grid-fckeditor.html 2011-05-27 06:25:04 UTC (rev 3495)
+++ trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/grid-fckeditor.html 2011-05-27 06:28:14 UTC (rev 3496)
@@ -11,6 +11,12 @@
</head>
<body style="padding:0;margin:0">
<script type="text/javascript">
+var urlParams={};
+var t=document.location.search.substr(1).split('&');
+for (var i=0;i<t.length;i++) {
+ var s=t[i].split('=');
+ urlParams[decodeURIComponent(s[0])]=decodeURIComponent(s[1]);
+}
if( window.MgnlFCKConfigs == null)
window.MgnlFCKConfigs = new Object();
MgnlFCKConfigs.grid = new Object();
@@ -22,7 +28,7 @@
MgnlFCKConfigs.grid.colors = '';
MgnlFCKConfigs.grid.styles = '';
MgnlFCKConfigs.grid.templates = '';
-MgnlFCKConfigs.grid.enterMode = 'p';
+MgnlFCKConfigs.grid.enterMode = urlParams['enterMode'] || 'p';
MgnlFCKConfigs.grid.shiftEnterMode = 'br';
MgnlFCKConfigs.grid.lists = true;
MgnlFCKConfigs.grid.alignment = false;
Modified: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/FckEditorField.js
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/FckEditorField.js 2011-05-27 06:25:04 UTC (rev 3495)
+++ trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/FckEditorField.js 2011-05-27 06:28:14 UTC (rev 3496)
@@ -4,6 +4,8 @@
contextPath: '',
+ enterMode: '',
+
getContextPath: function() {
return this.contextPath;
},
@@ -15,7 +17,7 @@
window.setFckEditorValue = function(value) {
this.setValue(value);
}.createDelegate(this);
- mgnlOpenWindow('/.resources/controls/grid-fckeditor.html', 880, 300);
+ mgnlOpenWindow('/.resources/controls/grid-fckeditor.html?enterMode=' + this.enterMode, 880, 300);
}
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
