diff --git a/.jshintignore b/.jshintignore new file mode 100644 index 0000000000000000000000000000000000000000..e841f1696a7789eaede6130399d843a744ba9085 --- /dev/null +++ b/.jshintignore @@ -0,0 +1,4 @@ +// Minified files +**/src/js/bugReport.js +**/dTree.min.js +**/js/displayVariables.js diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js index e1a2f3a5e68f94d43fea3ea91f11274726336455..9341f0940543fc49372cf8cc008fcc6ff4d6d43a 100644 --- a/src/js/DefaultRules.js +++ b/src/js/DefaultRules.js @@ -2910,7 +2910,7 @@ window.DefaultRules = (function() { */ function ProcessLabel(slave, rule) { //mass removal of old tags, variant from '*' mask. - if (rule.removeLabel !== null && rule.removeLabel !== '' && rule.removeLabel == '*') { + if (rule.removeLabel !== null && rule.removeLabel !== '' && rule.removeLabel === '*') { slave.custom.label = slave.custom.label.replace(/(?:\[.+\])+/, ""); r += `<br>All ${slave.slaveName}'s tags is removed.`; } diff --git a/src/js/utilJS.js b/src/js/utilJS.js index 4a814174e5b9bc20b160683e89b9503c3dae0f28..2bedaf4f5ebd452cb763441b03fc284d046f7393 100644 --- a/src/js/utilJS.js +++ b/src/js/utilJS.js @@ -1071,7 +1071,7 @@ window.asPlural = function(single, plural) { single = asObj.single; plural = asObj.plural; } - if (plural == null) { + if (plural === null) { plural = single + "s"; } return plural; @@ -1189,7 +1189,7 @@ window.years = function(weeks) { return r; }; window.asDate = function(weeks, bonusDay = 0) { - if (weeks == null) { + if (weeks === null) { weeks = State.variables.week; } let d = new Date(2037, 0, 12); diff --git a/src/pregmod/customizeSlaveTrade.tw b/src/pregmod/customizeSlaveTrade.tw index 5bafb9f95c25178049c669f7d049c37ec422e602..829a10963ea3eb09c8f8e248ac6738765692ce2f 100644 --- a/src/pregmod/customizeSlaveTrade.tw +++ b/src/pregmod/customizeSlaveTrade.tw @@ -44,5 +44,5 @@ var widgets = Story.widgets setTimeout(function() { new Wikifier(jQuery('#mod-presets'), widgets); }, 0); <</script>> <br><br> -<<click "Export Settings">><<script>>App.CustomSlaveTrade.export()<</script>><</click>> | <<click "Import Settings">><<script>>App.CustomSlaveTrade.import()<</script>><</click>> +<<link "Export Settings">><<script>>App.CustomSlaveTrade.export()<</script>><</link>> | <<link "Import Settings">><<script>>App.CustomSlaveTrade.import()<</script>><</link>> <div id="importExportArea"></div> diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw index c7d75c617f58fab233e0c7300897b07166a969fa..350ad37699cc391ba6ddc3736e5918aaf9a94509 100644 --- a/src/uncategorized/bodyModification.tw +++ b/src/uncategorized/bodyModification.tw @@ -951,7 +951,7 @@ Branding: $His skin is unmarked. <</if>> -<<if !(Object.values(State.variables.activeSlave.brand).includes(State.variables.brandDesign.official))>> +<<if !(Object.values($activeSlave.brand).includes($brandDesign.official))>> <br> $He lacks your [[official brand|Universal Rules]], "$brandDesign.official." <</if>>