cvs: pear /HTML_Template_Flexy package.xml /HTML_Template_Flexy/Flexy Token.php example.ini /HTML_Template_Flexy/examples example.html

alan_k Tue Dec 9 21:33:17 2003 EDT Modified files: /pear/HTML_Template_Flexy package.xml /pear/HTML_Template_Flexy/Flexy Token.php example.ini /pear/HTML_Template_Flexy/examples example.html Log: make flexyIgnore a global/per template option Index: pear/HTML_Template_Flexy/package.xml diff -u pear/HTML_Template_Flexy/package.xml:1.42 pear/HTML_Template_Flexy/package.xml:1.43 --- pear/HTML_Template_Flexy/package.xml:1.42 Mon Nov 10 21:06:33 2003 +++ pear/HTML_Template_Flexy/package.xml Tue Dec 9 21:33:15 2003 @@ -52,7 +52,7 @@ - <flexy:include src="xxx.html"/> to include other templates - <flexy:toJavascript flexy:prefix="js_name_prefix_" jsvar="php_flexy_var" ....> uses HTML_Javascript_Convert to import PHP variables into Javascript. - + - new modifier :b (for NL2BR + HTMLSPECIALCHARS) Fixes - array syntax supported in attributes (eg. urlencoded) Index: pear/HTML_Template_Flexy/Flexy/Token.php diff -u pear/HTML_Template_Flexy/Flexy/Token.php:1.28 pear/HTML_Template_Flexy/Flexy/Token.php:1.29 --- pear/HTML_Template_Flexy/Flexy/Token.php:1.28 Mon Sep 8 02:33:50 2003 +++ pear/HTML_Template_Flexy/Flexy/Token.php Tue Dec 9 21:33:16 2003 @@ -16,7 +16,7 @@ // | Authors: Alan Knowles <alan@akbkhome> | // +----------------------------------------------------------------------+ // -// $Id: Token.php,v 1.28 2003/09/08 06:33:50 alan_k Exp $ +// $Id: Token.php,v 1.29 2003/12/10 02:33:16 alan_k Exp $ // // This is the master Token file for The New Token driver Engine. // All the Token output, and building routines are in here. @@ -31,6 +31,7 @@ $GLOBALS['_HTML_TEMPLATE_FLEXY_TOKEN']['tokens'] = array(); $GLOBALS['_HTML_TEMPLATE_FLEXY_TOKEN']['gettextStrings'] = array(); $GLOBALS['_HTML_TEMPLATE_FLEXY_TOKEN']['activeFormId'] = 0; +$GLOBALS['_HTML_TEMPLATE_FLEXY_TOKEN']['flexyIgnore'] = false; /** * Base Class for all Tokens. * @@ -187,7 +188,9 @@ $_HTML_TEMPLATE_FLEXY_TOKEN['state'] = 0; $_HTML_TEMPLATE_FLEXY_TOKEN['flexyIgnore'] = false; - + if (@$GLOBALS['_HTML_TEMPLATE_FLEXY']['currentOptions']['flexyIgnore']) { + $_HTML_TEMPLATE_FLEXY_TOKEN['flexyIgnore'] = true; + } $_HTML_TEMPLATE_FLEXY_TOKEN['activeFormId'] = 0; $_HTML_TEMPLATE_FLEXY_TOKEN['activeForm'] = ''; Index: pear/HTML_Template_Flexy/Flexy/example.ini diff -u pear/HTML_Template_Flexy/Flexy/example.ini:1.4 pear/HTML_Template_Flexy/Flexy/example.ini:1.5 --- pear/HTML_Template_Flexy/Flexy/example.ini:1.4 Tue Oct 14 21:34:16 2003 +++ pear/HTML_Template_Flexy/Flexy/example.ini Tue Dec 9 21:33:16 2003 @@ -29,5 +29,8 @@ ; rewrite src and href urls from /abc/ to /xyz/ and /bbb/ to /zzz/ ; not it is only on the left of the url (not anywhere inside it) - - + +;flexyIgnore = 0 + ; this turns of the transformation of HTML form elements into + ; HTML_Template_Flexy_Element's, either globally, or you + ; can use it in a constructor to turn it off per template. \ No newline at end of file Index: pear/HTML_Template_Flexy/examples/example.html diff -u pear/HTML_Template_Flexy/examples/example.html:1.19 pear/HTML_Template_Flexy/examples/example.html:1.20 --- pear/HTML_Template_Flexy/examples/example.html:1.19 Tue Dec 2 21:50:38 2003 +++ pear/HTML_Template_Flexy/examples/example.html Tue Dec 9 21:33:17 2003 @@ -42,6 +42,9 @@ --> + +<!-- testing -- inside of a -- comment --> + <flexy:toJavascript flexy:prefix="test_abc_"