Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-08 06:55:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

removing defunct "template" argument in ajaxify.go

Browse Source
This commit is contained in:
Julian Lam
2013-12-17 21:53:50 -05:00
parent 65d5a6cb81
commit d86aefb518
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/src/ajaxify.js
View File

@@ -25,7 +25,7 @@ var ajaxify = {};
window.onpopstate = function (event) { window.onpopstate = function (event) {
// "quiet": If set to true, will not call pushState // "quiet": If set to true, will not call pushState
if (event !== null && event.state && event.state.url !== undefined) { if (event !== null && event.state && event.state.url !== undefined) {
ajaxify.go(event.state.url, null, null, true); ajaxify.go(event.state.url, null, true);
} }
}; };
@@ -33,7 +33,7 @@ var ajaxify = {};
ajaxify.currentPage = null; ajaxify.currentPage = null;
ajaxify.go = function (url, callback, template, quiet) { ajaxify.go = function (url, callback, quiet) {
// start: the following should be set like so: ajaxify.onchange(function(){}); where the code actually belongs // start: the following should be set like so: ajaxify.onchange(function(){}); where the code actually belongs
$(window).off('scroll'); $(window).off('scroll');
app.enterRoom('global'); app.enterRoom('global');
@@ -125,7 +125,7 @@ var ajaxify = {};
app.refreshTitle(url); app.refreshTitle(url);
}, url, template); }, url);
return true; return true;
} }

4
public/src/app.js
View File

@@ -465,7 +465,7 @@ var socket,
jQuery('document').ready(function () { jQuery('document').ready(function () {
$('#search-form').on('submit', function () { $('#search-form').on('submit', function () {
var input = $(this).find('input'); var input = $(this).find('input');
ajaxify.go("search/" + input.val(), null, "search"); ajaxify.go("search/" + input.val());
input.val(''); input.val('');
return false; return false;
}); });
@@ -476,6 +476,8 @@ var socket,
$(window).focus(function(){ $(window).focus(function(){
app.isFocused = true; app.isFocused = true;
app.alternatingTitle('');
}); });
}); });

3
public/src/templates.js
View File

@@ -126,8 +126,7 @@
templates.load_template = function (callback, url, template) { templates.load_template = function (callback, url, template) {
var location = document.location || window.location, var location = document.location || window.location,
api_url = (url === '' || url === '/') ? 'home' : url, api_url = (url === '' || url === '/') ? 'home' : url,
tpl_url = templates.get_custom_map(api_url.split('?')[0]), tpl_url = templates.get_custom_map(api_url.split('?')[0]);
trimmed = api_url;
if (!tpl_url) { if (!tpl_url) {
tpl_url = templates.getTemplateNameFromUrl(api_url); tpl_url = templates.getTemplateNameFromUrl(api_url);