diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2015-07-26 15:41:26 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2015-07-26 15:41:26 -0700 |
| commit | 9aee669886202be7035e6c6049fc71bc99dd3013 (patch) | |
| tree | 2fd5bf6de74f3d99270587ffb1833e4188a6373d /rt/share/html/Elements/HeaderJavascript | |
| parent | ac20214d38d9af00430423f147b5a0e50751b050 (diff) | |
| parent | 1add633372bdca3cc7163c2ce48363fed3984437 (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'rt/share/html/Elements/HeaderJavascript')
| -rw-r--r-- | rt/share/html/Elements/HeaderJavascript | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/rt/share/html/Elements/HeaderJavascript b/rt/share/html/Elements/HeaderJavascript index 3e5e9eca3..79ee74e21 100644 --- a/rt/share/html/Elements/HeaderJavascript +++ b/rt/share/html/Elements/HeaderJavascript @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -51,37 +51,27 @@ $onload => undef </%args> % for my $jsfile ( @js_files ) { -<script type="text/javascript" src="<%RT->Config->Get('WebPath')%>/NoAuth/js/<% $jsfile %>"></script> +<script type="text/javascript" src="<%RT->Config->Get('WebPath')%><% $jsfile %>"></script> % } -% if ( $RichText and RT->Config->Get('MessageBoxRichText', $session{'CurrentUser'}) ) { -<script type="text/javascript" src="<%RT->Config->Get('WebPath')%>/NoAuth/RichText/ckeditor.js"></script> -% } <script type="text/javascript"><!-- - jQuery( loadTitleBoxStates ); +jQuery( loadTitleBoxStates ); % if ( $focus ) { - jQuery(function () { focusElementById(<% $focus |n,j%>) }); + jQuery(function () { jQuery(<% $focus |n,j%>).focus() }); % } % if ( $onload ) { jQuery( <% $onload |n %> ); % } - -% if ( $RichText and RT->Config->Get('MessageBoxRichText', $session{'CurrentUser'})) { - jQuery().ready(function () { ReplaceAllTextareas() }); -% } --></script> -<%ARGS> -$RichText => 1 -</%ARGS> <%INIT> my @js_files; if ( RT->Config->Get('DevelMode') ) { - @js_files = RT->Config->Get('JSFiles' ); + @js_files = map { $_ =~ m{^/} ? $_ : "/static/js/$_" } RT::Interface::Web->JSFiles(); } else { my $key = RT::Interface::Web::SquishedJS()->Key; - @js_files = "squished-$key.js"; + @js_files = "/NoAuth/js/squished-$key.js"; } </%INIT> |