HOTFIX for scripts

v1.18.x
Julian Lam 12 years ago
parent d6dd74b50a
commit 0d9958afe7

@ -61,10 +61,12 @@ var ajaxify = {};
if (templates.is_available(tpl_url) && !templates.force_refresh(tpl_url)) { if (templates.is_available(tpl_url) && !templates.force_refresh(tpl_url)) {
if (quiet !== true) { if (quiet !== true) {
if (window.history && window.history.pushState) {
window.history.pushState({ window.history.pushState({
"url": url "url": url
}, url, RELATIVE_PATH + "/" + url); }, url, RELATIVE_PATH + "/" + url);
} }
}
jQuery('#footer, #content').fadeOut(100); jQuery('#footer, #content').fadeOut(100);

@ -10,7 +10,7 @@
</script> </script>
<script src="{relative_path}/socket.io/socket.io.js"></script> <script src="{relative_path}/socket.io/socket.io.js"></script>
<!-- BEGIN clientScripts --> <!-- BEGIN clientScripts -->
<script src="{relative_path}{clientScripts.script}"></script> <script src="{relative_path}/{clientScripts.script}"></script>
<!-- END clientScripts --> <!-- END clientScripts -->
<script> <script>
require.config({ require.config({

@ -149,17 +149,17 @@ var utils = require('./../public/src/utils.js'),
Meta.js = { Meta.js = {
scripts: [ scripts: [
'/vendor/jquery/js/jquery.js', 'vendor/jquery/js/jquery.js',
'/vendor/jquery/js/jquery-ui-1.10.3.custom.min.js', 'vendor/jquery/js/jquery-ui-1.10.3.custom.min.js',
'/vendor/jquery/js/jquery.timeago.js', 'vendor/jquery/js/jquery.timeago.js',
'/vendor/bootstrap/js/bootstrap.min.js', 'vendor/bootstrap/js/bootstrap.min.js',
'/src/app.js', 'src/app.js',
'/vendor/requirejs/require.js', 'vendor/requirejs/require.js',
'/vendor/bootbox/bootbox.min.js', 'vendor/bootbox/bootbox.min.js',
'/src/templates.js', 'src/templates.js',
'/src/ajaxify.js', 'src/ajaxify.js',
'/src/jquery.form.js', 'src/jquery.form.js',
'/src/utils.js' 'src/utils.js'
], ],
minFile: path.join(__dirname, '..', 'public/src/nodebb.min.js'), minFile: path.join(__dirname, '..', 'public/src/nodebb.min.js'),
get: function (callback) { get: function (callback) {

Loading…
Cancel
Save