mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Move serendipity_editor.js reference back to <head>

Browse Source 
The document ready shorthand function needed a little adapting as
well (which is not an issue since we abandoned noConflict mode).

References #91
This commit is contained in:
Matthias Mees
2014-03-11 10:44:10 +01:00
parent b02cb1a6bc
commit 6d5c24af2f
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/2k11/admin/index.tpl
View File

@ -12,6 +12,7 @@
<script src="{serendipity_getFile file='admin/js/modernizr-2.7.1.min.js'}"></script>
{if $admin_vars.admin_installed}{serendipity_hookPlugin hook="backend_header" hookAll="true"}{/if}
<script src="{$head_link_script}"></script>
<script src="{serendipity_getFile file='admin/serendipity_editor.js'}"></script>
</head>
<body id="serendipity_admin_page">
{if NOT $admin_vars.no_banner}
@ -164,6 +165,5 @@
<p>{$admin_vars.version_info}</p>
</footer>
{/if}
<script src="{serendipity_getFile file='admin/serendipity_editor.js'}"></script>
</body>
</html>

3
templates/2k11/admin/installer.inc.tpl
View File

@ -11,6 +11,7 @@
<![endif]-->
<script src="{serendipity_getFile file='admin/js/modernizr-2.7.1.min.js'}"></script>
<script src="{serendipity_getFile file='jquery.js'}"></script>
<script src="{serendipity_getFile file='admin/serendipity_editor.js'}"></script>
</head>
<body id="serendipity_admin_page">
<header id="top">
@ -295,7 +296,5 @@
<footer id="meta">
<p>{$ADMIN_FOOTER_POWERED_BY|sprintf:$versionInstalled:$phpversion}</p>
</footer>
<script src="{serendipity_getFile file='admin/serendipity_editor.js'}"></script>
</body>
</html>

3
templates/2k11/admin/media_choose.tpl
View File

@ -11,6 +11,7 @@
<script src="{serendipity_getFile file='YahooUI/treeview/YAHOO.js'}"></script>
<script src="{serendipity_getFile file='YahooUI/treeview/treeview.js'}"></script>
{serendipity_hookPlugin hook="backend_header" hookAll="true"}
<script src="{serendipity_getFile file='admin/serendipity_editor.js'}"></script>
<script>
var media_token_url = '{$media.token_url}';
var media_rename = '{$CONST.ENTER_NEW_NAME}';
@ -241,7 +242,7 @@ if (parent.frames && parent.frames['tree']) {
</footer>
{/if}{* if $media.case switch end *}
</div> <!-- //.serendipityAdminContent end -->
<script src="{serendipity_getFile file='admin/serendipity_editor.js'}"></script>
{if $media.case == 'tree'}
<script>
var tree;

4
templates/2k11/admin/serendipity_editor.js.tpl
View File

@ -826,7 +826,7 @@ var AccessifyHTML5 = function (defaults, more_fixes) {
}
}(document, jQuery));
(function($) {
$(function() {
// Fire responsive nav
if($('body').has('#main_menu').size() > 0) {
$('#nav-toggle').click(function(e) {
@ -1333,7 +1333,7 @@ var AccessifyHTML5 = function (defaults, more_fixes) {
}
}
});
})(jQuery);
});
// This is kept for older plugins. Use of $(document).ready() is encouraged.
// At some point, this will be removed.

2
templates/2k11/admin/upgrader.inc.tpl
View File

@ -12,6 +12,7 @@
<script src="{serendipity_getFile file='admin/js/modernizr-2.7.1.min.js'}"></script>
{if $admin_vars.admin_installed}{serendipity_hookPlugin hook="backend_header" hookAll="true"}{/if}
<script src="{$serendipityHTTPPath}{$templatePath}jquery.js"></script>
<script src="{serendipity_getFile file='admin/serendipity_editor.js'}"></script>
</head>
<body id="serendipity_admin_page">
{if NOT $admin_vars.no_banner}
@ -168,6 +169,5 @@
</footer>
{/if}
{/if}
<script src="{serendipity_getFile file='admin/serendipity_editor.js'}"></script>
</body>
</html>