From ebc3ca4804e32257670243372acc9b8930bae30c Mon Sep 17 00:00:00 2001 From: Xaver Maierhofer Date: Sun, 30 Apr 2017 14:59:39 +0200 Subject: [PATCH] [TASK] Move polyfills and test properties --- .bithoundrc | 5 ++- app.js | 53 -------------------------- gulp/tasks/copy.js | 2 +- html/index.html | 1 + lib/filters/nodefilter.js | 4 +- lib/main.js | 6 ++- lib/utils/helper.js | 6 ++- polyfill.js | 80 +++++++++++++++++++++++++++++++++++++++ 8 files changed, 97 insertions(+), 60 deletions(-) create mode 100644 polyfill.js diff --git a/.bithoundrc b/.bithoundrc index c57938d..4d216bb 100644 --- a/.bithoundrc +++ b/.bithoundrc @@ -19,5 +19,8 @@ "wc": { "limit": 5000 } - } + }, + "ignore": [ + "polyfill.js" + ] } diff --git a/app.js b/app.js index 5d674d3..5390671 100644 --- a/app.js +++ b/app.js @@ -1,57 +1,4 @@ 'use strict'; -// Node search polyfill for mobile browsers and IE -if (!String.prototype.includes) { - String.prototype.includes = function () { - return String.prototype.indexOf.apply(this, arguments) !== -1; - }; -} - -if (!String.prototype.startsWith) { - String.prototype.startsWith = function (searchString, position) { - position = position || 0; - return this.substr(position, searchString.length) === searchString; - }; -} -if (!String.prototype.repeat) { - String.prototype.repeat = function (count) { - 'use strict'; - if (this === null) { - throw new TypeError('can\'t convert ' + this + ' to object'); - } - var str = '' + this; - count = +count; - if (count < 0) { - throw new RangeError('repeat count must be non-negative'); - } - if (count === Infinity) { - throw new RangeError('repeat count must be less than infinity'); - } - count = Math.floor(count); - if (str.length === 0 || count === 0) { - return ''; - } - // Ensuring count is a 31-bit integer allows us to heavily optimize the - // main part. But anyway, most current (August 2014) browsers can't handle - // strings 1 << 28 chars or longer, so: - if (str.length * count >= 1 << 28) { - throw new RangeError('repeat count must not overflow maximum string size'); - } - var rpt = ''; - for (; ;) { - if ((count & 1) === 1) { - rpt += str; - } - count >>>= 1; - if (count === 0) { - break; - } - str += str; - } - // Could we try: - // return Array(count + 1).join(this); - return rpt; - }; -} require.config({ baseUrl: 'lib', diff --git a/gulp/tasks/copy.js b/gulp/tasks/copy.js index b01325a..17be9db 100644 --- a/gulp/tasks/copy.js +++ b/gulp/tasks/copy.js @@ -4,7 +4,7 @@ module.exports = function (gulp, plugins, config) { .pipe(gulp.dest(config.build)); gulp.src(['assets/logo.svg']) .pipe(gulp.dest(config.build)); - gulp.src('node_modules/promise-polyfill/promise.js') + gulp.src(['node_modules/promise-polyfill/promise.js', 'polyfill.js']) .pipe(gulp.dest(config.build + '/vendor')); return gulp.src(['assets/fonts/*', 'assets/icons/fonts/*']) .pipe(gulp.dest(config.build + '/fonts')); diff --git a/html/index.html b/html/index.html index b44227d..c731ef5 100644 --- a/html/index.html +++ b/html/index.html @@ -8,6 +8,7 @@ + diff --git a/lib/filters/nodefilter.js b/lib/filters/nodefilter.js index 1b3e882..0cf7fd0 100644 --- a/lib/filters/nodefilter.js +++ b/lib/filters/nodefilter.js @@ -7,7 +7,9 @@ define(function () { n.nodes = {}; for (var key in data.nodes) { - n.nodes[key] = data.nodes[key].filter(filter); + if (data.nodes.hasOwnProperty(key)) { + n.nodes[key] = data.nodes[key].filter(filter); + } } var filteredIds = new Set(); diff --git a/lib/main.js b/lib/main.js index 0eb99fb..9014e02 100644 --- a/lib/main.js +++ b/lib/main.js @@ -140,8 +140,10 @@ define(['moment', 'utils/router', 'leaflet', 'gui', 'helper', 'utils/language'], } for (var i in config.dataPath) { - urls.push(config.dataPath[i] + 'nodes.json'); - urls.push(config.dataPath[i] + 'graph.json'); + if (config.dataPath.hasOwnProperty(i)) { + urls.push(config.dataPath[i] + 'nodes.json'); + urls.push(config.dataPath[i] + 'graph.json'); + } } function update() { diff --git a/lib/utils/helper.js b/lib/utils/helper.js index 7693907..1ee8ac2 100644 --- a/lib/utils/helper.js +++ b/lib/utils/helper.js @@ -68,8 +68,10 @@ define({ listReplace: function listReplace(s, subst) { for (var key in subst) { - var re = new RegExp(key, 'g'); - s = s.replace(re, subst[key]); + if (subst.hasOwnProperty(key)) { + var re = new RegExp(key, 'g'); + s = s.replace(re, subst[key]); + } } return s; }, diff --git a/polyfill.js b/polyfill.js new file mode 100644 index 0000000..dd5c71f --- /dev/null +++ b/polyfill.js @@ -0,0 +1,80 @@ +'use strict'; +// Polyfills for (old) mobile browsers and IE 11 +// From https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/ +if (!String.prototype.includes) { + String.prototype.includes = function () { + return String.prototype.indexOf.apply(this, arguments) !== -1; + }; +} + +if (!String.prototype.startsWith) { + String.prototype.startsWith = function (searchString, position) { + position = position || 0; + return this.substr(position, searchString.length) === searchString; + }; +} + +if (!String.prototype.repeat) { + String.prototype.repeat = function (count) { + 'use strict'; + if (this === null) { + throw new TypeError('can\'t convert ' + this + ' to object'); + } + var str = '' + this; + count = +count; + if (count < 0) { + throw new RangeError('repeat count must be non-negative'); + } + if (count === Infinity) { + throw new RangeError('repeat count must be less than infinity'); + } + count = Math.floor(count); + if (str.length === 0 || count === 0) { + return ''; + } + // Ensuring count is a 31-bit integer allows us to heavily optimize the + // main part. But anyway, most current (August 2014) browsers can't handle + // strings 1 << 28 chars or longer, so: + if (str.length * count >= 1 << 28) { + throw new RangeError('repeat count must not overflow maximum string size'); + } + var rpt = ''; + for (; ;) { + if ((count & 1) === 1) { + rpt += str; + } + count >>>= 1; + if (count === 0) { + break; + } + str += str; + } + // Could we try: + // return Array(count + 1).join(this); + return rpt; + }; +} + +if (typeof Object.assign !== 'function') { + Object.assign = function(target, varArgs) { // .length of function is 2 + if (target == null) { // TypeError if undefined or null + throw new TypeError('Cannot convert undefined or null to object'); + } + + var to = Object(target); + + for (var index = 1; index < arguments.length; index++) { + var nextSource = arguments[index]; + + if (nextSource != null) { // Skip over if undefined or null + for (var nextKey in nextSource) { + // Avoid bugs when hasOwnProperty is shadowed + if (Object.prototype.hasOwnProperty.call(nextSource, nextKey)) { + to[nextKey] = nextSource[nextKey]; + } + } + } + } + return to; + }; +}