diff options
author | Noah Loomans <noahloomans@gmail.com> | 2016-09-05 11:48:35 +0200 |
---|---|---|
committer | Noah Loomans <noahloomans@gmail.com> | 2016-09-05 11:48:35 +0200 |
commit | ff5f463f77d7eef492d3ae926ce65cdfdb45dfdb (patch) | |
tree | 98f49919e17bfa146995494ff686c7777c19c065 /public/javascripts/getUsers.js | |
parent | 6334883385a123ba67c808c1ecf7f2cbe2000d4a (diff) |
Actualy fixed safari
Diffstat (limited to 'public/javascripts/getUsers.js')
-rw-r--r-- | public/javascripts/getUsers.js | 48 |
1 files changed, 28 insertions, 20 deletions
diff --git a/public/javascripts/getUsers.js b/public/javascripts/getUsers.js index fb54659..34f7b3b 100644 --- a/public/javascripts/getUsers.js +++ b/public/javascripts/getUsers.js @@ -3,7 +3,7 @@ const cheerio = require('cheerio') const request = Promise.promisify(require('request')) module.exports = function () { - return new Promise((resolve, reject) => { + return new Promise(function (resolve, reject) { request(`http://${window.location.host}/meetingpointProxy/Roosters-AL%2Fdoc%2Fdagroosters%2Fframes%2Fnavbar.htm`) .then(function (page) { page = page.body @@ -16,26 +16,34 @@ module.exports = function () { const items = regexs.map(regex => scriptText.match(regex)[1].split(',').map(item => item.replace(/"/g, ''))) resolve([] - .concat(items[0].map((item, index) => ({ - type: 'c', - value: item, - index: index + .concat(items[0].map(function (item, index) { + return { + type: 'c', + value: item, + index: index + } + })) + .concat(items[1].map(function (item, index) { + return { + type: 't', + value: item, + index: index + } + })) + .concat(items[2].map(function (item, index) { + return { + type: 'r', + value: item, + index: index + } + })) + .concat(items[3].map(function (item, index) { + return { + type: 's', + value: item, + index: index + } }))) - .concat(items[1].map((item, index) => ({ - type: 't', - value: item, - index: index - }))) - .concat(items[2].map((item, index) => ({ - type: 'r', - value: item, - index: index - }))) - .concat(items[3].map((item, index) => ({ - type: 's', - value: item, - index: index - })))) }) }) } |