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

chore: eslint no-var, vars-on-top

Browse Source
This commit is contained in:
Peter Jaszkowiak
2021-02-04 00:06:15 -07:00
committed by Julian Lam
parent b56d9e12b5
commit dab3b23575
255 changed files with 1988 additions and 1995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/settings.js
View File

@@ -1,14 +1,14 @@
'use strict';
var meta = require('./meta');
var pubsub = require('./pubsub');
const meta = require('./meta');
const pubsub = require('./pubsub');
function expandObjBy(obj1, obj2) {
var key;
var val1;
var val2;
var xorValIsArray;
var changed = false;
let key;
let val1;
let val2;
let xorValIsArray;
let changed = false;
for (key in obj2) {
if (obj2.hasOwnProperty(key)) {
val2 = obj2[key];
@@ -28,8 +28,8 @@ function expandObjBy(obj1, obj2) {
}
function trim(obj1, obj2) {
var key;
var val1;
let key;
let val1;
for (key in obj1) {
if (obj1.hasOwnProperty(key)) {
val1 = obj1[key];
@@ -69,7 +69,7 @@ function Settings(hash, version, defCfg, callback, forceUpdate, reset) {
this.hash = hash;
this.version = version || this.version;
this.defCfg = defCfg;
var self = this;
const self = this;
if (reset) {
this.reset(callback);
@@ -95,7 +95,7 @@ Settings.prototype.version = '0.0.0';
@param callback Gets called when done.
*/
Settings.prototype.sync = function (callback) {
var _this = this;
const _this = this;
meta.settings.get(this.hash, (err, settings) => {
try {
if (settings._) {
@@ -119,8 +119,8 @@ Settings.prototype.sync = function (callback) {
@param callback Gets called when done.
*/
Settings.prototype.persist = function (callback) {
var conf = this.cfg._;
var _this = this;
let conf = this.cfg._;
const _this = this;
if (typeof conf === 'object') {
conf = JSON.stringify(conf);
}
@@ -139,10 +139,10 @@ Settings.prototype.persist = function (callback) {
@returns Object The setting to be used.
*/
Settings.prototype.get = function (key, def) {
var obj = this.cfg._;
var parts = (key || '').split('.');
var part;
for (var i = 0; i < parts.length; i += 1) {
let obj = this.cfg._;
const parts = (key || '').split('.');
let part;
for (let i = 0; i < parts.length; i += 1) {
part = parts[i];
if (part && obj != null) {
obj = obj[part];
@@ -151,7 +151,7 @@ Settings.prototype.get = function (key, def) {
if (obj === undefined) {
if (def === undefined) {
def = this.defCfg;
for (var j = 0; j < parts.length; j += 1) {
for (let j = 0; j < parts.length; j += 1) {
part = parts[j];
if (part && def != null) {
def = def[part];
@@ -196,16 +196,16 @@ Settings.prototype.createDefaultWrapper = function () {
@param val The value to set.
*/
Settings.prototype.set = function (key, val) {
var part;
var obj;
var parts;
let part;
let obj;
let parts;
this.cfg.v = this.version;
if (val == null || !key) {
this.cfg._ = val || key;
} else {
obj = this.cfg._;
parts = key.split('.');
for (var i = 0, _len = parts.length - 1; i < _len; i += 1) {
for (let i = 0, _len = parts.length - 1; i < _len; i += 1) {
part = parts[i];
if (part) {
if (!obj.hasOwnProperty(part)) {