Menu
▾
▴
openutils-svn
|
From: <df...@us...> - 2012-05-25 16:24:41
|
Revision: 4052
http://openutils.svn.sourceforge.net/openutils/?rev=4052&view=rev
Author: dfghi
Date: 2012-05-25 16:24:35 +0000 (Fri, 25 May 2012)
Log Message:
-----------
CONTROLS-47 Backport of r4050: Extended combobox to prevent value display in some cases.
Revision Links:
--------------
http://openutils.svn.sourceforge.net/openutils/?rev=4050&view=rev
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/PipeComboBox.js
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java 2012-05-25 16:16:57 UTC (rev 4051)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java 2012-05-25 16:24:35 UTC (rev 4052)
@@ -43,9 +43,20 @@
@Override
public String getHeadSnippet()
{
- return "<script type=\"text/javascript\" src=\""
- + MgnlContext.getContextPath()
- + "/.resources/controls/js/PipeComboBox.js\"></script>";
+ StringBuilder result = new StringBuilder(super.getHeadSnippet());
+ result.append("<script type=\"text/javascript\" src=\"");
+ result.append(MgnlContext.getContextPath());
+ result.append("/.resources/controls/js/PipeComboBox.js\"></script>");
+ // Combobox must be patched because of a bug. For reference, see:
+ // http://www.sencha.com/forum/showthread.php?17465-1.1.1-Local-ComboBox-data-store-filter-not-cleared-on-call-to-setValue%28%29
+ result.append("var PatchedComboBox = Ext.extend(Ext.form.ComboBox, {");
+ result.append(" setValue: function(v) {");
+ result.append(" this.store.clearFilter();");
+ result.append(" PatchedComboBox.superclass.setValue.call(this, v);");
+ result.append(" }");
+ result.append("});\n");
+ result.append("</script>");
+ return result.toString();
}
/**
@@ -89,7 +100,7 @@
column.put(
"editor",
"(function() { window.gridComboColumnTypeTmp = new "
- + ("true".equals(String.valueOf(colMap.get("pipe"))) ? "PipeComboBox" : "fm.ComboBox")
+ + ("true".equals(String.valueOf(colMap.get("pipe"))) ? "PipeComboBox" : "PatchedComboBox")
+ "({"
+ StringUtils.join(options, ",")
+ "}); return new Ed(gridComboColumnTypeTmp); })()");
@@ -103,7 +114,7 @@
else
{
column.put("editor", "new Ed(new "
- + ("true".equals(String.valueOf(colMap.get("pipe"))) ? "PipeComboBox" : "fm.ComboBox")
+ + ("true".equals(String.valueOf(colMap.get("pipe"))) ? "PipeComboBox" : "PatchedComboBox")
+ "({"
+ StringUtils.join(options, ",")
+ "}))");
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/PipeComboBox.js
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/PipeComboBox.js 2012-05-25 16:16:57 UTC (rev 4051)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/PipeComboBox.js 2012-05-25 16:24:35 UTC (rev 4052)
@@ -4,7 +4,14 @@
var v = PipeComboBox.superclass.getValue.call(this);
return this.lastSelectionText + '|' + v;
},
-
+
+ // Combobox must be patched because of a bug. For reference, see:
+ // http://www.sencha.com/forum/showthread.php?17465-1.1.1-Local-ComboBox-data-store-filter-not-cleared-on-call-to-setValue%28%29
+ setValue: function(v) {
+ this.store.clearFilter();
+ PipeComboBox.superclass.setValue.call(this, v);
+ },
+
findRecord : function(prop, value) {
return PipeComboBox.superclass.findRecord.call(this, prop, value.replace(/^.*\|(.*)$/, '$1'));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2012-08-20 10:21:48
|
Revision: 4113
http://openutils.svn.sourceforge.net/openutils/?rev=4113&view=rev
Author: diego_schivo
Date: 2012-08-20 10:21:41 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
CONTROLS-53 Grid control: insert module version into url of column-type javascript files
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/CheckboxGridColumnType.java
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ColorGridColumnType.java
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FileGridColumnType.java
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.java
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java
Added Paths:
-----------
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.virtualURIMapping.jsversion.xml
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/CheckboxGridColumnType.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/CheckboxGridColumnType.java 2012-08-20 09:41:28 UTC (rev 4112)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/CheckboxGridColumnType.java 2012-08-20 10:21:41 UTC (rev 4113)
@@ -23,6 +23,7 @@
import info.magnolia.cms.i18n.Messages;
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import java.util.Map;
@@ -47,7 +48,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/CheckColumn.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/CheckColumn.js\"></script>";
}
/**
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ColorGridColumnType.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ColorGridColumnType.java 2012-08-20 09:41:28 UTC (rev 4112)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ColorGridColumnType.java 2012-08-20 10:21:41 UTC (rev 4113)
@@ -21,6 +21,7 @@
import info.magnolia.cms.i18n.Messages;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import java.util.Map;
@@ -41,7 +42,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/ColorField.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/ColorField.js\"></script>";
}
/**
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java 2012-08-20 09:41:28 UTC (rev 4112)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java 2012-08-20 10:21:41 UTC (rev 4113)
@@ -21,6 +21,7 @@
import info.magnolia.cms.i18n.Messages;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import java.util.ArrayList;
import java.util.List;
@@ -46,7 +47,9 @@
StringBuilder result = new StringBuilder(super.getHeadSnippet());
result.append("<script type=\"text/javascript\" src=\"");
result.append(MgnlContext.getContextPath());
- result.append("/.resources/controls/js/PipeComboBox.js\"></script>");
+ result.append("/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/PipeComboBox.js\"></script>");
// Combobox must be patched because of a bug. For reference, see:
// http://www.sencha.com/forum/showthread.php?17465-1.1.1-Local-ComboBox-data-store-filter-not-cleared-on-call-to-setValue%28%29
result.append("<script type=\"text/javascript\">");
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java 2012-08-20 09:41:28 UTC (rev 4112)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java 2012-08-20 10:21:41 UTC (rev 4113)
@@ -30,6 +30,7 @@
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import info.magnolia.module.admininterface.SaveHandlerImpl;
import java.io.File;
@@ -75,7 +76,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/EditCodeField.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/EditCodeField.js\"></script>";
}
/**
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java 2012-08-20 09:41:28 UTC (rev 4112)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java 2012-08-20 10:21:41 UTC (rev 4113)
@@ -21,6 +21,7 @@
import info.magnolia.cms.i18n.Messages;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import java.util.Map;
@@ -41,7 +42,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/FckEditorField.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/FckEditorField.js\"></script>";
}
/**
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FileGridColumnType.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FileGridColumnType.java 2012-08-20 09:41:28 UTC (rev 4112)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FileGridColumnType.java 2012-08-20 10:21:41 UTC (rev 4113)
@@ -30,6 +30,7 @@
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import info.magnolia.module.admininterface.SaveHandlerImpl;
import java.io.IOException;
@@ -64,7 +65,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/FileField.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/FileField.js\"></script>";
}
/**
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.java 2012-08-20 09:41:28 UTC (rev 4112)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.java 2012-08-20 10:21:41 UTC (rev 4113)
@@ -21,6 +21,7 @@
import info.magnolia.cms.i18n.Messages;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import java.util.ArrayList;
import java.util.List;
@@ -45,7 +46,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/LinkField.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/LinkField.js\"></script>";
}
/**
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java 2012-08-20 09:41:28 UTC (rev 4112)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java 2012-08-20 10:21:41 UTC (rev 4113)
@@ -26,6 +26,7 @@
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import java.util.ArrayList;
import java.util.List;
@@ -52,7 +53,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/UUIDLinkField.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/UUIDLinkField.js\"></script>";
}
/**
Added: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.virtualURIMapping.jsversion.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.virtualURIMapping.jsversion.xml (rev 0)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.virtualURIMapping.jsversion.xml 2012-08-20 10:21:41 UTC (rev 4113)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="jsversion" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>e17ff712-3a80-425e-aa30-c3f90975385c</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>info.magnolia.cms.beans.config.RegexpVirtualURIMapping</sv:value>
+ </sv:property>
+ <sv:property sv:name="fromURI" sv:type="String">
+ <sv:value>/.resources/controls/[^/]+/js/(.*)</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="toURI" sv:type="String">
+ <sv:value>forward:/.resources/controls/js/$1</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>MetaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="String">
+ <sv:value>2004-11-02T15:34:20.479+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2012-08-20T12:16:53.943+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
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