R52103 - in /trunk/etemplate/js: et2_core_common.js et2_core_valueWidget.js

Author: ralfbecker
New Revision: 52103

URL: http://svn.stylite.de/viewvc/egroupware?rev=52103&view=rev
Log:
new attribute type “rawstring” not doing html-entity decoding used just for “value” attribute

Modified:
trunk/etemplate/js/et2_core_common.js
trunk/etemplate/js/et2_core_valueWidget.js

Modified: trunk/etemplate/js/et2_core_common.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/etemplate/js/et2_core_common.js?rev=52103&r1=52102&r2=52103&view=diff

— trunk/etemplate/js/et2_core_common.js (original)
+++ trunk/etemplate/js/et2_core_common.js Wed Mar 11 13:12:52 2015
@@ -40,6 +40,7 @@
var et2_typeDefaults = {
“boolean”: false,
“string”: “”,

  • “rawstring”: “”, // no html-entity decoding
    "html": “”,
    “js”: null,
    “float”: 0.0,
    @@ -153,7 +154,7 @@
    }

    // Check whether the given value is of the type “string”

  • if (_type == “string” || _type == “html”)
  • if (_type == “string” || _type == “html” || _type == “rawstring”)
    {
    if (typeof _val == “number”) // as php is a bit vague here, silently convert to a string
    {
    @@ -162,7 +163,7 @@

    if (typeof _val == "string")
    {
    
  •   	return _type == "html" ? _val : html_entity_decode(_val);
    
  •   	return _type == "string" ? html_entity_decode(_val) : _val;
      }
    
      // Handle some less common possibilities
    

Modified: trunk/etemplate/js/et2_core_valueWidget.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/etemplate/js/et2_core_valueWidget.js?rev=52103&r1=52102&r2=52103&view=diff

— trunk/etemplate/js/et2_core_valueWidget.js (original)
+++ trunk/etemplate/js/et2_core_valueWidget.js Wed Mar 11 13:12:52 2015
@@ -21,7 +21,7 @@

  • et2_valueWidget is the base class for et2_inputWidget - valueWidget introduces
  • the “value” attribute and automatically loads it from the “content” array
  • after loading from XML.
    • @augments et2_baseWidget
      */
      var et2_valueWidget = et2_baseWidget.extend(
      @@ -37,14 +37,14 @@
      “value”: {
      “name”: “Value”,
      “description”: “The value of the widget”,
  •   	"type": "string",
    
  •   	"type": "rawstring",	// no html-entity decoding
      	"default": et2_no_init
      }
    

    },

    /**

    • @memberOf et2_valueWidget
    • @param _attrs
      */

Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/


eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs