From: <ch...@us...> - 2010-11-13 19:44:32
|
Revision: 30688 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=30688&view=rev Author: chealer Date: 2010-11-13 19:44:25 +0000 (Sat, 13 Nov 2010) Log Message: ----------- [FIX] remove filter on body breaking some JavaScript content. [FIX] remove dependency on feature_jquery, now always on, change check to look at javascript_enabled instead, remove experimental warning and clarify this is a general JavaScript plugin, not specific to jQuery Modified Paths: -------------- branches/6.x/lib/core/TikiFilter.php branches/6.x/lib/wiki-plugins/wikiplugin_jq.php Modified: branches/6.x/lib/core/TikiFilter.php =================================================================== --- branches/6.x/lib/core/TikiFilter.php 2010-11-13 19:22:44 UTC (rev 30687) +++ branches/6.x/lib/core/TikiFilter.php 2010-11-13 19:44:25 UTC (rev 30688) @@ -62,6 +62,7 @@ return new TikiFilter_HtmlPurifier( 'temp/cache' ); case 'wikicontent': case 'rawhtml_unsafe': + case 'none': require_once 'TikiFilter/RawUnsafe.php'; return new TikiFilter_RawUnsafe; case 'lang': Modified: branches/6.x/lib/wiki-plugins/wikiplugin_jq.php =================================================================== --- branches/6.x/lib/wiki-plugins/wikiplugin_jq.php 2010-11-13 19:22:44 UTC (rev 30687) +++ branches/6.x/lib/wiki-plugins/wikiplugin_jq.php 2010-11-13 19:44:25 UTC (rev 30688) @@ -17,12 +17,13 @@ function wikiplugin_jq_info() { return array( - 'name' => tra('JQuery'), + 'name' => tra('jQuery'), 'documentation' => 'PluginJQ', - 'description' => tra('Insert JQuery javascript code. Requires feature_jquery').tra(' (experimental - may change in future versions)'), - 'prefs' => array( 'feature_jquery', 'wikiplugin_jq' ), - 'body' => tra('JQuery Code'), + 'description' => tra('Inserts JavaScript code. By default this is only executed after jQuery determines that the DOM is fully loaded.'), + 'prefs' => array( 'wikiplugin_jq' ), + 'body' => tra('JavaScript code'), 'validate' => 'all', + 'filter' => 'none', 'params' => array( 'notonready' => array( 'required' => false, @@ -31,8 +32,8 @@ ), 'nojquery' => array( 'required' => false, - 'name' => tra('NoJQuery'), - 'description' => tra('Optional markup for when feature_jquery is off'), + 'name' => tra('No JavaScript'), + 'description' => tra('Optional markup for when JavaScript is off'), ) ) ); @@ -43,7 +44,7 @@ extract($params, EXTR_SKIP); $nojquery = isset($nojquery) ? $nojquery : tr('<!-- jq smarty plugin inactive: feature_jquery off -->'); - if ($prefs['feature_jquery'] != 'y') { return $nojquery; } + if ($prefs['javascript_enabled'] != 'y') { return $nojquery; } $notonready = isset($notonready) ? $notonready : false; if (!$notonready) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |