Change Helpers to export functions instead of being a class

This commit is contained in:
Robbie Antenesse 2017-08-20 23:53:59 -06:00
parent c459c30fb5
commit d49ffa8d94
7 changed files with 113 additions and 126 deletions

View File

@ -1,118 +0,0 @@
class Helper {
constructor () {
this.addHelpfulPrototypes();
}
addHelpfulPrototypes () {
// Warn if overriding existing method
if (String.prototype.capitalize)
console.warn("Overriding existing String.prototype.capitalize. Possible causes: New API defines the method, there's a framework conflict or you've got double inclusions in your code.");
String.prototype.capitalize = function () {
return this.charAt(0).toUpperCase() + this.slice(1);
}
// Warn if overriding existing method
if (String.prototype.replaceAt)
console.warn("Overriding existing String.prototype.replaceAt. Possible causes: New API defines the method, there's a framework conflict or you've got double inclusions in your code.");
String.prototype.replaceAt = function (index, replacement) {
return this.substr(0, index) + replacement + this.substr(index + replacement.length);
}
// Warn if overriding existing method
if (Array.prototype.equals)
console.warn("Overriding existing Array.prototype.equals. Possible causes: New API defines the method, there's a framework conflict or you've got double inclusions in your code.");
// attach the .equals method to Array's prototype to call it on any array
Array.prototype.equals = function (array) {
// if the other array is a falsy value, return
if (!array)
return false;
// compare lengths - can save a lot of time
if (this.length != array.length)
return false;
for (var i = 0, l=this.length; i < l; i++) {
// Check if we have nested arrays
if (this[i] instanceof Array && array[i] instanceof Array) {
// recurse into the nested arrays
if (!this[i].equals(array[i]))
return false;
}
else if (this[i] != array[i]) {
// Warning - two different object instances will never be equal: {x:20} != {x:20}
return false;
}
}
return true;
}
// Hide method from for-in loops
Object.defineProperty(Array.prototype, 'equals', {enumerable: false});
// Warn if overriding existing method
if (Array.prototype.unique)
console.warn("Overriding existing Array.prototype.unique. Possible causes: New API defines the method, there's a framework conflict or you've got double inclusions in your code.");
// attach the .unique method to Array's prototype to call it on any array
Array.prototype.unique = function () {
return this.filter(function(item, position, array) {
return array.indexOf(item) == position;
});
}
// Hide method from for-in loops
Object.defineProperty(Array.prototype, 'unique', {enumerable: false});
// Warn if overriding existing method
if (Array.prototype.sortCustomOrder)
console.warn("Overriding existing Array.prototype.sortCustomOrder. Possible causes: New API defines the method, there's a framework conflict or you've got double inclusions in your code.");
// attach the .sortCustomOrder method to Array's prototype to call it on any array
Array.prototype.sortCustomOrder = function (sortOrderArray, sortKey = null) {
// Depends on above prototype
sortOrderArray = sortOrderArray.unique()
.map(item => { return item.toLowerCase() });
if (sortOrderArray.length > 0) {
return this.sort(function (a, b) {
if (sortKey) {
const aValue = a[sortKey].toLowerCase(),
bValue = b[sortKey].toLowerCase();
return sortOrderArray.indexOf(aValue) - sortOrderArray.indexOf(bValue);
}
const aValue = a.toLowerCase(),
bValue = b.toLowerCase();
return sortOrderArray.indexOf(aValue) - sortOrderArray.indexOf(bValue);
});
}
// If an empty sort array is given, sort it alphabetically.
if (sortKey) {
return this.sort(function (a, b) {
if (a[sortKey] == b[sortKey]) return 0;
return (a[sortKey] < b[sortKey]) ? -1 : 1;
});
}
return this.sort();
}
// Hide method from for-in loops
Object.defineProperty(Array.prototype, 'sortCustomOrder', {enumerable: false});
// Warn if overriding existing method
if (Object.prototype.isEmpty)
console.warn("Overriding existing Object.prototype.isEmpty. Possible causes: New API defines the method, there's a framework conflict or you've got double inclusions in your code.");
Object.prototype.isEmpty = function () {
for(let key in this) {
if(this.hasOwnProperty(key))
return false;
}
return true;
}
// Hide method from for-in loops
Object.defineProperty(Object.prototype, 'isEmpty', {enumerable: false});
}
characterIsUppercase (character) {
return character === character.toUpperCase();
}
}
export default new Helper;

110
src/Helpers.js Normal file
View File

@ -0,0 +1,110 @@
export function addHelpfulPrototypes () {
// Warn if overriding existing method
if (String.prototype.capitalize)
console.warn("Overriding existing String.prototype.capitalize. Possible causes: New API defines the method, there's a framework conflict or you've got double inclusions in your code.");
String.prototype.capitalize = function () {
return this.charAt(0).toUpperCase() + this.slice(1);
}
// Warn if overriding existing method
if (String.prototype.replaceAt)
console.warn("Overriding existing String.prototype.replaceAt. Possible causes: New API defines the method, there's a framework conflict or you've got double inclusions in your code.");
String.prototype.replaceAt = function (index, replacement) {
return this.substr(0, index) + replacement + this.substr(index + replacement.length);
}
// Warn if overriding existing method
if (Array.prototype.equals)
console.warn("Overriding existing Array.prototype.equals. Possible causes: New API defines the method, there's a framework conflict or you've got double inclusions in your code.");
// attach the .equals method to Array's prototype to call it on any array
Array.prototype.equals = function (array) {
// if the other array is a falsy value, return
if (!array)
return false;
// compare lengths - can save a lot of time
if (this.length != array.length)
return false;
for (var i = 0, l=this.length; i < l; i++) {
// Check if we have nested arrays
if (this[i] instanceof Array && array[i] instanceof Array) {
// recurse into the nested arrays
if (!this[i].equals(array[i]))
return false;
}
else if (this[i] != array[i]) {
// Warning - two different object instances will never be equal: {x:20} != {x:20}
return false;
}
}
return true;
}
// Hide method from for-in loops
Object.defineProperty(Array.prototype, 'equals', {enumerable: false});
// Warn if overriding existing method
if (Array.prototype.unique)
console.warn("Overriding existing Array.prototype.unique. Possible causes: New API defines the method, there's a framework conflict or you've got double inclusions in your code.");
// attach the .unique method to Array's prototype to call it on any array
Array.prototype.unique = function () {
return this.filter(function(item, position, array) {
return array.indexOf(item) == position;
});
}
// Hide method from for-in loops
Object.defineProperty(Array.prototype, 'unique', {enumerable: false});
// Warn if overriding existing method
if (Array.prototype.sortCustomOrder)
console.warn("Overriding existing Array.prototype.sortCustomOrder. Possible causes: New API defines the method, there's a framework conflict or you've got double inclusions in your code.");
// attach the .sortCustomOrder method to Array's prototype to call it on any array
Array.prototype.sortCustomOrder = function (sortOrderArray, sortKey = null) {
// Depends on above prototype
sortOrderArray = sortOrderArray.unique()
.map(item => { return item.toLowerCase() });
if (sortOrderArray.length > 0) {
return this.sort(function (a, b) {
if (sortKey) {
const aValue = a[sortKey].toLowerCase(),
bValue = b[sortKey].toLowerCase();
return sortOrderArray.indexOf(aValue) - sortOrderArray.indexOf(bValue);
}
const aValue = a.toLowerCase(),
bValue = b.toLowerCase();
return sortOrderArray.indexOf(aValue) - sortOrderArray.indexOf(bValue);
});
}
// If an empty sort array is given, sort it alphabetically.
if (sortKey) {
return this.sort(function (a, b) {
if (a[sortKey] == b[sortKey]) return 0;
return (a[sortKey] < b[sortKey]) ? -1 : 1;
});
}
return this.sort();
}
// Hide method from for-in loops
Object.defineProperty(Array.prototype, 'sortCustomOrder', {enumerable: false});
// Warn if overriding existing method
if (Object.prototype.isEmpty)
console.warn("Overriding existing Object.prototype.isEmpty. Possible causes: New API defines the method, there's a framework conflict or you've got double inclusions in your code.");
Object.prototype.isEmpty = function () {
for(let key in this) {
if(this.hasOwnProperty(key))
return false;
}
return true;
}
// Hide method from for-in loops
Object.defineProperty(Object.prototype, 'isEmpty', {enumerable: false});
}
export function characterIsUppercase (character) {
return character === character.toUpperCase();
}

View File

@ -2,8 +2,6 @@ import Inferno from 'inferno';
import Component from 'inferno-component';
import marked from 'marked';
import helper from '../../../Helper';
import { Modal } from '../../structure/Modal';
import { EditDictionaryForm } from './EditDictionaryForm';

View File

@ -4,8 +4,6 @@ import Component from 'inferno-component';
const phondueUsage = require('../../../vendor/KeyboardFire/phondue/usage.html');
const digraphs = require('../../../vendor/KeyboardFire/phondue/digraphs.json');
import Helper from '../../Helper';
import { IPATable } from './IPATable';
export class IPAField extends Component {

View File

@ -3,8 +3,6 @@ import Component from 'inferno-component';
import './styles.scss';
import Helper from '../../../Helper';
import dictionary from '../../../managers/DictionaryData';
import METHOD from './SearchMethod.js';

View File

@ -4,6 +4,9 @@ import './sass/main.scss';
import Inferno from 'inferno';
import Component from 'inferno-component';
import { addHelpfulPrototypes } from './Helpers';
addHelpfulPrototypes();
import dictionary from './managers/DictionaryData';
import { Updater } from './managers/Updater';

View File

@ -1,5 +1,3 @@
import helper from '../Helper';
export class Updater {
constructor (appWithDictionaryState, dictionary) {
this.app = appWithDictionaryState;