Projects / Chaw

diff --git a/app_controller.php b/app_controller.php index d7fb3d8..499fbff 100755 --- a/app_controller.php +++ b/app_controller.php @@ -38,7 +38,7 @@ class AppController extends Controller { * * @var string */ - var $helpers = array('Html', 'Form', 'Javascript', 'Chaw'); + var $helpers = array('Html', 'Form', 'Chaw'); /** * undocumented variable diff --git a/views/layouts/default.ctp b/views/layouts/default.ctp index 882a05e..43216b7 100644 --- a/views/layouts/default.ctp +++ b/views/layouts/default.ctp @@ -43,22 +43,19 @@ if (!empty($this->params['admin'])) { echo $html->css(array('chaw.admin')); } - - if (!empty($javascript)) { - echo $html->script('jquery-1.3.1.min'); - - if (isset($showdown)): - echo $html->script('gshowdown.min'); - echo $html->scriptBlock(' - var converter = new Showdown.converter("' . $chaw->base() . '"); - $(document).ready(function(){ - $(".wiki-text").each(function () { - $(this).html(converter.makeHtml(jQuery.trim($(this).text()))) - }); + echo $html->script('jquery-1.3.1.min'); + + if (isset($showdown)): + echo $html->script('gshowdown.min'); + echo $html->scriptBlock(' + var converter = new Showdown.converter("' . $chaw->base() . '"); + $(document).ready(function(){ + $(".wiki-text").each(function () { + $(this).html(converter.makeHtml(jQuery.trim($(this).text()))) }); - '); - endif; - } + }); + '); + endif; echo $scripts_for_layout; ?> </head>