|
|
|
'use strict';
|
|
|
|
|
Webpack5 (#10311)
* feat: webpack 5 part 1
* fix: gruntfile fixes
* fix: fix taskbar warning
add app.importScript
copy public/src/modules to build folder
* refactor: remove commented old code
* feat: reenable admin
* fix: acp settings pages, fix sortable on manage categories
embedded require in html not allowed
* fix: bundle serialize/deserizeli so plugins dont break
* test: fixe util tests
* test: fix require path
* test: more test fixes
* test: require correct utils module
* test: require correct utils
* test: log stack
* test: fix db require blowing up tests
* test: move and disable bundle test
* refactor: add aliases
* test: disable testing route
* fix: move webpack modules necessary for build, into `dependencies`
* test: fix one more test
remove 500-embed.tpl
* fix: restore use of assets/nodebb.min.js, at least for now
* fix: remove unnecessary line break
* fix: point to proper ACP bundle
* test: maybe fix build test
* test: composer
* refactor: dont need dist
* refactor: more cleanup
use everything from build/public folder
* get rid of conditional import in app.js
* fix: ace
* refactor: cropper alias
* test: lint and test fixes
* lint: fix
* refactor: rename function to app.require
* refactor: go back to using app.require
* chore: use github branch
* chore: use webpack branch
* feat: webpack webinstaller
* feat: add chunkFile name with contenthash
* refactor: move hooks to top
* refactor: get rid of template500Function
* fix(deps): use webpack5 branch of 2factor plugin
* chore: tagging v2.0.0-beta.0 pre-release version :boom: :shipit: :tada: :rocket:
* refactor: disable cache on templates
loadTemplate is called once by benchpress and the result is cache internally
* refactor: add server side helpers.js
* feat: deprecate /plugins shorthand route, closes #10343
* refactor: use build/public for webpack
* test: fix filename
* fix: more specific selector
* lint: ignore
* refactor: fix comments
* test: add debug for random failing test
* refactor: cleanup
remove test page, remove dupe functions in utils.common
* lint: use relative path for now
* chore: bump prerelease version
* feat: add translateKeys
* fix: optional params
* fix: get rid of extra timeago files
* refactor: cleanup, require timeago locale earlier
remove translator.prepareDOM, it is in header.tpl html tag
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels (#10378)
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels
- Existing hooks are preserved (to be deprecated at a later date, possibly)
- New init hooks are called on NodeBB start, and provide a one-stop shop to add new privileges, instead of having to add to four different hooks
* docs: fix typo in comment
* test: spec changes
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels (#10378)
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels
- Existing hooks are preserved (to be deprecated at a later date, possibly)
- New init hooks are called on NodeBB start, and provide a one-stop shop to add new privileges, instead of having to add to four different hooks
* docs: fix typo in comment
* test: spec changes
* feat: allow app.require('bootbox'/'benchpressjs')
* refactor: require server side utils
* test: jquery ready
* change istaller to use build/public
* test: use document.addEventListener
* refactor: closes #10301
* refactor: generateTopicClass
* fix: column counts for other privileges
* fix: #10443, regression where sorted-list items did not render into the DOM in the predicted order [breaking]
* fix: typo in hook name
* refactor: introduce a generic autocomplete.init() method that can be called to add nodebb-style autocompletion but using different data sources (e.g. not user/groups/tags)
* fix: crash if `delay` not passed in (as it cannot be destructured)
* refactor: replace substr
* feat: set --panel-offset style in html element based on stored value in localStorage
* refactor: addDropupHandler() logic to be less naive
- Take into account height of the menu
- Don't apply dropUp logic if there's nothing in the dropdown
- Remove 'hidden' class (added by default in Persona for post tools) when menu items are added
closes #10423
* refactor: simplify utils.params [breaking]
Retrospective analysis of the usage of this method suggests that the options passed in are superfluous, and that only `url` is required. Using a browser built-in makes more sense to accomplish what this method sets out to do.
* feat: add support for returning full URLSearchParams for utils.params
* fix: utils.params() fallback handling
* fix: default empty obj for params()
* fix: remove \'loggedin\' and \'register\' qs parameters once they have been used, delay invocation of messages until ajaxify.end
* fix: utils.params() not allowing relative paths to be passed in
* refactor(DRY): new assertPasswordValidity utils method
* fix: incorrect error message returned on insufficient privilege on flag edit
* fix: read/update/delete access to flags API should be limited for moderators to only post flags in categories they moderate
- added failing tests and patched up middleware.assert.flags to fix
* refactor: flag api v3 tests to create new post and flags on every round
* fix: missing error:no-flag language key
* refactor: flags.canView to check flag existence, simplify middleware.assert.flag
* feat: flag deletion API endpoint, #10426
* feat: UI for flag deletion, closes #10426
* chore: update plugin versions
* chore: up emoji
* chore: update markdown
* chore: up emoji-android
* fix: regression caused by utils.params() refactor, supports arrays and pipes all values through utils.toType, adjusts tests to type check
Co-authored-by: Julian Lam <[email protected]>
3 years ago
|
|
|
const hooks = require('./modules/hooks');
|
|
|
|
const { render } = require('./widgets');
|
|
|
|
|
Webpack5 (#10311)
* feat: webpack 5 part 1
* fix: gruntfile fixes
* fix: fix taskbar warning
add app.importScript
copy public/src/modules to build folder
* refactor: remove commented old code
* feat: reenable admin
* fix: acp settings pages, fix sortable on manage categories
embedded require in html not allowed
* fix: bundle serialize/deserizeli so plugins dont break
* test: fixe util tests
* test: fix require path
* test: more test fixes
* test: require correct utils module
* test: require correct utils
* test: log stack
* test: fix db require blowing up tests
* test: move and disable bundle test
* refactor: add aliases
* test: disable testing route
* fix: move webpack modules necessary for build, into `dependencies`
* test: fix one more test
remove 500-embed.tpl
* fix: restore use of assets/nodebb.min.js, at least for now
* fix: remove unnecessary line break
* fix: point to proper ACP bundle
* test: maybe fix build test
* test: composer
* refactor: dont need dist
* refactor: more cleanup
use everything from build/public folder
* get rid of conditional import in app.js
* fix: ace
* refactor: cropper alias
* test: lint and test fixes
* lint: fix
* refactor: rename function to app.require
* refactor: go back to using app.require
* chore: use github branch
* chore: use webpack branch
* feat: webpack webinstaller
* feat: add chunkFile name with contenthash
* refactor: move hooks to top
* refactor: get rid of template500Function
* fix(deps): use webpack5 branch of 2factor plugin
* chore: tagging v2.0.0-beta.0 pre-release version :boom: :shipit: :tada: :rocket:
* refactor: disable cache on templates
loadTemplate is called once by benchpress and the result is cache internally
* refactor: add server side helpers.js
* feat: deprecate /plugins shorthand route, closes #10343
* refactor: use build/public for webpack
* test: fix filename
* fix: more specific selector
* lint: ignore
* refactor: fix comments
* test: add debug for random failing test
* refactor: cleanup
remove test page, remove dupe functions in utils.common
* lint: use relative path for now
* chore: bump prerelease version
* feat: add translateKeys
* fix: optional params
* fix: get rid of extra timeago files
* refactor: cleanup, require timeago locale earlier
remove translator.prepareDOM, it is in header.tpl html tag
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels (#10378)
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels
- Existing hooks are preserved (to be deprecated at a later date, possibly)
- New init hooks are called on NodeBB start, and provide a one-stop shop to add new privileges, instead of having to add to four different hooks
* docs: fix typo in comment
* test: spec changes
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels (#10378)
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels
- Existing hooks are preserved (to be deprecated at a later date, possibly)
- New init hooks are called on NodeBB start, and provide a one-stop shop to add new privileges, instead of having to add to four different hooks
* docs: fix typo in comment
* test: spec changes
* feat: allow app.require('bootbox'/'benchpressjs')
* refactor: require server side utils
* test: jquery ready
* change istaller to use build/public
* test: use document.addEventListener
* refactor: closes #10301
* refactor: generateTopicClass
* fix: column counts for other privileges
* fix: #10443, regression where sorted-list items did not render into the DOM in the predicted order [breaking]
* fix: typo in hook name
* refactor: introduce a generic autocomplete.init() method that can be called to add nodebb-style autocompletion but using different data sources (e.g. not user/groups/tags)
* fix: crash if `delay` not passed in (as it cannot be destructured)
* refactor: replace substr
* feat: set --panel-offset style in html element based on stored value in localStorage
* refactor: addDropupHandler() logic to be less naive
- Take into account height of the menu
- Don't apply dropUp logic if there's nothing in the dropdown
- Remove 'hidden' class (added by default in Persona for post tools) when menu items are added
closes #10423
* refactor: simplify utils.params [breaking]
Retrospective analysis of the usage of this method suggests that the options passed in are superfluous, and that only `url` is required. Using a browser built-in makes more sense to accomplish what this method sets out to do.
* feat: add support for returning full URLSearchParams for utils.params
* fix: utils.params() fallback handling
* fix: default empty obj for params()
* fix: remove \'loggedin\' and \'register\' qs parameters once they have been used, delay invocation of messages until ajaxify.end
* fix: utils.params() not allowing relative paths to be passed in
* refactor(DRY): new assertPasswordValidity utils method
* fix: incorrect error message returned on insufficient privilege on flag edit
* fix: read/update/delete access to flags API should be limited for moderators to only post flags in categories they moderate
- added failing tests and patched up middleware.assert.flags to fix
* refactor: flag api v3 tests to create new post and flags on every round
* fix: missing error:no-flag language key
* refactor: flags.canView to check flag existence, simplify middleware.assert.flag
* feat: flag deletion API endpoint, #10426
* feat: UI for flag deletion, closes #10426
* chore: update plugin versions
* chore: up emoji
* chore: update markdown
* chore: up emoji-android
* fix: regression caused by utils.params() refactor, supports arrays and pipes all values through utils.toType, adjusts tests to type check
Co-authored-by: Julian Lam <[email protected]>
3 years ago
|
|
|
window.ajaxify = window.ajaxify || {};
|
|
|
|
ajaxify.widgets = { render: render };
|
|
|
|
(function () {
|
|
|
|
let apiXHR = null;
|
|
|
|
let ajaxifyTimer;
|
|
|
|
|
|
|
|
let retry = true;
|
|
|
|
let previousBodyClass = '';
|
|
|
|
|
|
|
|
ajaxify.count = 0;
|
|
|
|
ajaxify.currentPage = null;
|
|
|
|
|
|
|
|
ajaxify.go = function (url, callback, quiet) {
|
|
|
|
// Automatically reconnect to socket and re-ajaxify on success
|
|
|
|
if (!socket.connected) {
|
|
|
|
app.reconnect();
|
|
|
|
|
|
|
|
if (ajaxify.reconnectAction) {
|
|
|
|
$(window).off('action:reconnected', ajaxify.reconnectAction);
|
|
|
|
}
|
|
|
|
ajaxify.reconnectAction = function (e) {
|
|
|
|
ajaxify.go(url, callback, quiet);
|
|
|
|
$(window).off(e);
|
|
|
|
};
|
|
|
|
$(window).on('action:reconnected', ajaxify.reconnectAction);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Abort subsequent requests if clicked multiple times within a short window of time
|
|
|
|
if (ajaxifyTimer && (Date.now() - ajaxifyTimer) < 500) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
ajaxifyTimer = Date.now();
|
|
|
|
|
|
|
|
if (ajaxify.handleRedirects(url)) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!quiet && url === ajaxify.currentPage + window.location.search + window.location.hash) {
|
|
|
|
quiet = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
ajaxify.cleanup(url, ajaxify.data.template.name);
|
|
|
|
|
|
|
|
if ($('#content').hasClass('ajaxifying') && apiXHR) {
|
|
|
|
apiXHR.abort();
|
|
|
|
}
|
|
|
|
|
|
|
|
app.previousUrl = !['reset'].includes(ajaxify.currentPage) ?
|
|
|
|
window.location.pathname.slice(config.relative_path.length) + window.location.search :
|
|
|
|
app.previousUrl;
|
|
|
|
|
|
|
|
url = ajaxify.start(url);
|
|
|
|
|
|
|
|
// If any listeners alter url and set it to an empty string, abort the ajaxification
|
|
|
|
if (url === null) {
|
|
|
|
hooks.fire('action:ajaxify.end', { url: url, tpl_url: ajaxify.data.template.name, title: ajaxify.data.title });
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
previousBodyClass = ajaxify.data.bodyClass;
|
|
|
|
$('#footer, #content').removeClass('hide').addClass('ajaxifying');
|
|
|
|
|
|
|
|
ajaxify.loadData(url, function (err, data) {
|
|
|
|
if (!err || (
|
|
|
|
err &&
|
|
|
|
err.data &&
|
|
|
|
(parseInt(err.data.status, 10) !== 302 && parseInt(err.data.status, 10) !== 308)
|
|
|
|
)) {
|
|
|
|
ajaxify.updateHistory(url, quiet);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (err) {
|
|
|
|
return onAjaxError(err, url, callback, quiet);
|
|
|
|
}
|
|
|
|
|
|
|
|
retry = true;
|
|
|
|
|
|
|
|
renderTemplate(url, data.templateToRender || data.template.name, data, callback);
|
|
|
|
});
|
|
|
|
|
|
|
|
return true;
|
|
|
|
};
|
|
|
|
|
|
|
|
// this function is called just once from footer on page load
|
|
|
|
ajaxify.coldLoad = function () {
|
|
|
|
const url = ajaxify.start(window.location.pathname.slice(1) + window.location.search + window.location.hash);
|
|
|
|
ajaxify.updateHistory(url, true);
|
|
|
|
ajaxify.end(url, ajaxify.data.template.name);
|
|
|
|
hooks.fire('action:ajaxify.coldLoad');
|
|
|
|
};
|
|
|
|
|
|
|
|
ajaxify.isCold = function () {
|
|
|
|
return ajaxify.count <= 1;
|
|
|
|
};
|
|
|
|
|
|
|
|
ajaxify.handleRedirects = function (url) {
|
|
|
|
url = ajaxify.removeRelativePath(url.replace(/^\/|\/$/g, '')).toLowerCase();
|
|
|
|
const isClientToAdmin = url.startsWith('admin') && window.location.pathname.indexOf(config.relative_path + '/admin') !== 0;
|
|
|
|
const isAdminToClient = !url.startsWith('admin') && window.location.pathname.indexOf(config.relative_path + '/admin') === 0;
|
|
|
|
|
|
|
|
if (isClientToAdmin || isAdminToClient) {
|
|
|
|
window.open(config.relative_path + '/' + url, '_top');
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
};
|
|
|
|
|
|
|
|
ajaxify.start = function (url) {
|
|
|
|
url = ajaxify.removeRelativePath(url.replace(/^\/|\/$/g, ''));
|
|
|
|
|
|
|
|
const payload = {
|
|
|
|
url: url,
|
|
|
|
};
|
|
|
|
|
|
|
|
hooks.logs.collect();
|
|
|
|
hooks.fire('action:ajaxify.start', payload);
|
|
|
|
|
|
|
|
ajaxify.count += 1;
|
|
|
|
|
|
|
|
return payload.url;
|
|
|
|
};
|
|
|
|
|
|
|
|
ajaxify.updateHistory = function (url, quiet) {
|
|
|
|
ajaxify.currentPage = url.split(/[?#]/)[0];
|
|
|
|
if (window.history && window.history.pushState) {
|
|
|
|
window.history[!quiet ? 'pushState' : 'replaceState']({
|
|
|
|
url: url,
|
|
|
|
}, url, config.relative_path + '/' + url);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
function onAjaxError(err, url, callback, quiet) {
|
|
|
|
const data = err.data;
|
|
|
|
const textStatus = err.textStatus;
|
|
|
|
|
|
|
|
if (data) {
|
|
|
|
let status = parseInt(data.status, 10);
|
|
|
|
if ([400, 403, 404, 500, 502, 504].includes(status)) {
|
|
|
|
if (status === 502 && retry) {
|
|
|
|
retry = false;
|
|
|
|
ajaxifyTimer = undefined;
|
|
|
|
return ajaxify.go(url, callback, quiet);
|
|
|
|
}
|
|
|
|
if (status === 502) {
|
|
|
|
status = 500;
|
|
|
|
}
|
|
|
|
if (data.responseJSON) {
|
|
|
|
data.responseJSON.config = config;
|
|
|
|
}
|
|
|
|
|
|
|
|
$('#footer, #content').removeClass('hide').addClass('ajaxifying');
|
|
|
|
return renderTemplate(url, status.toString(), data.responseJSON || {}, callback);
|
|
|
|
} else if (status === 401) {
|
|
|
|
require(['alerts'], function (alerts) {
|
|
|
|
alerts.error('[[global:please_log_in]]');
|
|
|
|
});
|
|
|
|
app.previousUrl = url;
|
|
|
|
window.location.href = config.relative_path + '/login';
|
|
|
|
} else if (status === 302 || status === 308) {
|
|
|
|
if (data.responseJSON && data.responseJSON.external) {
|
|
|
|
// this is used by sso plugins to redirect to the auth route
|
|
|
|
// cant use ajaxify.go for /auth/sso routes
|
|
|
|
window.location.href = data.responseJSON.external;
|
|
|
|
} else if (typeof data.responseJSON === 'string') {
|
|
|
|
ajaxifyTimer = undefined;
|
|
|
|
if (data.responseJSON.startsWith('http://') || data.responseJSON.startsWith('https://')) {
|
|
|
|
window.location.href = data.responseJSON;
|
|
|
|
} else {
|
|
|
|
ajaxify.go(data.responseJSON.slice(1), callback, quiet);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else if (textStatus !== 'abort') {
|
|
|
|
require(['alerts'], function (alerts) {
|
|
|
|
alerts.error(data.responseJSON.error);
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
function renderTemplate(url, tpl_url, data, callback) {
|
|
|
|
hooks.fire('action:ajaxify.loadingTemplates', {});
|
|
|
|
require(['translator', 'benchpress'], function (translator, Benchpress) {
|
|
|
|
Benchpress.render(tpl_url, data)
|
|
|
|
.then(rendered => translator.translate(rendered))
|
|
|
|
.then(function (translated) {
|
|
|
|
translated = translator.unescape(translated);
|
|
|
|
$('body').removeClass(previousBodyClass).addClass(data.bodyClass);
|
|
|
|
$('#content').html(translated);
|
|
|
|
|
|
|
|
ajaxify.end(url, tpl_url);
|
|
|
|
|
|
|
|
if (typeof callback === 'function') {
|
|
|
|
callback();
|
|
|
|
}
|
|
|
|
|
|
|
|
$('#content, #footer').removeClass('ajaxifying');
|
|
|
|
|
|
|
|
// Only executed on ajaxify. Otherwise these'd be in ajaxify.end()
|
|
|
|
updateTitle(data.title);
|
|
|
|
updateTags();
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
function updateTitle(title) {
|
|
|
|
if (!title) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
require(['translator'], function (translator) {
|
|
|
|
title = config.titleLayout.replace(/{/g, '{').replace(/}/g, '}')
|
|
|
|
.replace('{pageTitle}', function () { return title; })
|
|
|
|
.replace('{browserTitle}', function () { return config.browserTitle; });
|
|
|
|
|
|
|
|
// Allow translation strings in title on ajaxify (#5927)
|
|
|
|
title = translator.unescape(title);
|
|
|
|
const data = { title: title };
|
|
|
|
hooks.fire('action:ajaxify.updateTitle', data);
|
|
|
|
translator.translate(data.title, function (translated) {
|
|
|
|
window.document.title = $('<div></div>').html(translated).text();
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
function updateTags() {
|
|
|
|
const metaWhitelist = ['title', 'description', /og:.+/, /article:.+/, 'robots'].map(function (val) {
|
|
|
|
return new RegExp(val);
|
|
|
|
});
|
|
|
|
const linkWhitelist = ['canonical', 'alternate', 'up'];
|
|
|
|
|
|
|
|
// Delete the old meta tags
|
|
|
|
Array.prototype.slice
|
|
|
|
.call(document.querySelectorAll('head meta'))
|
|
|
|
.filter(function (el) {
|
|
|
|
const name = el.getAttribute('property') || el.getAttribute('name');
|
|
|
|
return metaWhitelist.some(function (exp) {
|
|
|
|
return !!exp.test(name);
|
|
|
|
});
|
|
|
|
})
|
|
|
|
.forEach(function (el) {
|
|
|
|
document.head.removeChild(el);
|
|
|
|
});
|
|
|
|
require(['translator'], function (translator) {
|
|
|
|
// Add new meta tags
|
|
|
|
ajaxify.data._header.tags.meta
|
|
|
|
.filter(function (tagObj) {
|
|
|
|
const name = tagObj.name || tagObj.property;
|
|
|
|
return metaWhitelist.some(function (exp) {
|
|
|
|
return !!exp.test(name);
|
|
|
|
});
|
|
|
|
}).forEach(async function (tagObj) {
|
|
|
|
if (tagObj.content) {
|
|
|
|
tagObj.content = await translator.translate(tagObj.content);
|
|
|
|
}
|
|
|
|
const metaEl = document.createElement('meta');
|
|
|
|
Object.keys(tagObj).forEach(function (prop) {
|
|
|
|
metaEl.setAttribute(prop, tagObj[prop]);
|
|
|
|
});
|
|
|
|
document.head.appendChild(metaEl);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
// Delete the old link tags
|
|
|
|
Array.prototype.slice
|
|
|
|
.call(document.querySelectorAll('head link'))
|
|
|
|
.filter(function (el) {
|
|
|
|
const name = el.getAttribute('rel');
|
|
|
|
return linkWhitelist.some(function (item) {
|
|
|
|
return item === name;
|
|
|
|
});
|
|
|
|
})
|
|
|
|
.forEach(function (el) {
|
|
|
|
document.head.removeChild(el);
|
|
|
|
});
|
|
|
|
|
|
|
|
// Add new link tags
|
|
|
|
ajaxify.data._header.tags.link
|
|
|
|
.filter(function (tagObj) {
|
|
|
|
return linkWhitelist.some(function (item) {
|
|
|
|
return item === tagObj.rel;
|
|
|
|
});
|
|
|
|
})
|
|
|
|
.forEach(function (tagObj) {
|
|
|
|
const linkEl = document.createElement('link');
|
|
|
|
Object.keys(tagObj).forEach(function (prop) {
|
|
|
|
linkEl.setAttribute(prop, tagObj[prop]);
|
|
|
|
});
|
|
|
|
document.head.appendChild(linkEl);
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
ajaxify.end = function (url, tpl_url) {
|
|
|
|
// Scroll back to top of page
|
|
|
|
if (!ajaxify.isCold()) {
|
|
|
|
window.scrollTo(0, 0);
|
|
|
|
}
|
|
|
|
ajaxify.loadScript(tpl_url, function done() {
|
|
|
|
hooks.fire('action:ajaxify.end', { url: url, tpl_url: tpl_url, title: ajaxify.data.title });
|
|
|
|
hooks.logs.flush();
|
|
|
|
});
|
|
|
|
ajaxify.widgets.render(tpl_url);
|
|
|
|
|
|
|
|
hooks.fire('action:ajaxify.contentLoaded', { url: url, tpl: tpl_url });
|
|
|
|
|
|
|
|
app.processPage();
|
|
|
|
};
|
|
|
|
|
|
|
|
ajaxify.parseData = () => {
|
|
|
|
const dataEl = document.getElementById('ajaxify-data');
|
|
|
|
if (dataEl) {
|
|
|
|
try {
|
|
|
|
ajaxify.data = JSON.parse(dataEl.textContent);
|
|
|
|
} catch (e) {
|
|
|
|
console.error(e);
|
|
|
|
ajaxify.data = {};
|
|
|
|
} finally {
|
|
|
|
dataEl.remove();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
ajaxify.removeRelativePath = function (url) {
|
|
|
|
if (url.startsWith(config.relative_path.slice(1))) {
|
|
|
|
url = url.slice(config.relative_path.length);
|
|
|
|
}
|
|
|
|
return url;
|
|
|
|
};
|
|
|
|
|
|
|
|
ajaxify.refresh = function (callback) {
|
|
|
|
ajaxify.go(ajaxify.currentPage + window.location.search + window.location.hash, callback, true);
|
|
|
|
};
|
|
|
|
|
|
|
|
ajaxify.loadScript = function (tpl_url, callback) {
|
|
|
|
let location = !app.inAdmin ? 'forum/' : '';
|
|
|
|
|
|
|
|
if (tpl_url.startsWith('admin')) {
|
|
|
|
location = '';
|
|
|
|
}
|
|
|
|
const data = {
|
|
|
|
tpl_url: tpl_url,
|
|
|
|
scripts: [location + tpl_url],
|
|
|
|
};
|
|
|
|
|
|
|
|
// Hint: useful if you want to load a module on a specific page (append module name to `scripts`)
|
|
|
|
hooks.fire('action:script.load', data);
|
|
|
|
hooks.fire('filter:script.load', data).then((data) => {
|
|
|
|
// Require and parse modules
|
|
|
|
let outstanding = data.scripts.length;
|
|
|
|
|
|
|
|
const scripts = data.scripts.map(function (script) {
|
|
|
|
if (typeof script === 'function') {
|
|
|
|
return function (next) {
|
|
|
|
script();
|
|
|
|
next();
|
|
|
|
};
|
|
|
|
}
|
|
|
|
if (typeof script === 'string') {
|
Webpack5 (#10311)
* feat: webpack 5 part 1
* fix: gruntfile fixes
* fix: fix taskbar warning
add app.importScript
copy public/src/modules to build folder
* refactor: remove commented old code
* feat: reenable admin
* fix: acp settings pages, fix sortable on manage categories
embedded require in html not allowed
* fix: bundle serialize/deserizeli so plugins dont break
* test: fixe util tests
* test: fix require path
* test: more test fixes
* test: require correct utils module
* test: require correct utils
* test: log stack
* test: fix db require blowing up tests
* test: move and disable bundle test
* refactor: add aliases
* test: disable testing route
* fix: move webpack modules necessary for build, into `dependencies`
* test: fix one more test
remove 500-embed.tpl
* fix: restore use of assets/nodebb.min.js, at least for now
* fix: remove unnecessary line break
* fix: point to proper ACP bundle
* test: maybe fix build test
* test: composer
* refactor: dont need dist
* refactor: more cleanup
use everything from build/public folder
* get rid of conditional import in app.js
* fix: ace
* refactor: cropper alias
* test: lint and test fixes
* lint: fix
* refactor: rename function to app.require
* refactor: go back to using app.require
* chore: use github branch
* chore: use webpack branch
* feat: webpack webinstaller
* feat: add chunkFile name with contenthash
* refactor: move hooks to top
* refactor: get rid of template500Function
* fix(deps): use webpack5 branch of 2factor plugin
* chore: tagging v2.0.0-beta.0 pre-release version :boom: :shipit: :tada: :rocket:
* refactor: disable cache on templates
loadTemplate is called once by benchpress and the result is cache internally
* refactor: add server side helpers.js
* feat: deprecate /plugins shorthand route, closes #10343
* refactor: use build/public for webpack
* test: fix filename
* fix: more specific selector
* lint: ignore
* refactor: fix comments
* test: add debug for random failing test
* refactor: cleanup
remove test page, remove dupe functions in utils.common
* lint: use relative path for now
* chore: bump prerelease version
* feat: add translateKeys
* fix: optional params
* fix: get rid of extra timeago files
* refactor: cleanup, require timeago locale earlier
remove translator.prepareDOM, it is in header.tpl html tag
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels (#10378)
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels
- Existing hooks are preserved (to be deprecated at a later date, possibly)
- New init hooks are called on NodeBB start, and provide a one-stop shop to add new privileges, instead of having to add to four different hooks
* docs: fix typo in comment
* test: spec changes
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels (#10378)
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels
- Existing hooks are preserved (to be deprecated at a later date, possibly)
- New init hooks are called on NodeBB start, and provide a one-stop shop to add new privileges, instead of having to add to four different hooks
* docs: fix typo in comment
* test: spec changes
* feat: allow app.require('bootbox'/'benchpressjs')
* refactor: require server side utils
* test: jquery ready
* change istaller to use build/public
* test: use document.addEventListener
* refactor: closes #10301
* refactor: generateTopicClass
* fix: column counts for other privileges
* fix: #10443, regression where sorted-list items did not render into the DOM in the predicted order [breaking]
* fix: typo in hook name
* refactor: introduce a generic autocomplete.init() method that can be called to add nodebb-style autocompletion but using different data sources (e.g. not user/groups/tags)
* fix: crash if `delay` not passed in (as it cannot be destructured)
* refactor: replace substr
* feat: set --panel-offset style in html element based on stored value in localStorage
* refactor: addDropupHandler() logic to be less naive
- Take into account height of the menu
- Don't apply dropUp logic if there's nothing in the dropdown
- Remove 'hidden' class (added by default in Persona for post tools) when menu items are added
closes #10423
* refactor: simplify utils.params [breaking]
Retrospective analysis of the usage of this method suggests that the options passed in are superfluous, and that only `url` is required. Using a browser built-in makes more sense to accomplish what this method sets out to do.
* feat: add support for returning full URLSearchParams for utils.params
* fix: utils.params() fallback handling
* fix: default empty obj for params()
* fix: remove \'loggedin\' and \'register\' qs parameters once they have been used, delay invocation of messages until ajaxify.end
* fix: utils.params() not allowing relative paths to be passed in
* refactor(DRY): new assertPasswordValidity utils method
* fix: incorrect error message returned on insufficient privilege on flag edit
* fix: read/update/delete access to flags API should be limited for moderators to only post flags in categories they moderate
- added failing tests and patched up middleware.assert.flags to fix
* refactor: flag api v3 tests to create new post and flags on every round
* fix: missing error:no-flag language key
* refactor: flags.canView to check flag existence, simplify middleware.assert.flag
* feat: flag deletion API endpoint, #10426
* feat: UI for flag deletion, closes #10426
* chore: update plugin versions
* chore: up emoji
* chore: update markdown
* chore: up emoji-android
* fix: regression caused by utils.params() refactor, supports arrays and pipes all values through utils.toType, adjusts tests to type check
Co-authored-by: Julian Lam <[email protected]>
3 years ago
|
|
|
return async function (next) {
|
|
|
|
const module = await app.require(script);
|
|
|
|
// Hint: useful if you want to override a loaded library (e.g. replace core client-side logic),
|
|
|
|
// or call a method other than .init()
|
|
|
|
hooks.fire('static:script.init', { tpl_url, name: script, module }).then(() => {
|
|
|
|
if (module && module.init) {
|
|
|
|
module.init();
|
|
|
|
}
|
|
|
|
next();
|
|
|
|
});
|
|
|
|
};
|
|
|
|
}
|
|
|
|
return null;
|
|
|
|
}).filter(Boolean);
|
|
|
|
|
|
|
|
if (scripts.length) {
|
|
|
|
scripts.forEach(function (fn) {
|
|
|
|
fn(function () {
|
|
|
|
outstanding -= 1;
|
|
|
|
if (outstanding === 0) {
|
|
|
|
callback();
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
|
|
|
} else {
|
|
|
|
callback();
|
|
|
|
}
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
ajaxify.loadData = function (url, callback) {
|
|
|
|
url = ajaxify.removeRelativePath(url);
|
|
|
|
|
|
|
|
hooks.fire('action:ajaxify.loadingData', { url: url });
|
|
|
|
|
|
|
|
apiXHR = $.ajax({
|
|
|
|
url: config.relative_path + '/api/' + url,
|
|
|
|
cache: false,
|
|
|
|
headers: {
|
|
|
|
'X-Return-To': app.previousUrl,
|
|
|
|
},
|
|
|
|
success: function (data, textStatus, xhr) {
|
|
|
|
if (!data) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (xhr.getResponseHeader('X-Redirect')) {
|
|
|
|
return callback({
|
|
|
|
data: {
|
|
|
|
status: 302,
|
|
|
|
responseJSON: data,
|
|
|
|
},
|
|
|
|
textStatus: 'error',
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
ajaxify.data = data;
|
|
|
|
data.config = config;
|
|
|
|
|
|
|
|
hooks.fire('action:ajaxify.dataLoaded', { url: url, data: data });
|
|
|
|
|
|
|
|
callback(null, data);
|
|
|
|
},
|
|
|
|
error: function (data, textStatus) {
|
|
|
|
if (data.status === 0 && textStatus === 'error') {
|
|
|
|
data.status = 500;
|
|
|
|
data.responseJSON = data.responseJSON || {};
|
|
|
|
data.responseJSON.error = '[[error:no-connection]]';
|
|
|
|
}
|
|
|
|
callback({
|
|
|
|
data: data,
|
|
|
|
textStatus: textStatus,
|
|
|
|
});
|
|
|
|
},
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
ajaxify.loadTemplate = function (template, callback) {
|
Webpack5 (#10311)
* feat: webpack 5 part 1
* fix: gruntfile fixes
* fix: fix taskbar warning
add app.importScript
copy public/src/modules to build folder
* refactor: remove commented old code
* feat: reenable admin
* fix: acp settings pages, fix sortable on manage categories
embedded require in html not allowed
* fix: bundle serialize/deserizeli so plugins dont break
* test: fixe util tests
* test: fix require path
* test: more test fixes
* test: require correct utils module
* test: require correct utils
* test: log stack
* test: fix db require blowing up tests
* test: move and disable bundle test
* refactor: add aliases
* test: disable testing route
* fix: move webpack modules necessary for build, into `dependencies`
* test: fix one more test
remove 500-embed.tpl
* fix: restore use of assets/nodebb.min.js, at least for now
* fix: remove unnecessary line break
* fix: point to proper ACP bundle
* test: maybe fix build test
* test: composer
* refactor: dont need dist
* refactor: more cleanup
use everything from build/public folder
* get rid of conditional import in app.js
* fix: ace
* refactor: cropper alias
* test: lint and test fixes
* lint: fix
* refactor: rename function to app.require
* refactor: go back to using app.require
* chore: use github branch
* chore: use webpack branch
* feat: webpack webinstaller
* feat: add chunkFile name with contenthash
* refactor: move hooks to top
* refactor: get rid of template500Function
* fix(deps): use webpack5 branch of 2factor plugin
* chore: tagging v2.0.0-beta.0 pre-release version :boom: :shipit: :tada: :rocket:
* refactor: disable cache on templates
loadTemplate is called once by benchpress and the result is cache internally
* refactor: add server side helpers.js
* feat: deprecate /plugins shorthand route, closes #10343
* refactor: use build/public for webpack
* test: fix filename
* fix: more specific selector
* lint: ignore
* refactor: fix comments
* test: add debug for random failing test
* refactor: cleanup
remove test page, remove dupe functions in utils.common
* lint: use relative path for now
* chore: bump prerelease version
* feat: add translateKeys
* fix: optional params
* fix: get rid of extra timeago files
* refactor: cleanup, require timeago locale earlier
remove translator.prepareDOM, it is in header.tpl html tag
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels (#10378)
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels
- Existing hooks are preserved (to be deprecated at a later date, possibly)
- New init hooks are called on NodeBB start, and provide a one-stop shop to add new privileges, instead of having to add to four different hooks
* docs: fix typo in comment
* test: spec changes
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels (#10378)
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels
- Existing hooks are preserved (to be deprecated at a later date, possibly)
- New init hooks are called on NodeBB start, and provide a one-stop shop to add new privileges, instead of having to add to four different hooks
* docs: fix typo in comment
* test: spec changes
* feat: allow app.require('bootbox'/'benchpressjs')
* refactor: require server side utils
* test: jquery ready
* change istaller to use build/public
* test: use document.addEventListener
* refactor: closes #10301
* refactor: generateTopicClass
* fix: column counts for other privileges
* fix: #10443, regression where sorted-list items did not render into the DOM in the predicted order [breaking]
* fix: typo in hook name
* refactor: introduce a generic autocomplete.init() method that can be called to add nodebb-style autocompletion but using different data sources (e.g. not user/groups/tags)
* fix: crash if `delay` not passed in (as it cannot be destructured)
* refactor: replace substr
* feat: set --panel-offset style in html element based on stored value in localStorage
* refactor: addDropupHandler() logic to be less naive
- Take into account height of the menu
- Don't apply dropUp logic if there's nothing in the dropdown
- Remove 'hidden' class (added by default in Persona for post tools) when menu items are added
closes #10423
* refactor: simplify utils.params [breaking]
Retrospective analysis of the usage of this method suggests that the options passed in are superfluous, and that only `url` is required. Using a browser built-in makes more sense to accomplish what this method sets out to do.
* feat: add support for returning full URLSearchParams for utils.params
* fix: utils.params() fallback handling
* fix: default empty obj for params()
* fix: remove \'loggedin\' and \'register\' qs parameters once they have been used, delay invocation of messages until ajaxify.end
* fix: utils.params() not allowing relative paths to be passed in
* refactor(DRY): new assertPasswordValidity utils method
* fix: incorrect error message returned on insufficient privilege on flag edit
* fix: read/update/delete access to flags API should be limited for moderators to only post flags in categories they moderate
- added failing tests and patched up middleware.assert.flags to fix
* refactor: flag api v3 tests to create new post and flags on every round
* fix: missing error:no-flag language key
* refactor: flags.canView to check flag existence, simplify middleware.assert.flag
* feat: flag deletion API endpoint, #10426
* feat: UI for flag deletion, closes #10426
* chore: update plugin versions
* chore: up emoji
* chore: update markdown
* chore: up emoji-android
* fix: regression caused by utils.params() refactor, supports arrays and pipes all values through utils.toType, adjusts tests to type check
Co-authored-by: Julian Lam <[email protected]>
3 years ago
|
|
|
$.ajax({
|
|
|
|
url: `${config.asset_base_url}/templates/${template}.js`,
|
|
|
|
cache: false,
|
|
|
|
dataType: 'text',
|
|
|
|
success: function (script) {
|
|
|
|
// eslint-disable-next-line no-new-func
|
|
|
|
const renderFunction = new Function('module', script);
|
|
|
|
const moduleObj = { exports: {} };
|
|
|
|
renderFunction(moduleObj);
|
|
|
|
callback(moduleObj.exports);
|
|
|
|
},
|
|
|
|
}).fail(function () {
|
|
|
|
console.error('Unable to load template: ' + template);
|
Webpack5 (#10311)
* feat: webpack 5 part 1
* fix: gruntfile fixes
* fix: fix taskbar warning
add app.importScript
copy public/src/modules to build folder
* refactor: remove commented old code
* feat: reenable admin
* fix: acp settings pages, fix sortable on manage categories
embedded require in html not allowed
* fix: bundle serialize/deserizeli so plugins dont break
* test: fixe util tests
* test: fix require path
* test: more test fixes
* test: require correct utils module
* test: require correct utils
* test: log stack
* test: fix db require blowing up tests
* test: move and disable bundle test
* refactor: add aliases
* test: disable testing route
* fix: move webpack modules necessary for build, into `dependencies`
* test: fix one more test
remove 500-embed.tpl
* fix: restore use of assets/nodebb.min.js, at least for now
* fix: remove unnecessary line break
* fix: point to proper ACP bundle
* test: maybe fix build test
* test: composer
* refactor: dont need dist
* refactor: more cleanup
use everything from build/public folder
* get rid of conditional import in app.js
* fix: ace
* refactor: cropper alias
* test: lint and test fixes
* lint: fix
* refactor: rename function to app.require
* refactor: go back to using app.require
* chore: use github branch
* chore: use webpack branch
* feat: webpack webinstaller
* feat: add chunkFile name with contenthash
* refactor: move hooks to top
* refactor: get rid of template500Function
* fix(deps): use webpack5 branch of 2factor plugin
* chore: tagging v2.0.0-beta.0 pre-release version :boom: :shipit: :tada: :rocket:
* refactor: disable cache on templates
loadTemplate is called once by benchpress and the result is cache internally
* refactor: add server side helpers.js
* feat: deprecate /plugins shorthand route, closes #10343
* refactor: use build/public for webpack
* test: fix filename
* fix: more specific selector
* lint: ignore
* refactor: fix comments
* test: add debug for random failing test
* refactor: cleanup
remove test page, remove dupe functions in utils.common
* lint: use relative path for now
* chore: bump prerelease version
* feat: add translateKeys
* fix: optional params
* fix: get rid of extra timeago files
* refactor: cleanup, require timeago locale earlier
remove translator.prepareDOM, it is in header.tpl html tag
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels (#10378)
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels
- Existing hooks are preserved (to be deprecated at a later date, possibly)
- New init hooks are called on NodeBB start, and provide a one-stop shop to add new privileges, instead of having to add to four different hooks
* docs: fix typo in comment
* test: spec changes
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels (#10378)
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels
- Existing hooks are preserved (to be deprecated at a later date, possibly)
- New init hooks are called on NodeBB start, and provide a one-stop shop to add new privileges, instead of having to add to four different hooks
* docs: fix typo in comment
* test: spec changes
* feat: allow app.require('bootbox'/'benchpressjs')
* refactor: require server side utils
* test: jquery ready
* change istaller to use build/public
* test: use document.addEventListener
* refactor: closes #10301
* refactor: generateTopicClass
* fix: column counts for other privileges
* fix: #10443, regression where sorted-list items did not render into the DOM in the predicted order [breaking]
* fix: typo in hook name
* refactor: introduce a generic autocomplete.init() method that can be called to add nodebb-style autocompletion but using different data sources (e.g. not user/groups/tags)
* fix: crash if `delay` not passed in (as it cannot be destructured)
* refactor: replace substr
* feat: set --panel-offset style in html element based on stored value in localStorage
* refactor: addDropupHandler() logic to be less naive
- Take into account height of the menu
- Don't apply dropUp logic if there's nothing in the dropdown
- Remove 'hidden' class (added by default in Persona for post tools) when menu items are added
closes #10423
* refactor: simplify utils.params [breaking]
Retrospective analysis of the usage of this method suggests that the options passed in are superfluous, and that only `url` is required. Using a browser built-in makes more sense to accomplish what this method sets out to do.
* feat: add support for returning full URLSearchParams for utils.params
* fix: utils.params() fallback handling
* fix: default empty obj for params()
* fix: remove \'loggedin\' and \'register\' qs parameters once they have been used, delay invocation of messages until ajaxify.end
* fix: utils.params() not allowing relative paths to be passed in
* refactor(DRY): new assertPasswordValidity utils method
* fix: incorrect error message returned on insufficient privilege on flag edit
* fix: read/update/delete access to flags API should be limited for moderators to only post flags in categories they moderate
- added failing tests and patched up middleware.assert.flags to fix
* refactor: flag api v3 tests to create new post and flags on every round
* fix: missing error:no-flag language key
* refactor: flags.canView to check flag existence, simplify middleware.assert.flag
* feat: flag deletion API endpoint, #10426
* feat: UI for flag deletion, closes #10426
* chore: update plugin versions
* chore: up emoji
* chore: update markdown
* chore: up emoji-android
* fix: regression caused by utils.params() refactor, supports arrays and pipes all values through utils.toType, adjusts tests to type check
Co-authored-by: Julian Lam <[email protected]>
3 years ago
|
|
|
callback(new Error('[[error:unable-to-load-template]]'));
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
ajaxify.cleanup = (url, tpl_url) => {
|
|
|
|
app.leaveCurrentRoom();
|
|
|
|
$(window).off('scroll');
|
|
|
|
hooks.fire('action:ajaxify.cleanup', { url, tpl_url });
|
|
|
|
};
|
|
|
|
|
|
|
|
require(['translator', 'benchpress'], function (translator, Benchpress) {
|
|
|
|
translator.translate('[[error:no-connection]]');
|
|
|
|
translator.translate('[[error:socket-reconnect-failed]]');
|
|
|
|
translator.translate(`[[global:reconnecting-message, ${config.siteTitle}]]`);
|
|
|
|
Benchpress.registerLoader(ajaxify.loadTemplate);
|
|
|
|
Benchpress.setGlobal('config', config);
|
Webpack5 (#10311)
* feat: webpack 5 part 1
* fix: gruntfile fixes
* fix: fix taskbar warning
add app.importScript
copy public/src/modules to build folder
* refactor: remove commented old code
* feat: reenable admin
* fix: acp settings pages, fix sortable on manage categories
embedded require in html not allowed
* fix: bundle serialize/deserizeli so plugins dont break
* test: fixe util tests
* test: fix require path
* test: more test fixes
* test: require correct utils module
* test: require correct utils
* test: log stack
* test: fix db require blowing up tests
* test: move and disable bundle test
* refactor: add aliases
* test: disable testing route
* fix: move webpack modules necessary for build, into `dependencies`
* test: fix one more test
remove 500-embed.tpl
* fix: restore use of assets/nodebb.min.js, at least for now
* fix: remove unnecessary line break
* fix: point to proper ACP bundle
* test: maybe fix build test
* test: composer
* refactor: dont need dist
* refactor: more cleanup
use everything from build/public folder
* get rid of conditional import in app.js
* fix: ace
* refactor: cropper alias
* test: lint and test fixes
* lint: fix
* refactor: rename function to app.require
* refactor: go back to using app.require
* chore: use github branch
* chore: use webpack branch
* feat: webpack webinstaller
* feat: add chunkFile name with contenthash
* refactor: move hooks to top
* refactor: get rid of template500Function
* fix(deps): use webpack5 branch of 2factor plugin
* chore: tagging v2.0.0-beta.0 pre-release version :boom: :shipit: :tada: :rocket:
* refactor: disable cache on templates
loadTemplate is called once by benchpress and the result is cache internally
* refactor: add server side helpers.js
* feat: deprecate /plugins shorthand route, closes #10343
* refactor: use build/public for webpack
* test: fix filename
* fix: more specific selector
* lint: ignore
* refactor: fix comments
* test: add debug for random failing test
* refactor: cleanup
remove test page, remove dupe functions in utils.common
* lint: use relative path for now
* chore: bump prerelease version
* feat: add translateKeys
* fix: optional params
* fix: get rid of extra timeago files
* refactor: cleanup, require timeago locale earlier
remove translator.prepareDOM, it is in header.tpl html tag
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels (#10378)
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels
- Existing hooks are preserved (to be deprecated at a later date, possibly)
- New init hooks are called on NodeBB start, and provide a one-stop shop to add new privileges, instead of having to add to four different hooks
* docs: fix typo in comment
* test: spec changes
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels (#10378)
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels
- Existing hooks are preserved (to be deprecated at a later date, possibly)
- New init hooks are called on NodeBB start, and provide a one-stop shop to add new privileges, instead of having to add to four different hooks
* docs: fix typo in comment
* test: spec changes
* feat: allow app.require('bootbox'/'benchpressjs')
* refactor: require server side utils
* test: jquery ready
* change istaller to use build/public
* test: use document.addEventListener
* refactor: closes #10301
* refactor: generateTopicClass
* fix: column counts for other privileges
* fix: #10443, regression where sorted-list items did not render into the DOM in the predicted order [breaking]
* fix: typo in hook name
* refactor: introduce a generic autocomplete.init() method that can be called to add nodebb-style autocompletion but using different data sources (e.g. not user/groups/tags)
* fix: crash if `delay` not passed in (as it cannot be destructured)
* refactor: replace substr
* feat: set --panel-offset style in html element based on stored value in localStorage
* refactor: addDropupHandler() logic to be less naive
- Take into account height of the menu
- Don't apply dropUp logic if there's nothing in the dropdown
- Remove 'hidden' class (added by default in Persona for post tools) when menu items are added
closes #10423
* refactor: simplify utils.params [breaking]
Retrospective analysis of the usage of this method suggests that the options passed in are superfluous, and that only `url` is required. Using a browser built-in makes more sense to accomplish what this method sets out to do.
* feat: add support for returning full URLSearchParams for utils.params
* fix: utils.params() fallback handling
* fix: default empty obj for params()
* fix: remove \'loggedin\' and \'register\' qs parameters once they have been used, delay invocation of messages until ajaxify.end
* fix: utils.params() not allowing relative paths to be passed in
* refactor(DRY): new assertPasswordValidity utils method
* fix: incorrect error message returned on insufficient privilege on flag edit
* fix: read/update/delete access to flags API should be limited for moderators to only post flags in categories they moderate
- added failing tests and patched up middleware.assert.flags to fix
* refactor: flag api v3 tests to create new post and flags on every round
* fix: missing error:no-flag language key
* refactor: flags.canView to check flag existence, simplify middleware.assert.flag
* feat: flag deletion API endpoint, #10426
* feat: UI for flag deletion, closes #10426
* chore: update plugin versions
* chore: up emoji
* chore: update markdown
* chore: up emoji-android
* fix: regression caused by utils.params() refactor, supports arrays and pipes all values through utils.toType, adjusts tests to type check
Co-authored-by: Julian Lam <[email protected]>
3 years ago
|
|
|
Benchpress.render('500', {}); // loads and caches the 500.tpl
|
|
|
|
});
|
|
|
|
}());
|
|
|
|
|
|
|
|
$(document).ready(function () {
|
|
|
|
$(window).on('popstate', function (ev) {
|
|
|
|
ev = ev.originalEvent;
|
|
|
|
|
|
|
|
if (ev !== null && ev.state) {
|
|
|
|
if (ev.state.url === null && ev.state.returnPath !== undefined) {
|
|
|
|
window.history.replaceState({
|
|
|
|
url: ev.state.returnPath,
|
|
|
|
}, ev.state.returnPath, config.relative_path + '/' + ev.state.returnPath);
|
|
|
|
} else if (ev.state.url !== undefined) {
|
|
|
|
ajaxify.go(ev.state.url, function () {
|
|
|
|
hooks.fire('action:popstate', { url: ev.state.url });
|
|
|
|
}, true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
function ajaxifyAnchors() {
|
|
|
|
function hrefEmpty(href) {
|
|
|
|
// eslint-disable-next-line no-script-url
|
|
|
|
return href === undefined || href === '' || href === 'javascript:;';
|
|
|
|
}
|
|
|
|
const location = document.location || window.location;
|
|
|
|
const rootUrl = location.protocol + '//' + (location.hostname || location.host) + (location.port ? ':' + location.port : '');
|
|
|
|
const contentEl = document.getElementById('content');
|
|
|
|
|
|
|
|
// Enhancing all anchors to ajaxify...
|
|
|
|
$(document.body).on('click', 'a', function (e) {
|
|
|
|
const _self = this;
|
|
|
|
if (this.target !== '' || (this.protocol !== 'http:' && this.protocol !== 'https:')) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
const $this = $(this);
|
|
|
|
const href = $this.attr('href');
|
|
|
|
const internalLink = utils.isInternalURI(this, window.location, config.relative_path);
|
|
|
|
|
|
|
|
const rootAndPath = new RegExp(`^${rootUrl}${config.relative_path}/?`);
|
|
|
|
const process = function () {
|
|
|
|
if (!e.ctrlKey && !e.shiftKey && !e.metaKey && e.which === 1) {
|
|
|
|
if (internalLink) {
|
|
|
|
const pathname = this.href.replace(rootAndPath, '');
|
|
|
|
|
|
|
|
// Special handling for urls with hashes
|
|
|
|
if (window.location.pathname === this.pathname && this.hash.length) {
|
|
|
|
window.location.hash = this.hash;
|
|
|
|
} else if (ajaxify.go(pathname)) {
|
|
|
|
e.preventDefault();
|
|
|
|
}
|
|
|
|
} else if (window.location.pathname !== config.relative_path + '/outgoing') {
|
|
|
|
if (config.openOutgoingLinksInNewTab && $.contains(contentEl, this)) {
|
|
|
|
const externalTab = window.open();
|
|
|
|
externalTab.opener = null;
|
|
|
|
externalTab.location = this.href;
|
|
|
|
e.preventDefault();
|
|
|
|
} else if (config.useOutgoingLinksPage) {
|
|
|
|
const safeUrls = config.outgoingLinksWhitelist.trim().split(/[\s,]+/g).filter(Boolean);
|
|
|
|
const href = this.href;
|
|
|
|
if (!safeUrls.length || !safeUrls.some(function (url) { return href.indexOf(url) !== -1; })) {
|
|
|
|
ajaxify.go('outgoing?url=' + encodeURIComponent(href));
|
|
|
|
e.preventDefault();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
if ($this.attr('data-ajaxify') === 'false') {
|
|
|
|
if (!internalLink) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
return e.preventDefault();
|
|
|
|
}
|
|
|
|
|
|
|
|
// Default behaviour for rss feeds
|
|
|
|
if (internalLink && href && href.endsWith('.rss')) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Default behaviour for sitemap
|
|
|
|
if (internalLink && href && String(_self.pathname).startsWith(config.relative_path + '/sitemap') && href.endsWith('.xml')) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Default behaviour for uploads and direct links to API urls
|
|
|
|
if (internalLink && ['/uploads', '/assets/', '/api/'].some(function (prefix) {
|
|
|
|
return String(_self.pathname).startsWith(config.relative_path + prefix);
|
|
|
|
})) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// eslint-disable-next-line no-script-url
|
|
|
|
if (hrefEmpty(this.href) || this.protocol === 'javascript:' || href === '#' || href === '') {
|
|
|
|
return e.preventDefault();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (app.flags && app.flags.hasOwnProperty('_unsaved') && app.flags._unsaved === true) {
|
|
|
|
if (e.ctrlKey) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
require(['bootbox'], function (bootbox) {
|
|
|
|
bootbox.confirm('[[global:unsaved-changes]]', function (navigate) {
|
|
|
|
if (navigate) {
|
|
|
|
app.flags._unsaved = false;
|
|
|
|
process.call(_self);
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
|
|
|
return e.preventDefault();
|
|
|
|
}
|
|
|
|
|
|
|
|
process.call(_self);
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
if (window.history && window.history.pushState) {
|
|
|
|
// Progressive Enhancement, ajaxify available only to modern browsers
|
|
|
|
ajaxifyAnchors();
|
|
|
|
}
|
|
|
|
});
|