diff --git a/database/backends/PostgresSmartBackend.php b/database/backends/PostgresSmartBackend.php
index b47376e855503f1ef419ae20b5e5ae37ec3d6ced..e205f6cafa70c3df5f754bd28978a5091c6e7ac6 100644
--- a/database/backends/PostgresSmartBackend.php
+++ b/database/backends/PostgresSmartBackend.php
@@ -209,7 +209,7 @@ class PostgresSmartBackend implements Backend
JOIN network ON buffer.networkid = network.networkid
WHERE buffer.userid = :userid
AND backlog.bufferid = :bufferid
- AND backlog.messageid >= :anchor
+ AND backlog.messageid > :anchor
ORDER BY backlog.messageid ASC
LIMIT :limit;
");
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000000000000000000000000000000000000..671faf07e0058bfb4d572de2eb231542b5fe6b35
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,1717 @@
+{
+ "name": "quassel-rest-search",
+ "version": "3.0.0",
+ "lockfileVersion": 1,
+ "requires": true,
+ "dependencies": {
+ "abbrev": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+ "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+ "dev": true
+ },
+ "acorn": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.5.0.tgz",
+ "integrity": "sha512-arn53F07VXmls4o4pUhSzBa4fvaagPRe7AVZ8l7NHxFWUie2DsuFSBMMNAkgzRlOhEhzAnxeKyaWVzOH4xqp/g==",
+ "dev": true
+ },
+ "acorn-jsx": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
+ "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
+ "dev": true,
+ "requires": {
+ "acorn": "3.3.0"
+ },
+ "dependencies": {
+ "acorn": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+ "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
+ "dev": true
+ }
+ }
+ },
+ "amdefine": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+ "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+ "dev": true
+ },
+ "ansi-regex": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+ "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+ "dev": true
+ },
+ "ansi-styles": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+ "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+ "dev": true
+ },
+ "aproba": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+ "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+ "dev": true
+ },
+ "are-we-there-yet": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
+ "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
+ "dev": true,
+ "requires": {
+ "delegates": "1.0.0",
+ "readable-stream": "2.3.4"
+ }
+ },
+ "array-find-index": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
+ "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
+ "dev": true
+ },
+ "asn1": {
+ "version": "0.2.3",
+ "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+ "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
+ "dev": true
+ },
+ "assert-plus": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
+ "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
+ "dev": true
+ },
+ "async-foreach": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
+ "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
+ "dev": true
+ },
+ "asynckit": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+ "dev": true
+ },
+ "aws-sign2": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+ "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
+ "dev": true
+ },
+ "aws4": {
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+ "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
+ "dev": true
+ },
+ "balanced-match": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+ "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+ "dev": true
+ },
+ "bcrypt-pbkdf": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
+ "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "tweetnacl": "0.14.5"
+ }
+ },
+ "block-stream": {
+ "version": "0.0.9",
+ "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+ "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
+ "dev": true,
+ "requires": {
+ "inherits": "2.0.3"
+ }
+ },
+ "boom": {
+ "version": "2.10.1",
+ "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
+ "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+ "dev": true,
+ "requires": {
+ "hoek": "2.16.3"
+ }
+ },
+ "brace-expansion": {
+ "version": "1.1.11",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+ "dev": true,
+ "requires": {
+ "balanced-match": "1.0.0",
+ "concat-map": "0.0.1"
+ }
+ },
+ "builtin-modules": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
+ "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
+ "dev": true
+ },
+ "camelcase": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+ "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+ "dev": true
+ },
+ "camelcase-keys": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+ "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
+ "dev": true,
+ "requires": {
+ "camelcase": "2.1.1",
+ "map-obj": "1.0.1"
+ }
+ },
+ "caseless": {
+ "version": "0.11.0",
+ "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
+ "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
+ "dev": true
+ },
+ "chalk": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "2.2.1",
+ "escape-string-regexp": "1.0.5",
+ "has-ansi": "2.0.0",
+ "strip-ansi": "3.0.1",
+ "supports-color": "2.0.0"
+ }
+ },
+ "cliui": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+ "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+ "dev": true,
+ "requires": {
+ "string-width": "1.0.2",
+ "strip-ansi": "3.0.1",
+ "wrap-ansi": "2.1.0"
+ }
+ },
+ "code-point-at": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+ "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+ "dev": true
+ },
+ "combined-stream": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
+ "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
+ "dev": true,
+ "requires": {
+ "delayed-stream": "1.0.0"
+ }
+ },
+ "commander": {
+ "version": "2.14.1",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz",
+ "integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw==",
+ "dev": true
+ },
+ "concat-map": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+ "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+ "dev": true
+ },
+ "console-control-strings": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+ "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+ "dev": true
+ },
+ "core-util-is": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+ "dev": true
+ },
+ "cross-spawn": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
+ "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
+ "dev": true,
+ "requires": {
+ "lru-cache": "4.1.1",
+ "which": "1.3.0"
+ }
+ },
+ "cryptiles": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+ "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+ "dev": true,
+ "requires": {
+ "boom": "2.10.1"
+ }
+ },
+ "currently-unhandled": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
+ "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
+ "dev": true,
+ "requires": {
+ "array-find-index": "1.0.2"
+ }
+ },
+ "dashdash": {
+ "version": "1.14.1",
+ "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+ "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+ "dev": true,
+ "requires": {
+ "assert-plus": "1.0.0"
+ },
+ "dependencies": {
+ "assert-plus": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+ "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+ "dev": true
+ }
+ }
+ },
+ "decamelize": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+ "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+ "dev": true
+ },
+ "deep-is": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+ "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+ "dev": true
+ },
+ "delayed-stream": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+ "dev": true
+ },
+ "delegates": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+ "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+ "dev": true
+ },
+ "ecc-jsbn": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
+ "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "jsbn": "0.1.1"
+ }
+ },
+ "error-ex": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
+ "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
+ "dev": true,
+ "requires": {
+ "is-arrayish": "0.2.1"
+ }
+ },
+ "escape-string-regexp": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+ "dev": true
+ },
+ "escodegen": {
+ "version": "1.9.1",
+ "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz",
+ "integrity": "sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==",
+ "dev": true,
+ "requires": {
+ "esprima": "3.1.3",
+ "estraverse": "4.2.0",
+ "esutils": "2.0.2",
+ "optionator": "0.8.2",
+ "source-map": "0.6.1"
+ }
+ },
+ "esprima": {
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+ "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
+ "dev": true
+ },
+ "estraverse": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+ "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+ "dev": true
+ },
+ "esutils": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+ "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+ "dev": true
+ },
+ "extend": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+ "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
+ "dev": true
+ },
+ "extsprintf": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+ "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+ "dev": true
+ },
+ "fast-levenshtein": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+ "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+ "dev": true
+ },
+ "find-up": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+ "dev": true,
+ "requires": {
+ "path-exists": "2.1.0",
+ "pinkie-promise": "2.0.1"
+ }
+ },
+ "forever-agent": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+ "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+ "dev": true
+ },
+ "form-data": {
+ "version": "2.1.4",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+ "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+ "dev": true,
+ "requires": {
+ "asynckit": "0.4.0",
+ "combined-stream": "1.0.6",
+ "mime-types": "2.1.18"
+ }
+ },
+ "fs.realpath": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+ "dev": true
+ },
+ "fstream": {
+ "version": "1.0.11",
+ "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+ "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "4.1.11",
+ "inherits": "2.0.3",
+ "mkdirp": "0.5.1",
+ "rimraf": "2.6.2"
+ }
+ },
+ "gauge": {
+ "version": "2.7.4",
+ "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+ "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+ "dev": true,
+ "requires": {
+ "aproba": "1.2.0",
+ "console-control-strings": "1.1.0",
+ "has-unicode": "2.0.1",
+ "object-assign": "4.1.1",
+ "signal-exit": "3.0.2",
+ "string-width": "1.0.2",
+ "strip-ansi": "3.0.1",
+ "wide-align": "1.1.2"
+ }
+ },
+ "gaze": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz",
+ "integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=",
+ "dev": true,
+ "requires": {
+ "globule": "1.2.0"
+ }
+ },
+ "generate-function": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
+ "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=",
+ "dev": true
+ },
+ "generate-object-property": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+ "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
+ "dev": true,
+ "requires": {
+ "is-property": "1.0.2"
+ }
+ },
+ "get-caller-file": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz",
+ "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=",
+ "dev": true
+ },
+ "get-stdin": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+ "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
+ "dev": true
+ },
+ "getpass": {
+ "version": "0.1.7",
+ "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+ "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+ "dev": true,
+ "requires": {
+ "assert-plus": "1.0.0"
+ },
+ "dependencies": {
+ "assert-plus": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+ "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+ "dev": true
+ }
+ }
+ },
+ "glob": {
+ "version": "7.1.2",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+ "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+ "dev": true,
+ "requires": {
+ "fs.realpath": "1.0.0",
+ "inflight": "1.0.6",
+ "inherits": "2.0.3",
+ "minimatch": "3.0.4",
+ "once": "1.4.0",
+ "path-is-absolute": "1.0.1"
+ }
+ },
+ "globule": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz",
+ "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=",
+ "dev": true,
+ "requires": {
+ "glob": "7.1.2",
+ "lodash": "4.17.5",
+ "minimatch": "3.0.4"
+ }
+ },
+ "graceful-fs": {
+ "version": "4.1.11",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+ "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+ "dev": true
+ },
+ "har-validator": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
+ "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
+ "dev": true,
+ "requires": {
+ "chalk": "1.1.3",
+ "commander": "2.14.1",
+ "is-my-json-valid": "2.17.2",
+ "pinkie-promise": "2.0.1"
+ }
+ },
+ "has-ansi": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+ "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "2.1.1"
+ }
+ },
+ "has-unicode": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+ "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
+ "dev": true
+ },
+ "hawk": {
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+ "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+ "dev": true,
+ "requires": {
+ "boom": "2.10.1",
+ "cryptiles": "2.0.5",
+ "hoek": "2.16.3",
+ "sntp": "1.0.9"
+ }
+ },
+ "hoek": {
+ "version": "2.16.3",
+ "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+ "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+ "dev": true
+ },
+ "hosted-git-info": {
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
+ "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==",
+ "dev": true
+ },
+ "http-signature": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+ "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+ "dev": true,
+ "requires": {
+ "assert-plus": "0.2.0",
+ "jsprim": "1.4.1",
+ "sshpk": "1.13.1"
+ }
+ },
+ "in-publish": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
+ "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
+ "dev": true
+ },
+ "indent-string": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+ "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
+ "dev": true,
+ "requires": {
+ "repeating": "2.0.1"
+ }
+ },
+ "inflight": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+ "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+ "dev": true,
+ "requires": {
+ "once": "1.4.0",
+ "wrappy": "1.0.2"
+ }
+ },
+ "inherits": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+ "dev": true
+ },
+ "invert-kv": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+ "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+ "dev": true
+ },
+ "is-arrayish": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+ "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+ "dev": true
+ },
+ "is-builtin-module": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+ "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
+ "dev": true,
+ "requires": {
+ "builtin-modules": "1.1.1"
+ }
+ },
+ "is-finite": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
+ "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
+ "dev": true,
+ "requires": {
+ "number-is-nan": "1.0.1"
+ }
+ },
+ "is-fullwidth-code-point": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+ "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+ "dev": true,
+ "requires": {
+ "number-is-nan": "1.0.1"
+ }
+ },
+ "is-my-ip-valid": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz",
+ "integrity": "sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==",
+ "dev": true
+ },
+ "is-my-json-valid": {
+ "version": "2.17.2",
+ "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz",
+ "integrity": "sha512-IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg==",
+ "dev": true,
+ "requires": {
+ "generate-function": "2.0.0",
+ "generate-object-property": "1.2.0",
+ "is-my-ip-valid": "1.0.0",
+ "jsonpointer": "4.0.1",
+ "xtend": "4.0.1"
+ }
+ },
+ "is-property": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
+ "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
+ "dev": true
+ },
+ "is-typedarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+ "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+ "dev": true
+ },
+ "is-utf8": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+ "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+ "dev": true
+ },
+ "isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+ "dev": true
+ },
+ "isexe": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+ "dev": true
+ },
+ "isstream": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+ "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+ "dev": true
+ },
+ "js-base64": {
+ "version": "2.4.3",
+ "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.3.tgz",
+ "integrity": "sha512-H7ErYLM34CvDMto3GbD6xD0JLUGYXR3QTcH6B/tr4Hi/QpSThnCsIp+Sy5FRTw3B0d6py4HcNkW7nO/wdtGWEw==",
+ "dev": true
+ },
+ "jsbn": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+ "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+ "dev": true,
+ "optional": true
+ },
+ "json-schema": {
+ "version": "0.2.3",
+ "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+ "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+ "dev": true
+ },
+ "json-stringify-safe": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+ "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+ "dev": true
+ },
+ "jsonpointer": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
+ "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
+ "dev": true
+ },
+ "jsprim": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+ "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+ "dev": true,
+ "requires": {
+ "assert-plus": "1.0.0",
+ "extsprintf": "1.3.0",
+ "json-schema": "0.2.3",
+ "verror": "1.10.0"
+ },
+ "dependencies": {
+ "assert-plus": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+ "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+ "dev": true
+ }
+ }
+ },
+ "lcid": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+ "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+ "dev": true,
+ "requires": {
+ "invert-kv": "1.0.0"
+ }
+ },
+ "levn": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+ "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+ "dev": true,
+ "requires": {
+ "prelude-ls": "1.1.2",
+ "type-check": "0.3.2"
+ }
+ },
+ "load-json-file": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+ "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "4.1.11",
+ "parse-json": "2.2.0",
+ "pify": "2.3.0",
+ "pinkie-promise": "2.0.1",
+ "strip-bom": "2.0.0"
+ }
+ },
+ "lodash": {
+ "version": "4.17.5",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz",
+ "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==",
+ "dev": true
+ },
+ "lodash.assign": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
+ "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
+ "dev": true
+ },
+ "lodash.clonedeep": {
+ "version": "4.5.0",
+ "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+ "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+ "dev": true
+ },
+ "lodash.mergewith": {
+ "version": "4.6.1",
+ "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz",
+ "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==",
+ "dev": true
+ },
+ "loud-rejection": {
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
+ "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
+ "dev": true,
+ "requires": {
+ "currently-unhandled": "0.4.1",
+ "signal-exit": "3.0.2"
+ }
+ },
+ "lru-cache": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
+ "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
+ "dev": true,
+ "requires": {
+ "pseudomap": "1.0.2",
+ "yallist": "2.1.2"
+ }
+ },
+ "map-obj": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+ "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+ "dev": true
+ },
+ "meow": {
+ "version": "3.7.0",
+ "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+ "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
+ "dev": true,
+ "requires": {
+ "camelcase-keys": "2.1.0",
+ "decamelize": "1.2.0",
+ "loud-rejection": "1.6.0",
+ "map-obj": "1.0.1",
+ "minimist": "1.2.0",
+ "normalize-package-data": "2.4.0",
+ "object-assign": "4.1.1",
+ "read-pkg-up": "1.0.1",
+ "redent": "1.0.0",
+ "trim-newlines": "1.0.0"
+ }
+ },
+ "merge": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz",
+ "integrity": "sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=",
+ "dev": true
+ },
+ "mime-db": {
+ "version": "1.33.0",
+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
+ "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==",
+ "dev": true
+ },
+ "mime-types": {
+ "version": "2.1.18",
+ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
+ "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
+ "dev": true,
+ "requires": {
+ "mime-db": "1.33.0"
+ }
+ },
+ "minimatch": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+ "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+ "dev": true,
+ "requires": {
+ "brace-expansion": "1.1.11"
+ }
+ },
+ "minimist": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+ "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+ "dev": true
+ },
+ "mkdirp": {
+ "version": "0.5.1",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+ "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+ "dev": true,
+ "requires": {
+ "minimist": "0.0.8"
+ },
+ "dependencies": {
+ "minimist": {
+ "version": "0.0.8",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+ "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+ "dev": true
+ }
+ }
+ },
+ "nan": {
+ "version": "2.9.2",
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.9.2.tgz",
+ "integrity": "sha512-ltW65co7f3PQWBDbqVvaU1WtFJUsNW7sWWm4HINhbMQIyVyzIeyZ8toX5TC5eeooE6piZoaEh4cZkueSKG3KYw==",
+ "dev": true
+ },
+ "nativejsx": {
+ "version": "https://github.com/j3l11234/nativejsx/archive/4.2.0.2.tar.gz",
+ "integrity": "sha512-CUUo9RWGzVNC+Ksw/Cqdiuer9sjcF2bkxmYQ3hm1VicoeoiF8CizhWWLHIW6ZTYSxNntPbwlYnN7xmw2FpvcYQ==",
+ "dev": true,
+ "requires": {
+ "acorn": "5.5.0",
+ "acorn-jsx": "3.0.1",
+ "commander": "2.14.1",
+ "escodegen": "1.9.1",
+ "glob": "7.1.2",
+ "merge": "1.2.0"
+ }
+ },
+ "node-gyp": {
+ "version": "3.6.2",
+ "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz",
+ "integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=",
+ "dev": true,
+ "requires": {
+ "fstream": "1.0.11",
+ "glob": "7.1.2",
+ "graceful-fs": "4.1.11",
+ "minimatch": "3.0.4",
+ "mkdirp": "0.5.1",
+ "nopt": "3.0.6",
+ "npmlog": "4.1.2",
+ "osenv": "0.1.5",
+ "request": "2.79.0",
+ "rimraf": "2.6.2",
+ "semver": "5.3.0",
+ "tar": "2.2.1",
+ "which": "1.3.0"
+ },
+ "dependencies": {
+ "semver": {
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+ "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
+ "dev": true
+ }
+ }
+ },
+ "node-sass": {
+ "version": "4.7.2",
+ "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.7.2.tgz",
+ "integrity": "sha512-CaV+wLqZ7//Jdom5aUFCpGNoECd7BbNhjuwdsX/LkXBrHl8eb1Wjw4HvWqcFvhr5KuNgAk8i/myf/MQ1YYeroA==",
+ "dev": true,
+ "requires": {
+ "async-foreach": "0.1.3",
+ "chalk": "1.1.3",
+ "cross-spawn": "3.0.1",
+ "gaze": "1.1.2",
+ "get-stdin": "4.0.1",
+ "glob": "7.1.2",
+ "in-publish": "2.0.0",
+ "lodash.assign": "4.2.0",
+ "lodash.clonedeep": "4.5.0",
+ "lodash.mergewith": "4.6.1",
+ "meow": "3.7.0",
+ "mkdirp": "0.5.1",
+ "nan": "2.9.2",
+ "node-gyp": "3.6.2",
+ "npmlog": "4.1.2",
+ "request": "2.79.0",
+ "sass-graph": "2.2.4",
+ "stdout-stream": "1.4.0",
+ "true-case-path": "1.0.2"
+ }
+ },
+ "nopt": {
+ "version": "3.0.6",
+ "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+ "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+ "dev": true,
+ "requires": {
+ "abbrev": "1.1.1"
+ }
+ },
+ "normalize-package-data": {
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+ "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
+ "dev": true,
+ "requires": {
+ "hosted-git-info": "2.5.0",
+ "is-builtin-module": "1.0.0",
+ "semver": "5.5.0",
+ "validate-npm-package-license": "3.0.3"
+ }
+ },
+ "npmlog": {
+ "version": "4.1.2",
+ "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+ "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+ "dev": true,
+ "requires": {
+ "are-we-there-yet": "1.1.4",
+ "console-control-strings": "1.1.0",
+ "gauge": "2.7.4",
+ "set-blocking": "2.0.0"
+ }
+ },
+ "number-is-nan": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+ "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+ "dev": true
+ },
+ "oauth-sign": {
+ "version": "0.8.2",
+ "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+ "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
+ "dev": true
+ },
+ "object-assign": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+ "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+ "dev": true
+ },
+ "once": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+ "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+ "dev": true,
+ "requires": {
+ "wrappy": "1.0.2"
+ }
+ },
+ "optionator": {
+ "version": "0.8.2",
+ "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
+ "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+ "dev": true,
+ "requires": {
+ "deep-is": "0.1.3",
+ "fast-levenshtein": "2.0.6",
+ "levn": "0.3.0",
+ "prelude-ls": "1.1.2",
+ "type-check": "0.3.2",
+ "wordwrap": "1.0.0"
+ }
+ },
+ "os-homedir": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+ "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+ "dev": true
+ },
+ "os-locale": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+ "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+ "dev": true,
+ "requires": {
+ "lcid": "1.0.0"
+ }
+ },
+ "os-tmpdir": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+ "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+ "dev": true
+ },
+ "osenv": {
+ "version": "0.1.5",
+ "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+ "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+ "dev": true,
+ "requires": {
+ "os-homedir": "1.0.2",
+ "os-tmpdir": "1.0.2"
+ }
+ },
+ "parse-json": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+ "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+ "dev": true,
+ "requires": {
+ "error-ex": "1.3.1"
+ }
+ },
+ "path-exists": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+ "dev": true,
+ "requires": {
+ "pinkie-promise": "2.0.1"
+ }
+ },
+ "path-is-absolute": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+ "dev": true
+ },
+ "path-type": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+ "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "4.1.11",
+ "pify": "2.3.0",
+ "pinkie-promise": "2.0.1"
+ }
+ },
+ "pify": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+ "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+ "dev": true
+ },
+ "pinkie": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+ "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+ "dev": true
+ },
+ "pinkie-promise": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+ "dev": true,
+ "requires": {
+ "pinkie": "2.0.4"
+ }
+ },
+ "prelude-ls": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+ "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+ "dev": true
+ },
+ "process-nextick-args": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+ "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+ "dev": true
+ },
+ "pseudomap": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+ "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
+ "dev": true
+ },
+ "punycode": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+ "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+ "dev": true
+ },
+ "qs": {
+ "version": "6.3.2",
+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz",
+ "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=",
+ "dev": true
+ },
+ "read-pkg": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+ "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+ "dev": true,
+ "requires": {
+ "load-json-file": "1.1.0",
+ "normalize-package-data": "2.4.0",
+ "path-type": "1.1.0"
+ }
+ },
+ "read-pkg-up": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+ "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+ "dev": true,
+ "requires": {
+ "find-up": "1.1.2",
+ "read-pkg": "1.1.0"
+ }
+ },
+ "readable-stream": {
+ "version": "2.3.4",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.4.tgz",
+ "integrity": "sha512-vuYxeWYM+fde14+rajzqgeohAI7YoJcHE7kXDAc4Nk0EbuKnJfqtY9YtRkLo/tqkuF7MsBQRhPnPeyjYITp3ZQ==",
+ "dev": true,
+ "requires": {
+ "core-util-is": "1.0.2",
+ "inherits": "2.0.3",
+ "isarray": "1.0.0",
+ "process-nextick-args": "2.0.0",
+ "safe-buffer": "5.1.1",
+ "string_decoder": "1.0.3",
+ "util-deprecate": "1.0.2"
+ }
+ },
+ "redent": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
+ "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
+ "dev": true,
+ "requires": {
+ "indent-string": "2.1.0",
+ "strip-indent": "1.0.1"
+ }
+ },
+ "repeating": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+ "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+ "dev": true,
+ "requires": {
+ "is-finite": "1.0.2"
+ }
+ },
+ "request": {
+ "version": "2.79.0",
+ "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz",
+ "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=",
+ "dev": true,
+ "requires": {
+ "aws-sign2": "0.6.0",
+ "aws4": "1.6.0",
+ "caseless": "0.11.0",
+ "combined-stream": "1.0.6",
+ "extend": "3.0.1",
+ "forever-agent": "0.6.1",
+ "form-data": "2.1.4",
+ "har-validator": "2.0.6",
+ "hawk": "3.1.3",
+ "http-signature": "1.1.1",
+ "is-typedarray": "1.0.0",
+ "isstream": "0.1.2",
+ "json-stringify-safe": "5.0.1",
+ "mime-types": "2.1.18",
+ "oauth-sign": "0.8.2",
+ "qs": "6.3.2",
+ "stringstream": "0.0.5",
+ "tough-cookie": "2.3.4",
+ "tunnel-agent": "0.4.3",
+ "uuid": "3.2.1"
+ }
+ },
+ "require-directory": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+ "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+ "dev": true
+ },
+ "require-main-filename": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+ "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+ "dev": true
+ },
+ "rimraf": {
+ "version": "2.6.2",
+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+ "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+ "dev": true,
+ "requires": {
+ "glob": "7.1.2"
+ }
+ },
+ "safe-buffer": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+ "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
+ "dev": true
+ },
+ "sass-graph": {
+ "version": "2.2.4",
+ "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
+ "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
+ "dev": true,
+ "requires": {
+ "glob": "7.1.2",
+ "lodash": "4.17.5",
+ "scss-tokenizer": "0.2.3",
+ "yargs": "7.1.0"
+ }
+ },
+ "scss-tokenizer": {
+ "version": "0.2.3",
+ "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
+ "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
+ "dev": true,
+ "requires": {
+ "js-base64": "2.4.3",
+ "source-map": "0.4.4"
+ },
+ "dependencies": {
+ "source-map": {
+ "version": "0.4.4",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+ "dev": true,
+ "requires": {
+ "amdefine": "1.0.1"
+ }
+ }
+ }
+ },
+ "semver": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
+ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
+ "dev": true
+ },
+ "set-blocking": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+ "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+ "dev": true
+ },
+ "signal-exit": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+ "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+ "dev": true
+ },
+ "sntp": {
+ "version": "1.0.9",
+ "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+ "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+ "dev": true,
+ "requires": {
+ "hoek": "2.16.3"
+ }
+ },
+ "source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "dev": true,
+ "optional": true
+ },
+ "spdx-correct": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz",
+ "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==",
+ "dev": true,
+ "requires": {
+ "spdx-expression-parse": "3.0.0",
+ "spdx-license-ids": "3.0.0"
+ }
+ },
+ "spdx-exceptions": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz",
+ "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==",
+ "dev": true
+ },
+ "spdx-expression-parse": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+ "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+ "dev": true,
+ "requires": {
+ "spdx-exceptions": "2.1.0",
+ "spdx-license-ids": "3.0.0"
+ }
+ },
+ "spdx-license-ids": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz",
+ "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==",
+ "dev": true
+ },
+ "sshpk": {
+ "version": "1.13.1",
+ "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
+ "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+ "dev": true,
+ "requires": {
+ "asn1": "0.2.3",
+ "assert-plus": "1.0.0",
+ "bcrypt-pbkdf": "1.0.1",
+ "dashdash": "1.14.1",
+ "ecc-jsbn": "0.1.1",
+ "getpass": "0.1.7",
+ "jsbn": "0.1.1",
+ "tweetnacl": "0.14.5"
+ },
+ "dependencies": {
+ "assert-plus": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+ "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+ "dev": true
+ }
+ }
+ },
+ "stdout-stream": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.0.tgz",
+ "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=",
+ "dev": true,
+ "requires": {
+ "readable-stream": "2.3.4"
+ }
+ },
+ "string-width": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+ "dev": true,
+ "requires": {
+ "code-point-at": "1.1.0",
+ "is-fullwidth-code-point": "1.0.0",
+ "strip-ansi": "3.0.1"
+ }
+ },
+ "string_decoder": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+ "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+ "dev": true,
+ "requires": {
+ "safe-buffer": "5.1.1"
+ }
+ },
+ "stringstream": {
+ "version": "0.0.5",
+ "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+ "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
+ "dev": true
+ },
+ "strip-ansi": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "2.1.1"
+ }
+ },
+ "strip-bom": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+ "dev": true,
+ "requires": {
+ "is-utf8": "0.2.1"
+ }
+ },
+ "strip-indent": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
+ "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
+ "dev": true,
+ "requires": {
+ "get-stdin": "4.0.1"
+ }
+ },
+ "supports-color": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+ "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+ "dev": true
+ },
+ "tar": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+ "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
+ "dev": true,
+ "requires": {
+ "block-stream": "0.0.9",
+ "fstream": "1.0.11",
+ "inherits": "2.0.3"
+ }
+ },
+ "tough-cookie": {
+ "version": "2.3.4",
+ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
+ "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
+ "dev": true,
+ "requires": {
+ "punycode": "1.4.1"
+ }
+ },
+ "trim-newlines": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
+ "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
+ "dev": true
+ },
+ "true-case-path": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.2.tgz",
+ "integrity": "sha1-fskRMJJHZsf1c74wIMNPj9/QDWI=",
+ "dev": true,
+ "requires": {
+ "glob": "6.0.4"
+ },
+ "dependencies": {
+ "glob": {
+ "version": "6.0.4",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
+ "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
+ "dev": true,
+ "requires": {
+ "inflight": "1.0.6",
+ "inherits": "2.0.3",
+ "minimatch": "3.0.4",
+ "once": "1.4.0",
+ "path-is-absolute": "1.0.1"
+ }
+ }
+ }
+ },
+ "tunnel-agent": {
+ "version": "0.4.3",
+ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
+ "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
+ "dev": true
+ },
+ "tweetnacl": {
+ "version": "0.14.5",
+ "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+ "dev": true,
+ "optional": true
+ },
+ "type-check": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+ "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+ "dev": true,
+ "requires": {
+ "prelude-ls": "1.1.2"
+ }
+ },
+ "util-deprecate": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+ "dev": true
+ },
+ "uuid": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
+ "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==",
+ "dev": true
+ },
+ "validate-npm-package-license": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz",
+ "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==",
+ "dev": true,
+ "requires": {
+ "spdx-correct": "3.0.0",
+ "spdx-expression-parse": "3.0.0"
+ }
+ },
+ "verror": {
+ "version": "1.10.0",
+ "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+ "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+ "dev": true,
+ "requires": {
+ "assert-plus": "1.0.0",
+ "core-util-is": "1.0.2",
+ "extsprintf": "1.3.0"
+ },
+ "dependencies": {
+ "assert-plus": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+ "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+ "dev": true
+ }
+ }
+ },
+ "which": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
+ "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
+ "dev": true,
+ "requires": {
+ "isexe": "2.0.0"
+ }
+ },
+ "which-module": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+ "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
+ "dev": true
+ },
+ "wide-align": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
+ "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
+ "dev": true,
+ "requires": {
+ "string-width": "1.0.2"
+ }
+ },
+ "wordwrap": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+ "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+ "dev": true
+ },
+ "wrap-ansi": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+ "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+ "dev": true,
+ "requires": {
+ "string-width": "1.0.2",
+ "strip-ansi": "3.0.1"
+ }
+ },
+ "wrappy": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+ "dev": true
+ },
+ "xtend": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+ "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+ "dev": true
+ },
+ "y18n": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+ "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+ "dev": true
+ },
+ "yallist": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+ "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+ "dev": true
+ },
+ "yargs": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
+ "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
+ "dev": true,
+ "requires": {
+ "camelcase": "3.0.0",
+ "cliui": "3.2.0",
+ "decamelize": "1.2.0",
+ "get-caller-file": "1.0.2",
+ "os-locale": "1.4.0",
+ "read-pkg-up": "1.0.1",
+ "require-directory": "2.1.1",
+ "require-main-filename": "1.0.1",
+ "set-blocking": "2.0.0",
+ "string-width": "1.0.2",
+ "which-module": "1.0.0",
+ "y18n": "3.2.1",
+ "yargs-parser": "5.0.0"
+ },
+ "dependencies": {
+ "camelcase": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+ "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+ "dev": true
+ }
+ }
+ },
+ "yargs-parser": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
+ "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+ "dev": true,
+ "requires": {
+ "camelcase": "3.0.0"
+ },
+ "dependencies": {
+ "camelcase": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+ "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+ "dev": true
+ }
+ }
+ }
+ }
+}
diff --git a/package.json b/package.json
index 2c15932435a98ea467e771372ff73b252cbb0740..1e177f65603770ffed130980a56eddce6c2a5bd9 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,8 @@
"description": "This is a websearch frontend for a quassel database.",
"scripts": {
"jsx": "node_modules/nativejsx/bin/nativejsx res/js/**/*.jsx",
- "dep": "cp node_modules/nativejsx/dist/nativejsx-prototypes.js res/js/util/"
+ "dep": "cp node_modules/nativejsx/dist/nativejsx-prototypes.js res/js/util/",
+ "sass": "node_modules/node-sass/bin/node-sass res/css/login.sass -o res/css/ && node_modules/node-sass/bin/node-sass res/css/search.sass -o res/css/"
},
"repository": {
"type": "git",
@@ -16,7 +17,8 @@
"url": "https://github.com/justjanne/quassel-rest-search/issues"
},
"homepage": "https://github.com/justjanne/quassel-rest-search#readme",
- "dependencies": {
- "nativejsx": "^4.1.0"
+ "devDependencies": {
+ "nativejsx": "https://github.com/j3l11234/nativejsx/archive/4.2.0.2.tar.gz",
+ "node-sass": "^4.7.2"
}
}
diff --git a/res/css/_content.sass b/res/css/_content.sass
index 31bf68a928d46a29313cc6dbd817546127db0683..ade1c40cd1fd596cc8cde420c50fd2b364ff43a3 100644
--- a/res/css/_content.sass
+++ b/res/css/_content.sass
@@ -85,7 +85,7 @@
padding: 6px 16px
font-size: 13px
line-height: 1.846
- -moz-user-select: none
+ @include vendor-prefix('user-select', 'none')
text-decoration: none
box-sizing: border-box
font-family: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif
@@ -187,14 +187,13 @@
.context
position: relative
- .container
- .before
- .after
-
- &.active
+ &.focus
padding: 0
margin: 1rem -1rem
+ @media(max-width: 800px)
+ margin: 1rem 0
+
&:before
bottom: 0
box-shadow: 0 -1px 0 #e5e5e5, 0 0 2px rgba(0, 0, 0, .12), 0 2px 4px rgba(0, 0, 0, .24)
@@ -206,6 +205,9 @@
right: 0
top: 0
+ > .container > .inline-button
+ box-shadow: none
+
&:not(.focus)
> .before, > .after
display: none
@@ -220,9 +222,39 @@
border-bottom: 1px solid #e5e5e5
color: #212121
background: #fff
+ position: relative
+
+ > .more
+ height: 56px
+ width: 56px
+ position: relative
+ padding: 16px 13px
+ cursor: pointer
+ color: #555
+ transition: all .15s
+ text-decoration: none
+ text-align: center
+ margin-right: -24px
+ margin-top: -12px
+ @include vendor-prefix('user-select', 'none')
+
+ &:before
+ background-color: rgba(255, 255, 255, .12)
+ bottom: 9px
+ content: ' '
+ left: 9px
+ margin: auto
+ padding: 4px
+ position: absolute
+ right: 9px
+ top: 9px
+ z-index: -1
+ border-radius: 50%
+ opacity: 0
+ transition: opacity 100ms
- &:last-child
- border-bottom: none
+ &:hover:before
+ opacity: 1
time
width: 136px
@@ -260,6 +292,10 @@
overflow: hidden
text-overflow: ellipsis
+ .invisible
+ font-size: 0
+ opacity: 0
+
@media(max-width: 800px)
width: initial
padding: 0
@@ -278,4 +314,5 @@
color: #212121 !important
@media(max-width: 800px)
+ vertical-align: top
display: inline
\ No newline at end of file
diff --git a/res/css/login.css b/res/css/login.css
index 5168cc765cb86a8f2ea809b1cb3f6114b848db78..ba22e6c9a472f4a49d4825717e0dcf95a81588ac 100644
--- a/res/css/login.css
+++ b/res/css/login.css
@@ -1,10 +1,11 @@
@font-face {
- font-family: "Material Icons";
+ font-family: 'Material Icons';
font-style: normal;
font-weight: 400;
src: local("Material Icons"), local("MaterialIcons-Regular"), url(../icons/MaterialIcons-Regular.woff2) format("woff2"), url(../icons/MaterialIcons-Regular.woff) format("woff"); }
+
.icon {
- font-family: "Material Icons", sans-serif;
+ font-family: 'Material Icons', sans-serif;
font-weight: normal;
font-style: normal;
font-size: 24px;
@@ -24,18 +25,21 @@
/* Support for Firefox. */
-moz-osx-font-smoothing: grayscale;
/* Support for IE. */
- font-feature-settings: "liga"; }
+ font-feature-settings: 'liga';
+}
@font-face {
- font-family: "Roboto";
+ font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: local("Roboto"), local("Roboto-Regular"), url("../fonts/roboto-v15-latin-ext_cyrillic_greek-ext_cyrillic-ext_latin_greek_vietnamese-regular.woff2") format("woff2"), url("../fonts/roboto-v15-latin-ext_cyrillic_greek-ext_cyrillic-ext_latin_greek_vietnamese-regular.woff") format("woff"); }
+
@font-face {
- font-family: "Roboto";
+ font-family: 'Roboto';
font-style: normal;
font-weight: 700;
src: local("Roboto Bold"), local("Roboto-Bold"), url("../fonts/roboto-v15-latin-ext_cyrillic_greek-ext_cyrillic-ext_latin_greek_vietnamese-700.woff2") format("woff2"), url("../fonts/roboto-v15-latin-ext_cyrillic_greek-ext_cyrillic-ext_latin_greek_vietnamese-700.woff") format("woff"); }
+
* {
padding: 0;
margin: 0;
@@ -44,14 +48,15 @@
body {
background: #F2F2F2;
- font-family: "Roboto", sans-serif;
+ font-family: 'Roboto', sans-serif;
font-size: 81.25%;
display: flex;
flex-direction: column;
min-height: 100vh;
position: relative;
- padding-right: 0.9375rem;
- padding-left: 0.9375rem; }
+ padding-right: .9375rem;
+ padding-left: .9375rem;
+}
body .header, body .footer {
flex-grow: 1; }
@@ -68,10 +73,14 @@ form {
margin: 0 auto;
color: #212121;
box-shadow: 0 -1px 0 #e5e5e5, 0 0 2px rgba(0, 0, 0, 0.12), 0 2px 4px rgba(0, 0, 0, 0.24); }
-@media(max-width: 320px) {
- form {
- padding: 8px 16px;
- margin: initial; } }
+
+@media (max-width: 320px) {
+ form {
+ padding: 8px 16px;
+ margin: initial;
+ }
+}
+
.header {
display: flex;
flex-direction: column; }
@@ -96,12 +105,14 @@ h2 {
text-align: center; }
input[type=text], input[type=password] {
+ -webkit-appearance: none;
-moz-appearance: none;
- -webkit-appearance: none;
+ -ms-appearance: none;
+ -o-appearance: none;
+ appearance: none;
appearance: none;
height: 36px;
padding: 0 8px;
- margin: 0;
background: #fff;
border: 1px solid #d9d9d9;
border-top: 1px solid #c0c0c0;
@@ -111,7 +122,7 @@ input[type=text], input[type=password] {
color: #404040;
width: 100%;
display: block;
- margin-bottom: 10px;
+ margin: 0 0 10px;
z-index: 1;
position: relative; }
@@ -131,17 +142,15 @@ input[type="submit"] {
font-weight: 500;
line-height: 20px;
font-size: 14px;
- user-select: none;
+ -webkit-user-select: none;
-moz-user-select: none;
- -webkit-user-select: none;
- -blink-user-select: none;
- background-repeat: no-repeat;
- background-position: center center;
+ -ms-user-select: none;
+ -o-user-select: none;
+ user-select: none;
background-size: 0;
min-width: 88px;
transition: background-size 500ms cubic-bezier(0.98, 0.005, 0.79, 1.005), background-color 500ms cubic-bezier(0.98, 0.005, 0.79, 1.005), color 500ms cubic-bezier(0.98, 0.005, 0.79, 1.005), box-shadow 300ms;
- background-color: #0a70c0;
- background-image: radial-gradient(circle, #105a94 10%, transparent 10.001%, transparent);
+ background: #0a70c0 radial-gradient(circle, #105a94 10%, transparent 10.001%, transparent) no-repeat center center;
box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 3px 1px -2px rgba(0, 0, 0, 0.12), 0 1px 5px 0 rgba(0, 0, 0, 0.2);
color: #fff;
width: 100%;
@@ -159,5 +168,3 @@ form .message {
form .message.error {
color: #b71c1c; }
-
-/*# sourceMappingURL=login.css.map */
diff --git a/res/css/login.sass b/res/css/login.sass
index 42c2fef6c13d1ba8dacfb5eab92f410237950672..843ab167bbb99655e4bf2df2cb8a41b18f439132 100644
--- a/res/css/login.sass
+++ b/res/css/login.sass
@@ -65,12 +65,10 @@ h2
text-align: center
input[type=text], input[type=password]
- -moz-appearance: none
- -webkit-appearance: none
+ @include vendor-prefix('appearance', 'none')
appearance: none
height: 36px
padding: 0 8px
- margin: 0
background: #fff
border: 1px solid #d9d9d9
border-top: 1px solid #c0c0c0
@@ -80,7 +78,7 @@ input[type=text], input[type=password]
color: #404040
width: 100%
display: block
- margin-bottom: 10px
+ margin: 0 0 10px
z-index: 1
position: relative
@@ -100,17 +98,11 @@ input[type="submit"]
font-weight: 500
line-height: 20px
font-size: 14px
- user-select: none
- -moz-user-select: none
- -webkit-user-select: none
- -blink-user-select: none
- background-repeat: no-repeat
- background-position: center center
+ @include vendor-prefix('user-select', 'none')
background-size: 0
min-width: 88px
transition: background-size 500ms cubic-bezier(0.98, 0.005, 0.79, 1.005), background-color 500ms cubic-bezier(0.98, 0.005, 0.79, 1.005), color 500ms cubic-bezier(0.98, 0.005, 0.79, 1.005), box-shadow 300ms
- background-color: #0a70c0
- background-image: radial-gradient(circle, #105a94 10%, rgba(0, 0, 0, 0) 10.001%, rgba(0, 0, 0, 0))
+ background: #0a70c0 radial-gradient(circle, #105a94 10%, rgba(0, 0, 0, 0) 10.001%, rgba(0, 0, 0, 0)) no-repeat center center
box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 3px 1px -2px rgba(0, 0, 0, 0.12), 0 1px 5px 0 rgba(0, 0, 0, 0.2)
color: #fff
width: 100%
diff --git a/res/css/search.css b/res/css/search.css
index 306e1a2d9e7a5e962b488cc3425b8671821d62e0..c5e2d22bffbb25da7618a72de209a106ce2cb3b6 100644
--- a/res/css/search.css
+++ b/res/css/search.css
@@ -1,10 +1,11 @@
@font-face {
- font-family: "Material Icons";
+ font-family: 'Material Icons';
font-style: normal;
font-weight: 400;
src: local("Material Icons"), local("MaterialIcons-Regular"), url(../icons/MaterialIcons-Regular.woff2) format("woff2"), url(../icons/MaterialIcons-Regular.woff) format("woff"); }
+
.icon {
- font-family: "Material Icons", sans-serif;
+ font-family: 'Material Icons', sans-serif;
font-weight: normal;
font-style: normal;
font-size: 24px;
@@ -24,18 +25,21 @@
/* Support for Firefox. */
-moz-osx-font-smoothing: grayscale;
/* Support for IE. */
- font-feature-settings: "liga"; }
+ font-feature-settings: 'liga';
+}
@font-face {
- font-family: "Roboto";
+ font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: local("Roboto"), local("Roboto-Regular"), url("../fonts/roboto-v15-latin-ext_cyrillic_greek-ext_cyrillic-ext_latin_greek_vietnamese-regular.woff2") format("woff2"), url("../fonts/roboto-v15-latin-ext_cyrillic_greek-ext_cyrillic-ext_latin_greek_vietnamese-regular.woff") format("woff"); }
+
@font-face {
- font-family: "Roboto";
+ font-family: 'Roboto';
font-style: normal;
font-weight: 700;
src: local("Roboto Bold"), local("Roboto-Bold"), url("../fonts/roboto-v15-latin-ext_cyrillic_greek-ext_cyrillic-ext_latin_greek_vietnamese-700.woff2") format("woff2"), url("../fonts/roboto-v15-latin-ext_cyrillic_greek-ext_cyrillic-ext_latin_greek_vietnamese-700.woff") format("woff"); }
+
* {
padding: 0;
margin: 0;
@@ -44,9 +48,9 @@
body {
background: #F2F2F2;
- font-family: "Roboto", sans-serif;
- font-size: 81.25%;
- padding-top: 56px;
+ font-family: 'Roboto', sans-serif;
+ font-size: 81.25%;
+ padding-top: 56px;
}
*:focus {
@@ -74,16 +78,19 @@ body {
left: 0;
right: 0;
box-shadow: 0 -1px 0 #e0e0e0, 0 0 2px rgba(0, 0, 0, 0.12), 0 2px 4px rgba(0, 0, 0, 0.24);
- transition: background-color 0.15s;
+ transition: background-color .15s;
will-change: background-color; }
.nav .bar .container {
max-width: 1136px;
margin: 0 auto;
padding: 0 2rem;
display: flex; }
-@media(max-width: 800px) {
+
+@media (max-width: 800px) {
.nav .bar .container {
- padding: 0 0 0 8px; } }
+ padding: 0 0 0 8px;
+ }
+}
.nav .bar .container .searchBar {
margin: 8px auto;
height: 40px;
@@ -97,7 +104,8 @@ body {
flex-direction: row;
flex: 1;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.06);
- transition: background-color 0.15s; }
+ transition: background-color .15s;
+ }
.nav .bar .container .searchBar:hover {
background-color: rgba(255, 255, 255, 0.3); }
.nav .bar .container .searchBar .icon {
@@ -108,8 +116,8 @@ body {
text-align: center;
line-height: 40px;
left: 0;
- top: 0;
- cursor: pointer;
+ top: 0;
+ cursor: pointer;
}
.nav .bar .container .searchBar .search {
display: inline-block;
@@ -144,7 +152,7 @@ body {
padding: 16px 13px;
cursor: pointer;
color: #fff;
- transition: all 0.15s;
+ transition: all .15s;
text-decoration: none;
text-align: center;
-webkit-user-select: none;
@@ -155,7 +163,7 @@ body {
.nav .bar a:before {
background-color: rgba(255, 255, 255, 0.12);
bottom: 9px;
- content: " ";
+ content: ' ';
left: 9px;
margin: auto;
padding: 4px;
@@ -176,9 +184,12 @@ body {
transform: translateY(-200%);
transition: transform 400ms;
position: relative; }
-@media(max-width: 800px) {
+
+@media (max-width: 800px) {
.nav .history {
- padding: 0; } }
+ padding: 0;
+ }
+}
.nav .history ul {
list-style-type: none;
margin: 0;
@@ -230,13 +241,13 @@ body {
opacity: 0; }
.search-options {
- margin: 0 auto;
- padding: 6px 0;
- background: #fff;
- box-shadow: 0 -1px 0 #e0e0e0, 0 0 2px rgba(0, 0, 0, 0.12), 0 2px 4px rgba(0, 0, 0, 0.24);
- max-width: 1072px;
- overflow-x: scroll;
- white-space: nowrap;
+ margin: 0 auto;
+ padding: 6px 0;
+ background: #fff;
+ box-shadow: 0 -1px 0 #e0e0e0, 0 0 2px rgba(0, 0, 0, 0.12), 0 2px 4px rgba(0, 0, 0, 0.24);
+ max-width: 1072px;
+ overflow-x: scroll;
+ white-space: nowrap;
}
[data-sendercolor="0"] {
@@ -296,112 +307,802 @@ body {
.irc_underline {
text-decoration: underline; }
-[data-irc_foreground="0"] {
+.irc_strikethrough {
+ text-decoration: line-through;
+}
+
+.irc_strikethrough.irc_underline {
+ text-decoration: line-through underline;
+}
+
+.irc_monospace {
+ font-family: 'Roboto Mono', 'Source Code Pro', monospace;
+}
+
+[data-irc_foreground="00"] {
color: #ffffff; }
-[data-irc_foreground="1"] {
+[data-irc_background="00"] {
+ background-color: #ffffff;
+}
+
+[data-irc_foreground="01"] {
color: #000000; }
-[data-irc_foreground="2"] {
+[data-irc_background="01"] {
+ background-color: #000000;
+}
+
+[data-irc_foreground="02"] {
color: #000080; }
-[data-irc_foreground="3"] {
+[data-irc_background="02"] {
+ background-color: #000080;
+}
+
+[data-irc_foreground="03"] {
color: #008000; }
-[data-irc_foreground="4"] {
+[data-irc_background="03"] {
+ background-color: #008000;
+}
+
+[data-irc_foreground="04"] {
color: #ff0000; }
-[data-irc_foreground="5"] {
+[data-irc_background="04"] {
+ background-color: #ff0000;
+}
+
+[data-irc_foreground="05"] {
color: #800000; }
-[data-irc_foreground="6"] {
+[data-irc_background="05"] {
+ background-color: #800000;
+}
+
+[data-irc_foreground="06"] {
color: #800080; }
-[data-irc_foreground="7"] {
+[data-irc_background="06"] {
+ background-color: #800080;
+}
+
+[data-irc_foreground="07"] {
color: #ffa500; }
-[data-irc_foreground="8"] {
+[data-irc_background="07"] {
+ background-color: #ffa500;
+}
+
+[data-irc_foreground="08"] {
color: #ffff00; }
-[data-irc_foreground="9"] {
+[data-irc_background="08"] {
+ background-color: #ffff00;
+}
+
+[data-irc_foreground="09"] {
color: #00ff00; }
+[data-irc_background="09"] {
+ background-color: #00ff00;
+}
+
[data-irc_foreground="10"] {
color: #008080; }
+[data-irc_background="10"] {
+ background-color: #008080;
+}
+
[data-irc_foreground="11"] {
color: #00ffff; }
+[data-irc_background="11"] {
+ background-color: #00ffff;
+}
+
[data-irc_foreground="12"] {
color: #4169e1; }
+[data-irc_background="12"] {
+ background-color: #4169e1;
+}
+
[data-irc_foreground="13"] {
color: #ff00ff; }
+[data-irc_background="13"] {
+ background-color: #ff00ff;
+}
+
[data-irc_foreground="14"] {
color: #808080; }
+[data-irc_background="14"] {
+ background-color: #808080;
+}
+
[data-irc_foreground="15"] {
color: #c0c0c0; }
-[data-irc_background="0"] {
- background-color: #ffffff; }
+[data-irc_background="15"] {
+ background-color: #c0c0c0;
+}
+
+[data-irc_foreground="16"] {
+ color: #470000;
+}
+
+[data-irc_background="16"] {
+ background-color: #470000;
+}
+
+[data-irc_foreground="17"] {
+ color: #472100;
+}
+
+[data-irc_background="17"] {
+ background-color: #472100;
+}
+
+[data-irc_foreground="18"] {
+ color: #474700;
+}
+
+[data-irc_background="18"] {
+ background-color: #474700;
+}
+
+[data-irc_foreground="19"] {
+ color: #324700;
+}
+
+[data-irc_background="19"] {
+ background-color: #324700;
+}
+
+[data-irc_foreground="20"] {
+ color: #004700;
+}
+
+[data-irc_background="20"] {
+ background-color: #004700;
+}
+
+[data-irc_foreground="21"] {
+ color: #00472c;
+}
+
+[data-irc_background="21"] {
+ background-color: #00472c;
+}
+
+[data-irc_foreground="22"] {
+ color: #004747;
+}
+
+[data-irc_background="22"] {
+ background-color: #004747;
+}
+
+[data-irc_foreground="23"] {
+ color: #002747;
+}
+
+[data-irc_background="23"] {
+ background-color: #002747;
+}
+
+[data-irc_foreground="24"] {
+ color: #000047;
+}
+
+[data-irc_background="24"] {
+ background-color: #000047;
+}
+
+[data-irc_foreground="25"] {
+ color: #2e0047;
+}
+
+[data-irc_background="25"] {
+ background-color: #2e0047;
+}
+
+[data-irc_foreground="26"] {
+ color: #470047;
+}
+
+[data-irc_background="26"] {
+ background-color: #470047;
+}
+
+[data-irc_foreground="27"] {
+ color: #47002a;
+}
+
+[data-irc_background="27"] {
+ background-color: #47002a;
+}
+
+[data-irc_foreground="28"] {
+ color: #740000;
+}
+
+[data-irc_background="28"] {
+ background-color: #740000;
+}
+
+[data-irc_foreground="29"] {
+ color: #743a00;
+}
+
+[data-irc_background="29"] {
+ background-color: #743a00;
+}
+
+[data-irc_foreground="30"] {
+ color: #747400;
+}
+
+[data-irc_background="30"] {
+ background-color: #747400;
+}
+
+[data-irc_foreground="31"] {
+ color: #517400;
+}
+
+[data-irc_background="31"] {
+ background-color: #517400;
+}
+
+[data-irc_foreground="32"] {
+ color: #007400;
+}
+
+[data-irc_background="32"] {
+ background-color: #007400;
+}
+
+[data-irc_foreground="33"] {
+ color: #007449;
+}
+
+[data-irc_background="33"] {
+ background-color: #007449;
+}
+
+[data-irc_foreground="34"] {
+ color: #007474;
+}
+
+[data-irc_background="34"] {
+ background-color: #007474;
+}
+
+[data-irc_foreground="35"] {
+ color: #004074;
+}
-[data-irc_background="1"] {
- background-color: #000000; }
+[data-irc_background="35"] {
+ background-color: #004074;
+}
+
+[data-irc_foreground="36"] {
+ color: #000074;
+}
+
+[data-irc_background="36"] {
+ background-color: #000074;
+}
+
+[data-irc_foreground="37"] {
+ color: #4b0074;
+}
-[data-irc_background="2"] {
- background-color: #000080; }
+[data-irc_background="37"] {
+ background-color: #4b0074;
+}
+
+[data-irc_foreground="38"] {
+ color: #740074;
+}
+
+[data-irc_background="38"] {
+ background-color: #740074;
+}
+
+[data-irc_foreground="39"] {
+ color: #740045;
+}
-[data-irc_background="3"] {
- background-color: #008000; }
+[data-irc_background="39"] {
+ background-color: #740045;
+}
+
+[data-irc_foreground="40"] {
+ color: #b50000;
+}
+
+[data-irc_background="40"] {
+ background-color: #b50000;
+}
+
+[data-irc_foreground="41"] {
+ color: #b56300;
+}
+
+[data-irc_background="41"] {
+ background-color: #b56300;
+}
+
+[data-irc_foreground="42"] {
+ color: #b5b500;
+}
+
+[data-irc_background="42"] {
+ background-color: #b5b500;
+}
-[data-irc_background="4"] {
+[data-irc_foreground="43"] {
+ color: #7db500;
+}
+
+[data-irc_background="43"] {
+ background-color: #7db500;
+}
+
+[data-irc_foreground="44"] {
+ color: #00b500;
+}
+
+[data-irc_background="44"] {
+ background-color: #00b500;
+}
+
+[data-irc_foreground="45"] {
+ color: #00b571;
+}
+
+[data-irc_background="45"] {
+ background-color: #00b571;
+}
+
+[data-irc_foreground="46"] {
+ color: #00b5b5;
+}
+
+[data-irc_background="46"] {
+ background-color: #00b5b5;
+}
+
+[data-irc_foreground="47"] {
+ color: #0063b5;
+}
+
+[data-irc_background="47"] {
+ background-color: #0063b5;
+}
+
+[data-irc_foreground="48"] {
+ color: #0000b5;
+}
+
+[data-irc_background="48"] {
+ background-color: #0000b5;
+}
+
+[data-irc_foreground="49"] {
+ color: #7500b5;
+}
+
+[data-irc_background="49"] {
+ background-color: #7500b5;
+}
+
+[data-irc_foreground="50"] {
+ color: #b500b5;
+}
+
+[data-irc_background="50"] {
+ background-color: #b500b5;
+}
+
+[data-irc_foreground="51"] {
+ color: #b5006b;
+}
+
+[data-irc_background="51"] {
+ background-color: #b5006b;
+}
+
+[data-irc_foreground="52"] {
+ color: #ff0000;
+}
+
+[data-irc_background="52"] {
background-color: #ff0000; }
-[data-irc_background="5"] {
- background-color: #800000; }
+[data-irc_foreground="53"] {
+ color: #ff8c00;
+}
-[data-irc_background="6"] {
- background-color: #800080; }
+[data-irc_background="53"] {
+ background-color: #ff8c00;
+}
-[data-irc_background="7"] {
- background-color: #ffa500; }
+[data-irc_foreground="54"] {
+ color: #ffff00;
+}
-[data-irc_background="8"] {
+[data-irc_background="54"] {
background-color: #ffff00; }
-[data-irc_background="9"] {
+[data-irc_foreground="55"] {
+ color: #b2ff00;
+}
+
+[data-irc_background="55"] {
+ background-color: #b2ff00;
+}
+
+[data-irc_foreground="56"] {
+ color: #00ff00;
+}
+
+[data-irc_background="56"] {
background-color: #00ff00; }
-[data-irc_background="10"] {
- background-color: #008080; }
+[data-irc_foreground="57"] {
+ color: #00ffa0;
+}
-[data-irc_background="11"] {
+[data-irc_background="57"] {
+ background-color: #00ffa0;
+}
+
+[data-irc_foreground="58"] {
+ color: #00ffff;
+}
+
+[data-irc_background="58"] {
background-color: #00ffff; }
-[data-irc_background="12"] {
- background-color: #4169e1; }
+[data-irc_foreground="59"] {
+ color: #008cff;
+}
-[data-irc_background="13"] {
+[data-irc_background="59"] {
+ background-color: #008cff;
+}
+
+[data-irc_foreground="60"] {
+ color: #0000ff;
+}
+
+[data-irc_background="60"] {
+ background-color: #0000ff;
+}
+
+[data-irc_foreground="61"] {
+ color: #a500ff;
+}
+
+[data-irc_background="61"] {
+ background-color: #a500ff;
+}
+
+[data-irc_foreground="62"] {
+ color: #ff00ff;
+}
+
+[data-irc_background="62"] {
background-color: #ff00ff; }
-[data-irc_background="14"] {
- background-color: #808080; }
+[data-irc_foreground="63"] {
+ color: #ff0098;
+}
-[data-irc_background="15"] {
- background-color: #c0c0c0; }
+[data-irc_background="63"] {
+ background-color: #ff0098;
+}
+
+[data-irc_foreground="64"] {
+ color: #ff5959;
+}
+
+[data-irc_background="64"] {
+ background-color: #ff5959;
+}
+
+[data-irc_foreground="65"] {
+ color: #ffb459;
+}
+
+[data-irc_background="65"] {
+ background-color: #ffb459;
+}
+
+[data-irc_foreground="66"] {
+ color: #ffff71;
+}
+
+[data-irc_background="66"] {
+ background-color: #ffff71;
+}
+
+[data-irc_foreground="67"] {
+ color: #cfff60;
+}
+
+[data-irc_background="67"] {
+ background-color: #cfff60;
+}
+
+[data-irc_foreground="68"] {
+ color: #6fff6f;
+}
+
+[data-irc_background="68"] {
+ background-color: #6fff6f;
+}
+
+[data-irc_foreground="69"] {
+ color: #65ffc9;
+}
+
+[data-irc_background="69"] {
+ background-color: #65ffc9;
+}
+
+[data-irc_foreground="70"] {
+ color: #6dffff;
+}
+
+[data-irc_background="70"] {
+ background-color: #6dffff;
+}
+
+[data-irc_foreground="71"] {
+ color: #59b4ff;
+}
+
+[data-irc_background="71"] {
+ background-color: #59b4ff;
+}
+
+[data-irc_foreground="72"] {
+ color: #5959ff;
+}
+
+[data-irc_background="72"] {
+ background-color: #5959ff;
+}
+
+[data-irc_foreground="73"] {
+ color: #c459ff;
+}
+
+[data-irc_background="73"] {
+ background-color: #c459ff;
+}
+
+[data-irc_foreground="74"] {
+ color: #ff66ff;
+}
+
+[data-irc_background="74"] {
+ background-color: #ff66ff;
+}
+
+[data-irc_foreground="75"] {
+ color: #ff59bc;
+}
+
+[data-irc_background="75"] {
+ background-color: #ff59bc;
+}
+
+[data-irc_foreground="76"] {
+ color: #ff9c9c;
+}
+
+[data-irc_background="76"] {
+ background-color: #ff9c9c;
+}
+
+[data-irc_foreground="77"] {
+ color: #ffd39c;
+}
+
+[data-irc_background="77"] {
+ background-color: #ffd39c;
+}
+
+[data-irc_foreground="78"] {
+ color: #ffff9c;
+}
+
+[data-irc_background="78"] {
+ background-color: #ffff9c;
+}
+
+[data-irc_foreground="79"] {
+ color: #e2ff9c;
+}
+
+[data-irc_background="79"] {
+ background-color: #e2ff9c;
+}
+
+[data-irc_foreground="80"] {
+ color: #9cff9c;
+}
+
+[data-irc_background="80"] {
+ background-color: #9cff9c;
+}
+
+[data-irc_foreground="81"] {
+ color: #9cffdb;
+}
+
+[data-irc_background="81"] {
+ background-color: #9cffdb;
+}
+
+[data-irc_foreground="82"] {
+ color: #9cffff;
+}
+
+[data-irc_background="82"] {
+ background-color: #9cffff;
+}
+
+[data-irc_foreground="83"] {
+ color: #9cd3ff;
+}
+
+[data-irc_background="83"] {
+ background-color: #9cd3ff;
+}
+
+[data-irc_foreground="84"] {
+ color: #9c9cff;
+}
+
+[data-irc_background="84"] {
+ background-color: #9c9cff;
+}
+
+[data-irc_foreground="85"] {
+ color: #dc9cff;
+}
+
+[data-irc_background="85"] {
+ background-color: #dc9cff;
+}
+
+[data-irc_foreground="86"] {
+ color: #ff9cff;
+}
+
+[data-irc_background="86"] {
+ background-color: #ff9cff;
+}
+
+[data-irc_foreground="87"] {
+ color: #ff94d3;
+}
+
+[data-irc_background="87"] {
+ background-color: #ff94d3;
+}
+
+[data-irc_foreground="88"] {
+ color: #000000;
+}
+
+[data-irc_background="88"] {
+ background-color: #000000;
+}
+
+[data-irc_foreground="89"] {
+ color: #131313;
+}
+
+[data-irc_background="89"] {
+ background-color: #131313;
+}
+
+[data-irc_foreground="90"] {
+ color: #282828;
+}
+
+[data-irc_background="90"] {
+ background-color: #282828;
+}
+
+[data-irc_foreground="91"] {
+ color: #363636;
+}
+
+[data-irc_background="91"] {
+ background-color: #363636;
+}
+
+[data-irc_foreground="92"] {
+ color: #4d4d4d;
+}
+
+[data-irc_background="92"] {
+ background-color: #4d4d4d;
+}
+
+[data-irc_foreground="93"] {
+ color: #656565;
+}
+
+[data-irc_background="93"] {
+ background-color: #656565;
+}
+
+[data-irc_foreground="94"] {
+ color: #818181;
+}
+
+[data-irc_background="94"] {
+ background-color: #818181;
+}
+
+[data-irc_foreground="95"] {
+ color: #9f9f9f;
+}
+
+[data-irc_background="95"] {
+ background-color: #9f9f9f;
+}
+
+[data-irc_foreground="96"] {
+ color: #bcbcbc;
+}
+
+[data-irc_background="96"] {
+ background-color: #bcbcbc;
+}
+
+[data-irc_foreground="97"] {
+ color: #e2e2e2;
+}
+
+[data-irc_background="97"] {
+ background-color: #e2e2e2;
+}
+
+[data-irc_foreground="98"] {
+ color: #ffffff;
+}
+
+[data-irc_background="98"] {
+ background-color: #ffffff;
+}
.results {
max-width: 1136px;
- padding: 2rem 2rem 4rem 2rem;
+ padding: 2rem 2rem 4rem 2rem;
margin: 0 auto;
transition: opacity 400ms; }
-@media(max-width: 800px) {
+
+@media (max-width: 800px) {
.results {
padding-left: 0;
padding-right: 0;
- padding-bottom: 0; } }
+ padding-bottom: 0;
+ }
+}
.results .buffer {
display: block;
margin-top: 0;
@@ -409,7 +1110,7 @@ body {
position: relative; }
.results .buffer.focus:not(.hasmore) .inline-button {
- display: none;
+ display: none;
}
.results .buffer .title {
border-bottom: 1px solid transparent;
@@ -432,10 +1133,13 @@ body {
background-color: #f2f2f2;
position: absolute;
z-index: -2; }
-@media(max-width: 800px) {
+
+@media (max-width: 800px) {
.results .buffer .title:before {
left: 0;
- right: 0; } }
+ right: 0;
+ }
+}
.results .buffer .title:after {
content: "";
display: block;
@@ -468,15 +1172,19 @@ body {
padding: 6px 16px;
font-size: 13px;
line-height: 1.846;
+ -webkit-user-select: none;
-moz-user-select: none;
+ -ms-user-select: none;
+ -o-user-select: none;
+ user-select: none;
text-decoration: none;
box-sizing: border-box;
font-family: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif;
- will-change: background;
- opacity: 0;
- pointer-events: none;
- cursor: none;
- transition: opacity 0.4s 0.2s, background 0.4s;
+ will-change: background;
+ opacity: 0;
+ pointer-events: none;
+ cursor: none;
+ transition: opacity 0.4s 0.2s, background 0.4s;
}
.results .buffer .title button:hover {
background-color: rgba(0, 0, 0, 0.06); }
@@ -492,10 +1200,11 @@ body {
background-size: 1000% 1000%;
opacity: 0;
pointer-events: none;
- transition: background 0.5s, opacity 1s; }
+ transition: background .5s, opacity 1s;
+ }
.results .buffer .title button:active:after {
background-size: 0 0;
- opacity: 0.2;
+ opacity: .2;
transition: 0s; }
.results .buffer:not(.focus) .secondary {
display: none; }
@@ -514,33 +1223,39 @@ body {
.results .buffer.focus:before {
margin-bottom: -16px;
background-color: #ddd; }
-@media(min-width: 800px) {
+
+@media (min-width: 800px) {
.results .buffer.focus:before {
margin-left: -16px;
- margin-right: -16px; } }
+ margin-right: -16px;
+ }
+}
.results .buffer.focus .title:after {
background-color: #ddd; }
-@media(min-width: 800px) {
+
+@media (min-width: 800px) {
.results .buffer.focus .title:after {
margin-left: -16px;
- margin-right: -16px; } }
+ margin-right: -16px;
+ }
+}
.results .buffer.focus .title button {
- opacity: 1;
- display: inline-block;
- cursor: pointer;
- pointer-events: initial;
+ opacity: 1;
+ display: inline-block;
+ cursor: pointer;
+ pointer-events: initial;
}
.results .buffer .container {
font-size: 13px; }
.results .buffer .container > .inline-button {
overflow: hidden;
- font-size: 14px;
- line-height: 24px;
- padding: 7px 24px;
- border-bottom: 1px solid #e5e5e5;
- color: #555;
- background: #f0f0f0;
+ font-size: 14px;
+ line-height: 24px;
+ padding: 7px 24px;
+ border-bottom: 1px solid #e5e5e5;
+ color: #555;
+ background: #f0f0f0;
cursor: pointer;
-webkit-user-select: none;
-moz-user-select: none;
@@ -548,35 +1263,46 @@ body {
-o-user-select: none;
user-select: none;
transition: height 400ms;
- position: relative;
- box-shadow: 0 -1px 0 #e5e5e5, 0 0 2px rgba(0, 0, 0, 0.12), 0 2px 4px rgba(0, 0, 0, 0.24);
+ position: relative;
+ box-shadow: 0 -1px 0 #e5e5e5, 0 0 2px rgba(0, 0, 0, 0.12), 0 2px 4px rgba(0, 0, 0, 0.24);
}
.results .buffer .container > .inline-button:before {
- content: "";
- display: inline-block;
- height: 24px;
- width: 24px;
- background-image: url(../icons/dots-horizontal.svg);
- background-size: cover;
- vertical-align: top;
- margin-right: 16px;
+ content: "";
+ display: inline-block;
+ height: 24px;
+ width: 24px;
+ background-image: url(../icons/dots-horizontal.svg);
+ background-size: cover;
+ vertical-align: top;
+ margin-right: 16px;
}
.results .buffer .container .context {
position: relative; }
- .results .buffer .container .context.active {
+
+.results .buffer .container .context.focus {
padding: 0;
margin: 1rem -1rem; }
+
+@media (max-width: 800px) {
+ .results .buffer .container .context.focus {
+ margin: 1rem 0;
+ }
+}
.results .buffer .container .context:before {
bottom: 0;
box-shadow: 0 -1px 0 #e5e5e5, 0 0 2px rgba(0, 0, 0, 0.12), 0 2px 4px rgba(0, 0, 0, 0.24);
- content: "";
+ content: '';
display: block;
left: 0;
pointer-events: none;
position: absolute;
right: 0;
top: 0; }
+
+.results .buffer .container .context > .container > .inline-button {
+ box-shadow: none;
+}
.results .buffer .container .context:not(.focus) > .before, .results .buffer .container .context:not(.focus) > .after {
display: none; }
.results .buffer .container .context:not(.focus) > .inline-button {
@@ -587,9 +1313,48 @@ body {
padding: 12px 24px;
border-bottom: 1px solid #e5e5e5;
color: #212121;
- background: #fff; }
- .results .buffer .container .context .message:last-child {
- border-bottom: none; }
+ background: #fff;
+ position: relative;
+ }
+
+.results .buffer .container .context .message > .more {
+ height: 56px;
+ width: 56px;
+ position: relative;
+ padding: 16px 13px;
+ cursor: pointer;
+ color: #555;
+ transition: all .15s;
+ text-decoration: none;
+ text-align: center;
+ margin-right: -24px;
+ margin-top: -12px;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ -o-user-select: none;
+ user-select: none;
+}
+
+.results .buffer .container .context .message > .more:before {
+ background-color: rgba(255, 255, 255, 0.12);
+ bottom: 9px;
+ content: ' ';
+ left: 9px;
+ margin: auto;
+ padding: 4px;
+ position: absolute;
+ right: 9px;
+ top: 9px;
+ z-index: -1;
+ border-radius: 50%;
+ opacity: 0;
+ transition: opacity 100ms;
+}
+
+.results .buffer .container .context .message > .more:hover:before {
+ opacity: 1;
+}
.results .buffer .container .context .message time {
width: 136px;
display: inline-block;
@@ -598,23 +1363,29 @@ body {
font-family: monospace;
font-size: 85%;
color: #444; }
-@media(max-width: 800px) {
+
+@media (max-width: 800px) {
.results .buffer .container .context .message time {
position: absolute;
right: 8px;
bottom: 8px;
width: initial;
font-style: italic;
- color: #777; } }
+ color: #777;
+ }
+}
.results .buffer .container .context .message .container {
display: flex;
flex-grow: 1;
flex-shrink: 1;
overflow: hidden; }
-@media(max-width: 800px) {
+
+@media (max-width: 800px) {
.results .buffer .container .context .message .container {
display: block;
- padding-bottom: 16px; } }
+ padding-bottom: 16px;
+ }
+}
.results .buffer .container .context .message .container .sender {
width: 148px;
display: inline-block;
@@ -623,22 +1394,35 @@ body {
flex-shrink: 0;
overflow: hidden;
text-overflow: ellipsis; }
-@media(max-width: 800px) {
+
+.results .buffer .container .context .message .container .sender .invisible {
+ font-size: 0;
+ opacity: 0;
+}
+
+@media (max-width: 800px) {
.results .buffer .container .context .message .container .sender {
width: initial;
- padding: 0; } }
-@media(max-width: 800px) {
+ padding: 0;
+ }
+}
+
+@media (max-width: 800px) {
.results .buffer .container .context .message .container .sender:after {
- content: ": ";
- margin-right: 8px; } }
+ content: ': ';
+ margin-right: 8px;
+ }
+}
.results .buffer .container .context .message .container .content {
flex-grow: 1;
overflow: hidden; }
.results .buffer .container .context .message .container .content .irc_highlight {
background-color: rgba(251, 246, 167, 0.5);
color: #212121 !important; }
-@media(max-width: 800px) {
- .results .buffer .container .context .message .container .content {
- display: inline; } }
-/*# sourceMappingURL=search.css.map */
+@media (max-width: 800px) {
+ .results .buffer .container .context .message .container .content {
+ vertical-align: top;
+ display: inline;
+ }
+}
diff --git a/res/js/component/app.js b/res/js/component/app.js
index 8bdebe9741af4d274bf1faf002962fe83b1e16a0..5071290cb7eb3890387539c1309fbfec913ca051 100644
--- a/res/js/component/app.js
+++ b/res/js/component/app.js
@@ -4,6 +4,9 @@ class App {
this.navigation = new Navigation();
this.buffers = [];
this.loadingQuery = 0;
+ if (Storage.exists('language')) {
+ moment.locale(Storage.get('language'));
+ }
this.render();
this.navigation.addEventListener('search', query => {
this.search(query);
@@ -42,7 +45,7 @@ class App {
return;
this.buffers = result.map(buffer => {
return new Buffer(buffer.bufferid, buffer.buffername, buffer.networkname, buffer.hasmore, buffer.messages.map(msg => {
- return new Context(new Message(msg.messageid, msg.time, msg.sender, msg.message));
+ return new Context(new Message(msg.messageid, msg.time, msg.sender, msg.message, true));
}));
});
this.buffers.forEach(buffer => this.insert(buffer));
@@ -62,6 +65,12 @@ class App {
insert(buffer) {
this.resultContainer.appendChild(buffer.elem);
buffer.addEventListener('loadMore', () => this.bufferLoadMore(buffer));
+ buffer.addEventListener('loadBefore', (context, initialLoad) => {
+ this.contextLoadBefore(buffer, context, initialLoad);
+ });
+ buffer.addEventListener('loadAfter', (context, initialLoad) => {
+ this.contextLoadAfter(buffer, context, initialLoad);
+ });
}
bufferLoadMore(buffer) {
if (buffer.loading)
@@ -77,7 +86,36 @@ class App {
buffer.setLoading(false);
});
}
+ contextLoadBefore(buffer, context, initialLoad) {
+ if (context.loading && initialLoad !== true)
+ return;
+ context.setLoading(true);
+ const amount = initialLoad ? 4 : 10;
+ load('web/backlog/', statehandler.parse({
+ buffer: buffer.id,
+ anchor: context.anchorBefore,
+ after: 0,
+ before: amount
+ })).then(result => {
+ context.loadBefore(result.map(msg => new Message(msg.messageid, msg.time, msg.sender, msg.message)));
+ context.setLoading(false);
+ });
+ }
+ contextLoadAfter(buffer, context, initialLoad) {
+ if (context.loading && initialLoad !== true)
+ return;
+ context.setLoading(true);
+ const amount = initialLoad ? 4 : 10;
+ load('web/backlog/', statehandler.parse({
+ buffer: buffer.id,
+ anchor: context.anchorAfter,
+ after: amount,
+ before: 0
+ })).then(result => {
+ context.loadAfter(result.map(msg => new Message(msg.messageid, msg.time, msg.sender, msg.message)));
+ context.setLoading(false);
+ });
+ }
}
-moment.locale(navigator.languages || navigator.language);
const app = new App();
document.body.insertBefore(app.elem, document.body.firstChild);
\ No newline at end of file
diff --git a/res/js/component/app.jsx b/res/js/component/app.jsx
index e3196a150713c72d9271188912790b3d0287cdf5..8700f8eb7889e1a523721642e554d1ff50f4c1cd 100644
--- a/res/js/component/app.jsx
+++ b/res/js/component/app.jsx
@@ -7,6 +7,10 @@ class App {
this.loadingQuery = 0;
+ if (Storage.exists('language')) {
+ moment.locale(Storage.get('language'));
+ }
+
this.render();
this.navigation.addEventListener("search", (query) => {
this.search(query)
@@ -45,7 +49,7 @@ class App {
this.buffers = result.map((buffer) => {
return new Buffer(buffer.bufferid, buffer.buffername, buffer.networkname, buffer.hasmore, buffer.messages.map((msg) => {
- return new Context(new Message(msg.messageid, msg.time, msg.sender, msg.message));
+ return new Context(new Message(msg.messageid, msg.time, msg.sender, msg.message, true));
}));
});
this.buffers.forEach((buffer) => this.insert(buffer));
@@ -67,7 +71,13 @@ class App {
insert(buffer) {
this.resultContainer.appendChild(buffer.elem);
- buffer.addEventListener("loadMore", () => this.bufferLoadMore(buffer))
+ buffer.addEventListener("loadMore", () => this.bufferLoadMore(buffer));
+ buffer.addEventListener("loadBefore", (context, initialLoad) => {
+ this.contextLoadBefore(buffer, context, initialLoad);
+ });
+ buffer.addEventListener("loadAfter", (context, initialLoad) => {
+ this.contextLoadAfter(buffer, context, initialLoad);
+ });
}
bufferLoadMore(buffer) {
@@ -82,8 +92,41 @@ class App {
buffer.setLoading(false);
});
}
+
+ contextLoadBefore(buffer, context, initialLoad) {
+ if (context.loading && initialLoad !== true)
+ return;
+
+ context.setLoading(true);
+ const amount = initialLoad ? 4 : 10;
+ load("web/backlog/", statehandler.parse({
+ buffer: buffer.id,
+ anchor: context.anchorBefore,
+ after: 0,
+ before: amount
+ })).then((result) => {
+ context.loadBefore(result.map((msg) => new Message(msg.messageid, msg.time, msg.sender, msg.message)));
+ context.setLoading(false);
+ });
+ }
+
+ contextLoadAfter(buffer, context, initialLoad) {
+ if (context.loading && initialLoad !== true)
+ return;
+
+ context.setLoading(true);
+ const amount = initialLoad ? 4 : 10;
+ load("web/backlog/", statehandler.parse({
+ buffer: buffer.id,
+ anchor: context.anchorAfter,
+ after: amount,
+ before: 0
+ })).then((result) => {
+ context.loadAfter(result.map((msg) => new Message(msg.messageid, msg.time, msg.sender, msg.message)));
+ context.setLoading(false);
+ });
+ }
}
-moment.locale(navigator.languages || navigator.language);
const app = new App();
document.body.insertBefore(app.elem, document.body.firstChild);
\ No newline at end of file
diff --git a/res/js/component/buffer.js b/res/js/component/buffer.js
index d0bb68dd9f6374b467084c01d53bfbf7b532d48b..d388d6e8ae04227fefb4127108026fbe39c2f2a9 100644
--- a/res/js/component/buffer.js
+++ b/res/js/component/buffer.js
@@ -56,8 +56,6 @@ class Buffer extends Component {
return this.contextList.length;
}
loadMore() {
- console.log(this.neverLoaded);
- console.log(this.hasMore);
if (this.elem.classList.contains('focus') || this.hasMore && this.neverLoaded) {
this.sendEvent('loadMore', []);
}
@@ -86,6 +84,18 @@ class Buffer extends Component {
insert(context) {
let container = this.insertContainerFirst.childElementCount < 4 ? this.insertContainerFirst : this.insertContainer;
container.appendChild(context.elem);
+ context.addEventListener('loadBefore', (context, initialLoad) => {
+ this.sendEvent('loadBefore', [
+ context,
+ initialLoad
+ ]);
+ });
+ context.addEventListener('loadAfter', (context, initialLoad) => {
+ this.sendEvent('loadAfter', [
+ context,
+ initialLoad
+ ]);
+ });
this.neverLoaded = false;
}
setLoading(value) {
diff --git a/res/js/component/buffer.jsx b/res/js/component/buffer.jsx
index d9472d21dfa19ccf96816d11f67a6b6bae325d6a..c7f8e3cc24bd3e99714af6aa9c42f5a8fce2c579 100644
--- a/res/js/component/buffer.jsx
+++ b/res/js/component/buffer.jsx
@@ -49,8 +49,6 @@ class Buffer extends Component {
}
loadMore() {
- console.log(this.neverLoaded);
- console.log(this.hasMore);
if (this.elem.classList.contains("focus") || (this.hasMore && this.neverLoaded)) {
this.sendEvent("loadMore", []);
}
@@ -86,6 +84,12 @@ class Buffer extends Component {
insert(context) {
let container = (this.insertContainerFirst.childElementCount < 4 ? this.insertContainerFirst : this.insertContainer);
container.appendChild(context.elem);
+ context.addEventListener("loadBefore", (context, initialLoad) => {
+ this.sendEvent("loadBefore", [context, initialLoad])
+ });
+ context.addEventListener("loadAfter", (context, initialLoad) => {
+ this.sendEvent("loadAfter", [context, initialLoad])
+ });
this.neverLoaded = false;
}
diff --git a/res/js/component/context.js b/res/js/component/context.js
index e4df7b6a01429bb621a4e51609535ee706cd9a2d..44b7b8e041afd32619f68863c0c18a2d0afcb1dd 100644
--- a/res/js/component/context.js
+++ b/res/js/component/context.js
@@ -1,12 +1,17 @@
-class Context {
+class Context extends Component {
constructor(message, beforeList = [], afterList = []) {
+ super();
this.message = message;
this.beforeList = beforeList;
this.afterList = afterList;
this.render();
- this.insertAfterTarget = this.loadAfterBtn;
- this.beforeList.forEach(this.insertBefore);
- this.afterList.forEach(this.insertAfter);
+ this.insertAfterTarget = this.loadAfterBtn.elem;
+ this.beforeList.forEach(it => this.insertBefore(it));
+ this.afterList.forEach(it => this.insertAfter(it));
+ this.message.addEventListener('focus', () => this.focus());
+ this.anchorBefore = this.message.id;
+ this.anchorAfter = this.message.id;
+ this.loading = false;
}
render() {
return this.elem = function () {
@@ -15,28 +20,59 @@ class Context {
$$a.appendChildren(this.containerBefore = function () {
var $$c = document.createElement('div');
$$c.setAttribute('class', 'container before');
- $$c.appendChildren((this.loadBeforeBtn = new LoadMore(translation.context.load_earlier, this.loadBefore)).elem);
+ $$c.appendChildren((this.loadBeforeBtn = new LoadMore(translation.context.load_earlier, () => this.triggerLoadBefore())).elem);
return $$c;
}.call(this));
$$a.appendChildren(this.message.elem);
$$a.appendChildren(this.containerAfter = function () {
var $$g = document.createElement('div');
$$g.setAttribute('class', 'container after');
- $$g.appendChildren((this.loadAfterBtn = new LoadMore(translation.context.load_later, this.loadAfter)).elem);
+ $$g.appendChildren((this.loadAfterBtn = new LoadMore(translation.context.load_later, () => this.triggerLoadAfter())).elem);
return $$g;
}.call(this));
return $$a;
}.call(this);
}
- loadBefore() {
+ focus(focus) {
+ if (focus === undefined)
+ focus = !this.elem.classList.contains('focus');
+ if (this.anchorBefore === this.message.id && this.anchorAfter === this.message.id) {
+ this.triggerLoadBefore(true);
+ this.triggerLoadAfter(true);
+ }
+ this.elem.classList.toggle('focus', focus);
+ this.sendEvent('focus', focus);
}
insertBefore(message) {
this.containerBefore.insertBefore(message.elem, this.insertBeforeTarget);
this.insertBeforeTarget = message.elem;
- }
- loadAfter() {
+ this.anchorBefore = message.id;
}
insertAfter(message) {
this.containerAfter.insertBefore(message.elem, this.insertAfterTarget);
+ this.anchorAfter = message.id;
+ }
+ triggerLoadBefore(initialLoad) {
+ this.sendEvent('loadBefore', [
+ this,
+ initialLoad === true
+ ]);
+ }
+ triggerLoadAfter(initialLoad) {
+ this.sendEvent('loadAfter', [
+ this,
+ initialLoad === true
+ ]);
+ }
+ loadBefore(elements) {
+ this.beforeList = elements.concat(this.beforeList);
+ elements.forEach(it => this.insertBefore(it));
+ }
+ loadAfter(elements) {
+ this.afterList = elements.concat(this.afterList);
+ elements.forEach(it => this.insertAfter(it));
+ }
+ setLoading(value) {
+ this.loading = value;
}
}
\ No newline at end of file
diff --git a/res/js/component/context.jsx b/res/js/component/context.jsx
index 57767e777323f532969385c825cd5e071ea244d6..b164b2b46144de05a8d2be214ae86069ec040b1e 100644
--- a/res/js/component/context.jsx
+++ b/res/js/component/context.jsx
@@ -1,13 +1,22 @@
-class Context {
+class Context extends Component {
constructor(message, beforeList = [], afterList = []) {
+ super();
+
this.message = message;
this.beforeList = beforeList;
this.afterList = afterList;
this.render();
- this.insertAfterTarget = this.loadAfterBtn;
- this.beforeList.forEach(this.insertBefore);
- this.afterList.forEach(this.insertAfter);
+ this.insertAfterTarget = this.loadAfterBtn.elem;
+ this.beforeList.forEach((it) => this.insertBefore(it));
+ this.afterList.forEach((it) => this.insertAfter(it));
+
+ this.message.addEventListener("focus", () => this.focus());
+
+ this.anchorBefore = this.message.id;
+ this.anchorAfter = this.message.id;
+
+ this.loading = false;
}
render() {
@@ -15,33 +24,63 @@ class Context {
<div className="context">
{this.containerBefore = (
<div className="container before">
- {(this.loadBeforeBtn = new LoadMore(translation.context.load_earlier, this.loadBefore)).elem}
+ {(this.loadBeforeBtn = new LoadMore(translation.context.load_earlier, () => this.triggerLoadBefore())).elem}
</div>
)}
{this.message.elem}
{this.containerAfter = (
<div className="container after">
- {(this.loadAfterBtn = new LoadMore(translation.context.load_later, this.loadAfter)).elem}
+ {(this.loadAfterBtn = new LoadMore(translation.context.load_later, () => this.triggerLoadAfter())).elem}
</div>
)}
</div>
);
}
- loadBefore() {
- /* load data */
+ focus(focus) {
+ if (focus === undefined)
+ focus = !this.elem.classList.contains("focus");
+
+ if (this.anchorBefore === this.message.id && this.anchorAfter === this.message.id) {
+ this.triggerLoadBefore(true);
+ this.triggerLoadAfter(true);
+ }
+
+ this.elem.classList.toggle("focus", focus);
+ this.sendEvent("focus", focus);
}
insertBefore(message) {
this.containerBefore.insertBefore(message.elem, this.insertBeforeTarget);
this.insertBeforeTarget = message.elem;
- }
-
- loadAfter() {
- /* load data */
+ this.anchorBefore = message.id;
}
insertAfter(message) {
this.containerAfter.insertBefore(message.elem, this.insertAfterTarget);
+ this.anchorAfter = message.id;
+ }
+
+ triggerLoadBefore(initialLoad) {
+ this.sendEvent("loadBefore", [this, initialLoad === true]);
+ }
+
+ triggerLoadAfter(initialLoad) {
+ this.sendEvent("loadAfter", [this, initialLoad === true]);
+ }
+
+ loadBefore(elements) {
+ this.beforeList = elements.concat(this.beforeList);
+ elements.forEach((it) => this.insertBefore(it));
+ }
+
+ loadAfter(elements) {
+ this.afterList = elements.concat(this.afterList);
+ elements.forEach((it) => this.insertAfter(it));
+ }
+
+ setLoading(value) {
+ // Add UI indicator
+ this.loading = value;
}
}
\ No newline at end of file
diff --git a/res/js/component/loadmore.js b/res/js/component/loadmore.js
index 49c1e5ad5f6f2470effa0903143c11afc95d7560..c407beca7f6f04e29ed70642081526a1617e32a6 100644
--- a/res/js/component/loadmore.js
+++ b/res/js/component/loadmore.js
@@ -2,6 +2,7 @@ class LoadMore extends Component {
constructor(text, eventListener) {
super();
this.render(text);
+ this.addEventListener('click', eventListener);
}
render(text) {
return this.elem = function () {
diff --git a/res/js/component/loadmore.jsx b/res/js/component/loadmore.jsx
index 445a27f71c9974f609e68adc437d33005db94cb5..2015eaf6dcec348fbf8d4a9e353a602abc2d0f8a 100644
--- a/res/js/component/loadmore.jsx
+++ b/res/js/component/loadmore.jsx
@@ -2,6 +2,7 @@ class LoadMore extends Component {
constructor(text, eventListener) {
super();
this.render(text);
+ this.addEventListener("click", eventListener);
}
render(text) {
diff --git a/res/js/component/message.js b/res/js/component/message.js
index aad6f5d6439419746b7ee825acceb57390311bc5..ded54c19b8cb652d60b829725209d658d30ce626 100644
--- a/res/js/component/message.js
+++ b/res/js/component/message.js
@@ -1,33 +1,61 @@
-class Message {
- constructor(id, time, sender, content) {
+class Message extends Component {
+ constructor(id, time, sender, content, isAnchor) {
+ super();
this.id = id;
this.time = time;
this.sender = sender;
this.content = content;
+ this.isAnchor = isAnchor;
this.render();
}
render() {
return this.elem = function () {
- var $$a = document.createElement('div');
+ var $$a = document.createElement('span');
$$a.setAttribute('class', 'message');
- var $$b = document.createElement('time');
+ var $$b = document.createElement('span');
$$a.appendChild($$b);
- $$b.appendChildren(moment(new Date(this.time.replace(' ', 'T') + 'Z')).format('L LT'));
- var $$d = document.createElement('div');
- $$d.setAttribute('class', 'container');
- $$a.appendChild($$d);
- var $$e = document.createElement('div');
- $$e.setAttribute('class', 'sender');
- $$e.setAttribute('data-sendercolor', SenderColorHandler.nickToColor(this.getNick()));
- $$d.appendChild($$e);
- $$e.appendChildren(this.getNick());
- var $$g = document.createElement('div');
- $$g.setAttribute('class', 'content');
- $$d.appendChild($$g);
- $$g.appendChildren(MircColorHandler.render(this.content));
+ var $$c = document.createElement('time');
+ $$b.appendChild($$c);
+ $$c.appendChildren(this.formatTime());
+ var $$e = document.createElement('span');
+ $$e.setAttribute('class', 'container');
+ $$a.appendChild($$e);
+ var $$f = document.createElement('span');
+ $$f.setAttribute('class', 'sender');
+ $$f.setAttribute('data-sendercolor', SenderColorHandler.nickToColor(this.getNick()));
+ $$e.appendChild($$f);
+ var $$g = document.createElement('span');
+ $$g.setAttribute('class', 'invisible');
+ $$f.appendChild($$g);
+ var $$h = document.createTextNode(' <');
+ $$g.appendChild($$h);
+ $$f.appendChildren(this.getNick());
+ var $$j = document.createElement('span');
+ $$j.setAttribute('class', 'invisible');
+ $$f.appendChild($$j);
+ var $$k = document.createTextNode('> ');
+ $$j.appendChild($$k);
+ var $$l = document.createElement('span');
+ $$l.setAttribute('class', 'content');
+ $$e.appendChild($$l);
+ $$l.appendChildren(MircColorHandler.render(this.content));
+ $$a.appendChildren(this.isAnchor ? function () {
+ var $$o = document.createElement('a');
+ $$o.setAttribute('class', 'more icon');
+ $$o.addEventListener('click', () => this.sendEvent('focus', []));
+ var $$p = document.createTextNode('list');
+ $$o.appendChild($$p);
+ return $$o;
+ }.call(this) : null);
return $$a;
}.call(this);
}
+ formatTime() {
+ const dateFormat = Storage.exists('dateformat') ? Storage.get('dateformat') : 'L';
+ const timeFormat = Storage.exists('timeformat') ? Storage.get('timeformat') : 'LT';
+ const dateTimeFormat = dateFormat + ' ' + timeFormat;
+ return moment(new Date(this.time.replace(' ', 'T') + 'Z')).format(dateTimeFormat);
+ }
getNick() {
return this.sender.split('!')[0];
}
diff --git a/res/js/component/message.jsx b/res/js/component/message.jsx
index b026667b13805b2e3dbef78a78755bddb14c90af..6b094edab9e2843586bfbf244c478d9488bf823a 100644
--- a/res/js/component/message.jsx
+++ b/res/js/component/message.jsx
@@ -1,29 +1,45 @@
-class Message {
- constructor(id, time, sender, content) {
+class Message extends Component {
+ constructor(id, time, sender, content, isAnchor) {
+ super();
+
this.id = id;
this.time = time;
this.sender = sender;
this.content = content;
+ this.isAnchor = isAnchor;
this.render();
}
render() {
return this.elem = (
- <div className="message">
- <time>{moment(new Date(this.time.replace(" ", "T") + "Z")).format('L LT')}</time>
- <div className="container">
- <div className="sender" data-sendercolor={SenderColorHandler.nickToColor(this.getNick())}>
+ <span className="message">
+ <span><time>{this.formatTime()}</time></span>
+ <span className="container">
+ <span className="sender" data-sendercolor={SenderColorHandler.nickToColor(this.getNick())}>
+ <span className="invisible"> <</span>
{this.getNick()}
- </div>
- <div className="content">
+ <span className="invisible">> </span>
+ </span>
+ <span className="content">
{MircColorHandler.render(this.content)}
- </div>
- </div>
- </div>
+ </span>
+ </span>
+ {this.isAnchor ? (
+ <a className="more icon" onClick={() => this.sendEvent("focus", [])}>list</a>
+ ) : null}
+ </span>
);
}
+ formatTime() {
+ const dateFormat = Storage.exists('dateformat') ? Storage.get('dateformat') : 'L';
+ const timeFormat = Storage.exists('timeformat') ? Storage.get('timeformat') : 'LT';
+ const dateTimeFormat = dateFormat + " " + timeFormat;
+
+ return moment(new Date(this.time.replace(" ", "T") + "Z")).format(dateTimeFormat);
+ }
+
getNick() {
return this.sender.split("!")[0];
}
diff --git a/res/js/util/storage.js b/res/js/util/storage.js
new file mode 100644
index 0000000000000000000000000000000000000000..2f77e441571728be8e85048fbc7cd44279212c67
--- /dev/null
+++ b/res/js/util/storage.js
@@ -0,0 +1,17 @@
+class Storage {
+ static get(key) {
+ try {
+ return JSON.parse(localStorage.getItem(key));
+ } catch (e) {
+ return null;
+ }
+ }
+
+ static set(key, value) {
+ localStorage.setItem(key, JSON.stringify(value));
+ }
+
+ static exists(key) {
+ return !!Storage.get(key);
+ }
+}
\ No newline at end of file
diff --git a/templates/search.phtml b/templates/search.phtml
index 4877bb462abd981400f631ad3bb6cd28f0d90b59..a72a637f71a853bb8432c6554bc9d8384b789df6 100644
--- a/templates/search.phtml
+++ b/templates/search.phtml
@@ -35,6 +35,7 @@
<script src="res/js/util/mirccolorhandler.js"></script>
<script src="res/js/util/sendercolorhandler.js"></script>
<script src="res/js/util/statehandler.js"></script>
+<script src="res/js/util/storage.js"></script>
<script src="res/js/component/nohistoryelement.js"></script>
<script src="res/js/component/historyelement.js"></script>
<script src="res/js/component/history.js"></script>