details: https://code.openbravo.com/erp/devel/pi/rev/bdbc4e96cb77
changeset: 19409:bdbc4e96cb77
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Jan 24 00:29:43 2013 +0100
summary: Related to issue 22874: Implement rich and masked text field
First implementation
diffstat:
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml
| 2 +-
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml
| 6 +-
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
|
77 +
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
| 2 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-richtext.js
| 155 +++
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-text.js
| 3 +
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js
| 35 +
modules/org.openbravo.client.kernel/src-db/database/model/tables/OBCLKER_REF_MASK.xml
|
58 +
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_COLUMN.xml
| 388 ++++++++++
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_ELEMENT.xml
| 25 +
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_FIELD.xml
| 192 ++++
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_REFERENCE.xml
| 47 +
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_TAB.xml
| 26 +
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_TABLE.xml
| 20 +
modules/org.openbravo.client.kernel/src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml
| 20
+
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/MaskedStringUIDefinition.java
| 43 +
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/RichTextUIDefinition.java
| 57 +
17 files changed, 1153 insertions(+), 3 deletions(-)
diffs (truncated from 1453 to 300 lines):
diff -r 6c1c82b172f4 -r bdbc4e96cb77
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml
Wed Jan 23 18:16:09 2013 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml
Thu Jan 24 00:29:43 2013 +0100
@@ -5865,7 +5865,7 @@
<!--CD3A95C8A05D45A0A2B6D250E9C83170-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
<!--CD3A95C8A05D45A0A2B6D250E9C83170-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
<!--CD3A95C8A05D45A0A2B6D250E9C83170-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
-<!--CD3A95C8A05D45A0A2B6D250E9C83170--> <POSITION><![CDATA[51]]></POSITION>
+<!--CD3A95C8A05D45A0A2B6D250E9C83170--> <POSITION><![CDATA[52]]></POSITION>
<!--CD3A95C8A05D45A0A2B6D250E9C83170-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
<!--CD3A95C8A05D45A0A2B6D250E9C83170--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
<!--CD3A95C8A05D45A0A2B6D250E9C83170-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
diff -r 6c1c82b172f4 -r bdbc4e96cb77
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml
Wed Jan 23 18:16:09 2013 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml
Thu Jan 24 00:29:43 2013 +0100
@@ -2148,7 +2148,8 @@
<!--87DDE03149A94326BE55DC158625D244-->
<AD_COLUMN_ID><![CDATA[B2DDC4BECBF24431AB1940C2A38F9C54]]></AD_COLUMN_ID>
<!--87DDE03149A94326BE55DC158625D244-->
<IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
<!--87DDE03149A94326BE55DC158625D244-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--87DDE03149A94326BE55DC158625D244-->
<DISPLAYLOGIC><![CDATA[@OBUIAPP_Field_Reference@ =
'FF8080813123BF670131241C2BB30012' | @OBUIAPP_Field_Reference@ =
'14']]></DISPLAYLOGIC>
+<!--87DDE03149A94326BE55DC158625D244-->
<DISPLAYLOGIC><![CDATA[@OBUIAPP_Field_Reference@ =
'FF8080813123BF670131241C2BB30012' | @OBUIAPP_Field_Reference@ = '14' |
+@OBUIAPP_Field_Reference@ =
'7CB371C13D204EB69BF370217F692999']]></DISPLAYLOGIC>
<!--87DDE03149A94326BE55DC158625D244-->
<DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
<!--87DDE03149A94326BE55DC158625D244--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--87DDE03149A94326BE55DC158625D244--> <SEQNO><![CDATA[62]]></SEQNO>
@@ -2682,7 +2683,8 @@
<!--B79252A201AA41C091F9498DF820A0AC-->
<AD_COLUMN_ID><![CDATA[1A96C47A27AC49D7BEA41E57BBD59948]]></AD_COLUMN_ID>
<!--B79252A201AA41C091F9498DF820A0AC-->
<IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
<!--B79252A201AA41C091F9498DF820A0AC-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--B79252A201AA41C091F9498DF820A0AC-->
<DISPLAYLOGIC><![CDATA[@OBUIAPP_Field_Reference@ =
'FF8080813123BF670131241C2BB30012' | @OBUIAPP_Field_Reference@ =
'14']]></DISPLAYLOGIC>
+<!--B79252A201AA41C091F9498DF820A0AC-->
<DISPLAYLOGIC><![CDATA[@OBUIAPP_Field_Reference@ =
'FF8080813123BF670131241C2BB30012' | @OBUIAPP_Field_Reference@ = '14'|
+@OBUIAPP_Field_Reference@ = '7CB371C13D204EB69BF370217F692999'
]]></DISPLAYLOGIC>
<!--B79252A201AA41C091F9498DF820A0AC-->
<DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
<!--B79252A201AA41C091F9498DF820A0AC--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--B79252A201AA41C091F9498DF820A0AC--> <SEQNO><![CDATA[64]]></SEQNO>
diff -r 6c1c82b172f4 -r bdbc4e96cb77
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Wed Jan 23 18:16:09 2013 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Thu Jan 24 00:29:43 2013 +0100
@@ -541,6 +541,17 @@
<!--6504DF0738A142D599C824644653BA88-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--6504DF0738A142D599C824644653BA88--></AD_MESSAGE>
+<!--66D4232BC6894DCEB71DAB06F9757BB3--><AD_MESSAGE>
+<!--66D4232BC6894DCEB71DAB06F9757BB3-->
<AD_MESSAGE_ID><![CDATA[66D4232BC6894DCEB71DAB06F9757BB3]]></AD_MESSAGE_ID>
+<!--66D4232BC6894DCEB71DAB06F9757BB3-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--66D4232BC6894DCEB71DAB06F9757BB3--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--66D4232BC6894DCEB71DAB06F9757BB3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--66D4232BC6894DCEB71DAB06F9757BB3-->
<VALUE><![CDATA[OBUIAPP_MakeSelectionBold]]></VALUE>
+<!--66D4232BC6894DCEB71DAB06F9757BB3--> <MSGTEXT><![CDATA[Make Selection
Bold]]></MSGTEXT>
+<!--66D4232BC6894DCEB71DAB06F9757BB3--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--66D4232BC6894DCEB71DAB06F9757BB3-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--66D4232BC6894DCEB71DAB06F9757BB3--></AD_MESSAGE>
+
<!--675524506E80458799E39F8CC309CBFD--><AD_MESSAGE>
<!--675524506E80458799E39F8CC309CBFD-->
<AD_MESSAGE_ID><![CDATA[675524506E80458799E39F8CC309CBFD]]></AD_MESSAGE_ID>
<!--675524506E80458799E39F8CC309CBFD-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -552,6 +563,17 @@
<!--675524506E80458799E39F8CC309CBFD-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--675524506E80458799E39F8CC309CBFD--></AD_MESSAGE>
+<!--67995E233DA64EDE9029395E900C21ED--><AD_MESSAGE>
+<!--67995E233DA64EDE9029395E900C21ED-->
<AD_MESSAGE_ID><![CDATA[67995E233DA64EDE9029395E900C21ED]]></AD_MESSAGE_ID>
+<!--67995E233DA64EDE9029395E900C21ED-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--67995E233DA64EDE9029395E900C21ED--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--67995E233DA64EDE9029395E900C21ED--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--67995E233DA64EDE9029395E900C21ED-->
<VALUE><![CDATA[OBUIAPP_MakeSelectionItalic]]></VALUE>
+<!--67995E233DA64EDE9029395E900C21ED--> <MSGTEXT><![CDATA[Make Selection
Italic]]></MSGTEXT>
+<!--67995E233DA64EDE9029395E900C21ED--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--67995E233DA64EDE9029395E900C21ED-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--67995E233DA64EDE9029395E900C21ED--></AD_MESSAGE>
+
<!--6831E84EB2124F08B3FCEF6F50CF8AD1--><AD_MESSAGE>
<!--6831E84EB2124F08B3FCEF6F50CF8AD1-->
<AD_MESSAGE_ID><![CDATA[6831E84EB2124F08B3FCEF6F50CF8AD1]]></AD_MESSAGE_ID>
<!--6831E84EB2124F08B3FCEF6F50CF8AD1-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -674,6 +696,17 @@
<!--7ACEA04C52F349C08E1157F64262ECC9-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--7ACEA04C52F349C08E1157F64262ECC9--></AD_MESSAGE>
+<!--7E82DFE4E6964861B0B9A8AA968E5AC7--><AD_MESSAGE>
+<!--7E82DFE4E6964861B0B9A8AA968E5AC7-->
<AD_MESSAGE_ID><![CDATA[7E82DFE4E6964861B0B9A8AA968E5AC7]]></AD_MESSAGE_ID>
+<!--7E82DFE4E6964861B0B9A8AA968E5AC7-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E82DFE4E6964861B0B9A8AA968E5AC7--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E82DFE4E6964861B0B9A8AA968E5AC7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E82DFE4E6964861B0B9A8AA968E5AC7-->
<VALUE><![CDATA[OBUIAPP_SetFontSize]]></VALUE>
+<!--7E82DFE4E6964861B0B9A8AA968E5AC7--> <MSGTEXT><![CDATA[Set Font
Size]]></MSGTEXT>
+<!--7E82DFE4E6964861B0B9A8AA968E5AC7--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--7E82DFE4E6964861B0B9A8AA968E5AC7-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--7E82DFE4E6964861B0B9A8AA968E5AC7--></AD_MESSAGE>
+
<!--7E8A12D43C0D404F868CE36DB349C9FC--><AD_MESSAGE>
<!--7E8A12D43C0D404F868CE36DB349C9FC-->
<AD_MESSAGE_ID><![CDATA[7E8A12D43C0D404F868CE36DB349C9FC]]></AD_MESSAGE_ID>
<!--7E8A12D43C0D404F868CE36DB349C9FC-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -719,6 +752,17 @@
<!--822D5C3E1A014738B4D39BF2BF568C7C-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--822D5C3E1A014738B4D39BF2BF568C7C--></AD_MESSAGE>
+<!--839DDEEC373B4151BC1C721AB90FB5AC--><AD_MESSAGE>
+<!--839DDEEC373B4151BC1C721AB90FB5AC-->
<AD_MESSAGE_ID><![CDATA[839DDEEC373B4151BC1C721AB90FB5AC]]></AD_MESSAGE_ID>
+<!--839DDEEC373B4151BC1C721AB90FB5AC-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--839DDEEC373B4151BC1C721AB90FB5AC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--839DDEEC373B4151BC1C721AB90FB5AC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--839DDEEC373B4151BC1C721AB90FB5AC-->
<VALUE><![CDATA[OBUIAPP_SetFont]]></VALUE>
+<!--839DDEEC373B4151BC1C721AB90FB5AC--> <MSGTEXT><![CDATA[Set
Font]]></MSGTEXT>
+<!--839DDEEC373B4151BC1C721AB90FB5AC--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--839DDEEC373B4151BC1C721AB90FB5AC-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--839DDEEC373B4151BC1C721AB90FB5AC--></AD_MESSAGE>
+
<!--888D0AF770AE4037B85120FB775FE038--><AD_MESSAGE>
<!--888D0AF770AE4037B85120FB775FE038-->
<AD_MESSAGE_ID><![CDATA[888D0AF770AE4037B85120FB775FE038]]></AD_MESSAGE_ID>
<!--888D0AF770AE4037B85120FB775FE038-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -873,6 +917,17 @@
<!--A57B3DD733264DB1BB3D6F84EA104931-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--A57B3DD733264DB1BB3D6F84EA104931--></AD_MESSAGE>
+<!--A62959A6990A43089EEBDF89CE8FCC48--><AD_MESSAGE>
+<!--A62959A6990A43089EEBDF89CE8FCC48-->
<AD_MESSAGE_ID><![CDATA[A62959A6990A43089EEBDF89CE8FCC48]]></AD_MESSAGE_ID>
+<!--A62959A6990A43089EEBDF89CE8FCC48-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A62959A6990A43089EEBDF89CE8FCC48--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A62959A6990A43089EEBDF89CE8FCC48--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A62959A6990A43089EEBDF89CE8FCC48-->
<VALUE><![CDATA[OBUIAPP_MakeSelectionUnderlined]]></VALUE>
+<!--A62959A6990A43089EEBDF89CE8FCC48--> <MSGTEXT><![CDATA[Make Selection
Underlined]]></MSGTEXT>
+<!--A62959A6990A43089EEBDF89CE8FCC48--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--A62959A6990A43089EEBDF89CE8FCC48-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--A62959A6990A43089EEBDF89CE8FCC48--></AD_MESSAGE>
+
<!--ABFDBB83F58841EA9545D9ED8637513B--><AD_MESSAGE>
<!--ABFDBB83F58841EA9545D9ED8637513B-->
<AD_MESSAGE_ID><![CDATA[ABFDBB83F58841EA9545D9ED8637513B]]></AD_MESSAGE_ID>
<!--ABFDBB83F58841EA9545D9ED8637513B-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1072,6 +1127,17 @@
<!--CE3E9A8711D54E719F02630BE8D5E2FB-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--CE3E9A8711D54E719F02630BE8D5E2FB--></AD_MESSAGE>
+<!--CF668C49E43D4FA799A43191EA10C17A--><AD_MESSAGE>
+<!--CF668C49E43D4FA799A43191EA10C17A-->
<AD_MESSAGE_ID><![CDATA[CF668C49E43D4FA799A43191EA10C17A]]></AD_MESSAGE_ID>
+<!--CF668C49E43D4FA799A43191EA10C17A-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CF668C49E43D4FA799A43191EA10C17A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CF668C49E43D4FA799A43191EA10C17A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CF668C49E43D4FA799A43191EA10C17A-->
<VALUE><![CDATA[OBUIAPP_SetHyperlinkURL]]></VALUE>
+<!--CF668C49E43D4FA799A43191EA10C17A--> <MSGTEXT><![CDATA[Set Hyperlink
URL]]></MSGTEXT>
+<!--CF668C49E43D4FA799A43191EA10C17A--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--CF668C49E43D4FA799A43191EA10C17A-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--CF668C49E43D4FA799A43191EA10C17A--></AD_MESSAGE>
+
<!--D109B6F7D8BF4F5C9D84463CD36BF434--><AD_MESSAGE>
<!--D109B6F7D8BF4F5C9D84463CD36BF434-->
<AD_MESSAGE_ID><![CDATA[D109B6F7D8BF4F5C9D84463CD36BF434]]></AD_MESSAGE_ID>
<!--D109B6F7D8BF4F5C9D84463CD36BF434-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1160,6 +1226,17 @@
<!--E20A23145D554996A09BC927B847F3BB-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--E20A23145D554996A09BC927B847F3BB--></AD_MESSAGE>
+<!--E25F7BC6017747E08BDBAD4DD01DD316--><AD_MESSAGE>
+<!--E25F7BC6017747E08BDBAD4DD01DD316-->
<AD_MESSAGE_ID><![CDATA[E25F7BC6017747E08BDBAD4DD01DD316]]></AD_MESSAGE_ID>
+<!--E25F7BC6017747E08BDBAD4DD01DD316-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E25F7BC6017747E08BDBAD4DD01DD316--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E25F7BC6017747E08BDBAD4DD01DD316--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E25F7BC6017747E08BDBAD4DD01DD316-->
<VALUE><![CDATA[OBUIAPP_StrikeThroughSelection]]></VALUE>
+<!--E25F7BC6017747E08BDBAD4DD01DD316--> <MSGTEXT><![CDATA[Strike Through
Selection]]></MSGTEXT>
+<!--E25F7BC6017747E08BDBAD4DD01DD316--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--E25F7BC6017747E08BDBAD4DD01DD316-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--E25F7BC6017747E08BDBAD4DD01DD316--></AD_MESSAGE>
+
<!--E4446D7FB74A4C57A9C715B4DDACC3E9--><AD_MESSAGE>
<!--E4446D7FB74A4C57A9C715B4DDACC3E9-->
<AD_MESSAGE_ID><![CDATA[E4446D7FB74A4C57A9C715B4DDACC3E9]]></AD_MESSAGE_ID>
<!--E4446D7FB74A4C57A9C715B4DDACC3E9-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 6c1c82b172f4 -r bdbc4e96cb77
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
Wed Jan 23 18:16:09 2013 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
Thu Jan 24 00:29:43 2013 +0100
@@ -146,6 +146,8 @@
globalResources.add(createStaticResource(
"web/org.openbravo.client.application/js/form/formitem/ob-formitem-textarea.js",
true));
globalResources.add(createStaticResource(
+
"web/org.openbravo.client.application/js/form/formitem/ob-formitem-richtext.js",
true));
+ globalResources.add(createStaticResource(
"web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js",
true));
globalResources.add(createStaticResource(
"web/org.openbravo.client.application/js/form/formitem/ob-formitem-yesno.js",
true));
diff -r 6c1c82b172f4 -r bdbc4e96cb77
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-richtext.js
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-richtext.js
Thu Jan 24 00:29:43 2013 +0100
@@ -0,0 +1,155 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo Public License
+ * Version 1.1 (the "License"), being the Mozilla Public License
+ * Version 1.1 with a permitted attribution clause; you may not use. this
+ * file except in compliance with the License. You may obtain a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2013 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ ************************************************************************
+ */
+
+// == OBTextAreaItem and OBPopupTextArea ==
+// Input for large strings, contains 2 widgets one for editing in the form
+// and one for in the grid.
+isc.ClassFactory.defineClass('OBRichTextItem', isc.RichTextItem);
+isc.ClassFactory.defineClass('OBRichTextEditor', isc.RichTextEditor);
+
+isc.OBRichTextItem.addProperties({
+ operator: 'iContains',
+ validateOnExit: true,
+ canvasConstructor: 'OBRichTextEditor',
+ canvasProperties: {
+ canFocus: true,
+ editAreaBackgroundColor: 'transparent',
+
+ // "fontControls", "formatControls", "styleControls" and "colorControls"
+ initialControlGroups: ["fontControls", "styleControls", "formatControls"],
+ controlGroups: ["fontControls", "styleControls", "formatControls"],
+
+ keyDown: function (event, eventInfo) {
+ var response = OB.KeyboardManager.Shortcuts.monitor('OBViewForm');
+ if (response !== false) {
+ response = this.Super('keyDown', arguments);
+ }
+ return response;
+ },
+
+ handleFocus: function (hasFocus) {
+ if (hasFocus) {
+ this.setStyleName(this.styleName + 'Focused');
+ } else if (this.styleName.endsWith('Focused')) {
+ this.setStyleName(this.styleName.substring(0, this.styleName.length -
'Focused'.length));
+ }
+ if (hasFocus && !this.hasFocus) {
+ this.setFocus(true);
+ }
+ },
+
+ setDisabled: function (disabled) {
+ if (disabled) {
+ this.previousStyleName = this.styleName;
+ this.setStyleName(this.editorStyleName + 'Disabled');
+ this.editArea.setStyleName(this.editAreaStyleName + 'Disabled');
+ this.toolbar.hide();
+ } else {
+ this.setStyleName(this.previousStyleName || this.editorStyleName);
+ delete this.previousStyleName;
+ this.editArea.setStyleName(this.editAreaStyleName);
+ this.toolbar.show();
+ }
+ this.Super('setDisabled', arguments);
+ },
+
+ // autochilds
+ editAreaProperties: {
+ canFocus: true,
+ styleName: 'OBFormFieldStatic',
+
+ keyDown: function (event, eventInfo) {
+ var response = OB.KeyboardManager.Shortcuts.monitor('OBViewForm');
+ if (response !== false) {
+ response = this.Super('keyDown', arguments);
+ }
+ return response;
+ },
+
+ focusChanged: function (hasFocus) {
+ this.parentElement.handleFocus(hasFocus);
+ }
+ },
+ toolbarProperties: {
+ canFocus: true,
+
+ keyDown: function (event, eventInfo) {
+ var response = OB.KeyboardManager.Shortcuts.monitor('OBViewForm');
+ if (response !== false) {
+ response = this.Super('keyDown', arguments);
+ }
+ return response;
+ },
+
+ focusChanged: function (hasFocus) {
+ this.parentElement.handleFocus(hasFocus);
+ },
+
+ // autochild of the autochild
+ buttonProperties: {
+ keyDown: function (event, eventInfo) {
+ var response = OB.KeyboardManager.Shortcuts.monitor('OBViewForm');
+ if (response !== false) {
+ response = this.Super('keyDown', arguments);
+ }
+ return response;
+ },
+
+ focusChanged: function (hasFocus) {
+ this.parentElement.parentElement.handleFocus(hasFocus);
+ }
+ }
+ }
+ },
+ selectOnFocus: false,
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnnow-d2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
