##// END OF EJS Templates
diffs: sticky top-file bar + context aware file labels....
marcink -
r3126:4c30a2d8 default
parent child Browse files
Show More

The requested changes are too big and content was truncated. Show full diff

@@ -37,6 +37,10 b''
37 37 "<%= dirs.js.node_modules %>/moment/min/moment.min.js",
38 38 "<%= dirs.js.node_modules %>/clipboard/dist/clipboard.min.js",
39 39 "<%= dirs.js.node_modules %>/favico.js/favico-0.3.10.min.js",
40 "<%= dirs.js.node_modules %>/sticky-sidebar/dist/sticky-sidebar.min.js",
41 "<%= dirs.js.node_modules %>/sticky-sidebar/dist/jquery.sticky-sidebar.min.js",
42 "<%= dirs.js.node_modules %>/waypoints/lib/noframework.waypoints.min.js",
43 "<%= dirs.js.node_modules %>/waypoints/lib/jquery.waypoints.min.js",
40 44 "<%= dirs.js.node_modules %>/appenlight-client/appenlight-client.min.js",
41 45 "<%= dirs.js.src %>/logging.js",
42 46 "<%= dirs.js.src %>/bootstrap.js",
@@ -28,6 +28,8 b''
28 28 "qrious": "^4.0.2",
29 29 "moment": "^2.18.1",
30 30 "mousetrap": "^1.6.1",
31 "sticky-sidebar": "3.3.1",
32 "waypoints": "4.0.1",
31 33 "appenlight-client": "git+https://git@github.com/AppEnlight/appenlight-client-js.git#0.5.1"
32 34 }
33 35 }
@@ -1,9 +1,9 b''
1 1 # Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix)
2 2 { fetchbower, buildEnv }:
3 3 buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
4 (fetchbower "webcomponentsjs" "1.2.3" "^1.2.3" "0db2fjk779rhl9d4ifpk1j9a83vngx6j3hk7si1752dqxj857267")
5 (fetchbower "polymer" "Polymer/polymer#2.6.0" "Polymer/polymer#^2.6.0" "1jw5syjn0naa7dlxzxvsgwb20zbkbpx0pcg0wzjq4wr49c20nw0k")
6 (fetchbower "paper-button" "PolymerElements/paper-button#2.1.2" "PolymerElements/paper-button#^2.1.2" "1lwmjwhvimh02gss39yjp5h7yg9mxl1ig59yrk085v86y5f5ilz1")
4 (fetchbower "webcomponentsjs" "1.2.7" "^1.2.3" "0wbybia53zjfcyh4yvjc4ds8vvfizmmsyd35qgja4v0hlyvf4zms")
5 (fetchbower "polymer" "Polymer/polymer#2.6.1" "Polymer/polymer#^2.6.0" "0zr44hh50851hfqwgw5r4pa330p1jp60rrffcqrw3wwggfl38s4n")
6 (fetchbower "paper-button" "PolymerElements/paper-button#2.1.3" "PolymerElements/paper-button#^2.1.2" "1w016daj1l8hyklaqskcz4c3zxcm77cd5k3lj0324xn45n3vvphc")
7 7 (fetchbower "paper-spinner" "PolymerElements/paper-spinner#2.1.0" "PolymerElements/paper-spinner#^2.1.0" "07jamgxzvy4r9pgf5ikj1fm8nkrw6sywgcxvmm7ax58hjvmd4i45")
8 8 (fetchbower "paper-tooltip" "PolymerElements/paper-tooltip#2.1.1" "PolymerElements/paper-tooltip#^2.1.1" "0ja9vz4xps7dxfx6kmrwq0gifbjsyc3pk9l3hd5233ss72ghlvgb")
9 9 (fetchbower "paper-toast" "PolymerElements/paper-toast#2.1.2" "PolymerElements/paper-toast#^2.1.2" "0mkj9ayjx2l9hvrz4kw3yjbgrs9w873k05ywv94nh92mzpjkxn04")
@@ -11,7 +11,7 b' buildEnv { name = "bower-env"; ignoreCol'
11 11 (fetchbower "iron-ajax" "PolymerElements/iron-ajax#2.1.3" "PolymerElements/iron-ajax#^2.1.3" "187zb6lkv18yapl292qhn611mbl4i2bqs2dimlwmdjaln285nc1l")
12 12 (fetchbower "iron-autogrow-textarea" "PolymerElements/iron-autogrow-textarea#2.2.0" "PolymerElements/iron-autogrow-textarea#^2.2.0" "1cx7g49m20z08x25z24g2pvv6m6dwfbkga3nsw0rpi3jk7xhznqw")
13 13 (fetchbower "iron-a11y-keys" "PolymerElements/iron-a11y-keys#2.1.2" "PolymerElements/iron-a11y-keys#^2.1.2" "0zdn3bzfrk88iwahmmzvcjn3m90zga1l8dx42b365n8if0n0zapj")
14 (fetchbower "shadycss" "webcomponents/shadycss#1.3.5" "webcomponents/shadycss#^v1.1.0" "1xp07d6jlmc3ywg4cdp2nijwi0vrbzw468242xz0s6zx5z2n2wzf")
14 (fetchbower "shadycss" "webcomponents/shadycss#1.5.2" "webcomponents/shadycss#^v1.1.0" "03fgbgvb80zjrgnq43gk0hr4cbvjs8rkqpfv1c2qsn7b6q71izlx")
15 15 (fetchbower "iron-flex-layout" "PolymerElements/iron-flex-layout#2.0.3" "PolymerElements/iron-flex-layout#1 - 2" "1ir9ili3rkcgbfj6is5s70vyb7m6avz0av0lpjjlhhsplrrl90bk")
16 16 (fetchbower "paper-behaviors" "PolymerElements/paper-behaviors#2.1.1" "PolymerElements/paper-behaviors#1 - 2" "0wzyznmy1q64jsm6lck0xma92lg2hz9h9m05r68iy20iyrvbjld7")
17 17 (fetchbower "paper-styles" "PolymerElements/paper-styles#2.1.0" "PolymerElements/paper-styles#1 - 2" "0xzsd7pvjsk7lgcmvx4q0dvps40q3mymkx26zgs8ns91s1ssfqbx")
@@ -13,22 +13,22 b' let'
13 13 sha1 = "e7365648c1b42136a59c7d5040637b3b5c83b614";
14 14 };
15 15 };
16 "@types/node-4.2.23" = {
16 "@types/node-4.9.0" = {
17 17 name = "_at_types_slash_node";
18 18 packageName = "@types/node";
19 version = "4.2.23";
20 src = fetchurl {
21 url = "https://registry.npmjs.org/@types/node/-/node-4.2.23.tgz";
22 sha512 = "U6IchCNLRyswc9p6G6lxWlbE+KwAhZp6mGo6MD2yWpmFomhYmetK+c98OpKyvphNn04CU3aXeJrXdOqbXVTS/w==";
23 };
24 };
25 "@types/node-6.0.114" = {
19 version = "4.9.0";
20 src = fetchurl {
21 url = "https://registry.npmjs.org/@types/node/-/node-4.9.0.tgz";
22 sha512 = "xUFkZ+er9gUGw0x9qyfmr/Th0LuX6IB0m7HrRMB6sO6vcBVRFZ/3YV1EeiOC2fG50RX09avDfKwGBHOnPVxFeg==";
23 };
24 };
25 "@types/node-6.0.118" = {
26 26 name = "_at_types_slash_node";
27 27 packageName = "@types/node";
28 version = "6.0.114";
29 src = fetchurl {
30 url = "https://registry.npmjs.org/@types/node/-/node-6.0.114.tgz";
31 sha512 = "5ViC9dwf1VIAtrOFTvOuN04lJgw28eKjuy0Vg2Bd/fSlxKP2feCSkIw04ZgOENL2ywdWrtbkthp1XVLEjJmouw==";
28 version = "6.0.118";
29 src = fetchurl {
30 url = "https://registry.npmjs.org/@types/node/-/node-6.0.118.tgz";
31 sha512 = "N33cKXGSqhOYaPiT4xUGsYlPPDwFtQM/6QxJxuMXA/7BcySW+lkn2yigWP7vfs4daiL/7NJNU6DMCqg5N4B+xQ==";
32 32 };
33 33 };
34 34 "@types/parse5-0.0.31" = {
@@ -36,7 +36,7 b' let'
36 36 packageName = "@types/parse5";
37 37 version = "0.0.31";
38 38 src = fetchurl {
39 url = "https://registry.npmjs.org/@types/parse5/-/parse5-0.0.31.tgz";
39 url = "http://registry.npmjs.org/@types/parse5/-/parse5-0.0.31.tgz";
40 40 sha1 = "e827a493a443b156e1b582a2e4c3bdc0040f2ee7";
41 41 };
42 42 };
@@ -58,13 +58,13 b' let'
58 58 sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a";
59 59 };
60 60 };
61 "acorn-5.7.1" = {
61 "acorn-5.7.3" = {
62 62 name = "acorn";
63 63 packageName = "acorn";
64 version = "5.7.1";
65 src = fetchurl {
66 url = "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz";
67 sha512 = "d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==";
64 version = "5.7.3";
65 src = fetchurl {
66 url = "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz";
67 sha512 = "T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==";
68 68 };
69 69 };
70 70 "acorn-jsx-3.0.1" = {
@@ -194,13 +194,13 b' let'
194 194 sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46";
195 195 };
196 196 };
197 "asn1-0.2.3" = {
197 "asn1-0.2.4" = {
198 198 name = "asn1";
199 199 packageName = "asn1";
200 version = "0.2.3";
201 src = fetchurl {
202 url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz";
203 sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86";
200 version = "0.2.4";
201 src = fetchurl {
202 url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz";
203 sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==";
204 204 };
205 205 };
206 206 "assert-plus-0.2.0" = {
@@ -275,13 +275,13 b' let'
275 275 sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f";
276 276 };
277 277 };
278 "aws4-1.7.0" = {
278 "aws4-1.8.0" = {
279 279 name = "aws4";
280 280 packageName = "aws4";
281 version = "1.7.0";
282 src = fetchurl {
283 url = "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz";
284 sha512 = "32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==";
281 version = "1.8.0";
282 src = fetchurl {
283 url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz";
284 sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==";
285 285 };
286 286 };
287 287 "babel-polyfill-6.26.0" = {
@@ -482,13 +482,13 b' let'
482 482 sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b";
483 483 };
484 484 };
485 "combined-stream-1.0.6" = {
485 "combined-stream-1.0.7" = {
486 486 name = "combined-stream";
487 487 packageName = "combined-stream";
488 version = "1.0.6";
489 src = fetchurl {
490 url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz";
491 sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818";
488 version = "1.0.7";
489 src = fetchurl {
490 url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz";
491 sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==";
492 492 };
493 493 };
494 494 "command-line-args-3.0.5" = {
@@ -527,13 +527,13 b' let'
527 527 sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==";
528 528 };
529 529 };
530 "config-chain-1.1.11" = {
530 "config-chain-1.1.12" = {
531 531 name = "config-chain";
532 532 packageName = "config-chain";
533 version = "1.1.11";
534 src = fetchurl {
535 url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz";
536 sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2";
533 version = "1.1.12";
534 src = fetchurl {
535 url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz";
536 sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==";
537 537 };
538 538 };
539 539 "console-browserify-1.1.0" = {
@@ -815,13 +815,13 b' let'
815 815 sha1 = "96edb9f2fdb01995822b263dd8aadab6748181bc";
816 816 };
817 817 };
818 "es6-promise-4.2.4" = {
818 "es6-promise-4.2.5" = {
819 819 name = "es6-promise";
820 820 packageName = "es6-promise";
821 version = "4.2.4";
822 src = fetchurl {
823 url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz";
824 sha512 = "/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ==";
821 version = "4.2.5";
822 src = fetchurl {
823 url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.5.tgz";
824 sha512 = "n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==";
825 825 };
826 826 };
827 827 "escape-string-regexp-1.0.5" = {
@@ -1157,13 +1157,13 b' let'
1157 1157 sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
1158 1158 };
1159 1159 };
1160 "glob-7.1.2" = {
1160 "glob-7.1.3" = {
1161 1161 name = "glob";
1162 1162 packageName = "glob";
1163 version = "7.1.2";
1164 src = fetchurl {
1165 url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
1166 sha512 = "MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==";
1163 version = "7.1.3";
1164 src = fetchurl {
1165 url = "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz";
1166 sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==";
1167 1167 };
1168 1168 };
1169 1169 "globule-0.1.0" = {
@@ -1706,13 +1706,13 b' let'
1706 1706 sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e";
1707 1707 };
1708 1708 };
1709 "lodash-4.17.10" = {
1709 "lodash-4.17.11" = {
1710 1710 name = "lodash";
1711 1711 packageName = "lodash";
1712 version = "4.17.10";
1713 src = fetchurl {
1714 url = "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz";
1715 sha512 = "UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==";
1712 version = "4.17.11";
1713 src = fetchurl {
1714 url = "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz";
1715 sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==";
1716 1716 };
1717 1717 };
1718 1718 "lru-cache-2.7.3" = {
@@ -1733,22 +1733,22 b' let'
1733 1733 sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
1734 1734 };
1735 1735 };
1736 "mime-db-1.35.0" = {
1736 "mime-db-1.36.0" = {
1737 1737 name = "mime-db";
1738 1738 packageName = "mime-db";
1739 version = "1.35.0";
1740 src = fetchurl {
1741 url = "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz";
1742 sha512 = "JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg==";
1743 };
1744 };
1745 "mime-types-2.1.19" = {
1739 version = "1.36.0";
1740 src = fetchurl {
1741 url = "https://registry.npmjs.org/mime-db/-/mime-db-1.36.0.tgz";
1742 sha512 = "L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==";
1743 };
1744 };
1745 "mime-types-2.1.20" = {
1746 1746 name = "mime-types";
1747 1747 packageName = "mime-types";
1748 version = "2.1.19";
1749 src = fetchurl {
1750 url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz";
1751 sha512 = "P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==";
1748 version = "2.1.20";
1749 src = fetchurl {
1750 url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.20.tgz";
1751 sha512 = "HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==";
1752 1752 };
1753 1753 };
1754 1754 "minimatch-0.2.14" = {
@@ -1787,22 +1787,22 b' let'
1787 1787 sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
1788 1788 };
1789 1789 };
1790 "minipass-2.3.3" = {
1790 "minipass-2.3.4" = {
1791 1791 name = "minipass";
1792 1792 packageName = "minipass";
1793 version = "2.3.3";
1794 src = fetchurl {
1795 url = "https://registry.npmjs.org/minipass/-/minipass-2.3.3.tgz";
1796 sha512 = "/jAn9/tEX4gnpyRATxgHEOV6xbcyxgT7iUnxo9Y3+OB0zX00TgKIv/2FZCf5brBbICcwbLqVv2ImjvWWrQMSYw==";
1797 };
1798 };
1799 "minizlib-1.1.0" = {
1793 version = "2.3.4";
1794 src = fetchurl {
1795 url = "https://registry.npmjs.org/minipass/-/minipass-2.3.4.tgz";
1796 sha512 = "mlouk1OHlaUE8Odt1drMtG1bAJA4ZA6B/ehysgV0LUIrDHdKgo1KorZq3pK0b/7Z7LJIQ12MNM6aC+Tn6lUZ5w==";
1797 };
1798 };
1799 "minizlib-1.1.1" = {
1800 1800 name = "minizlib";
1801 1801 packageName = "minizlib";
1802 version = "1.1.0";
1803 src = fetchurl {
1804 url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz";
1805 sha512 = "4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==";
1802 version = "1.1.1";
1803 src = fetchurl {
1804 url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.1.tgz";
1805 sha512 = "TrfjCjk4jLhcJyGMYymBH6oTXcWjYbUAXTHDbtnWHjZC25h0cdajHuPE1zxb4DVmu8crfh+HwH/WMuyLG0nHBg==";
1806 1806 };
1807 1807 };
1808 1808 "mkdirp-0.3.5" = {
@@ -2336,13 +2336,13 b' let'
2336 2336 sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da";
2337 2337 };
2338 2338 };
2339 "semver-5.5.0" = {
2339 "semver-5.5.1" = {
2340 2340 name = "semver";
2341 2341 packageName = "semver";
2342 version = "5.5.0";
2343 src = fetchurl {
2344 url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz";
2345 sha512 = "4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==";
2342 version = "5.5.1";
2343 src = fetchurl {
2344 url = "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz";
2345 sha512 = "PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==";
2346 2346 };
2347 2347 };
2348 2348 "set-blocking-2.0.0" = {
@@ -2435,22 +2435,22 b' let'
2435 2435 sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==";
2436 2436 };
2437 2437 };
2438 "spdx-correct-3.0.0" = {
2438 "spdx-correct-3.0.2" = {
2439 2439 name = "spdx-correct";
2440 2440 packageName = "spdx-correct";
2441 version = "3.0.0";
2442 src = fetchurl {
2443 url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz";
2444 sha512 = "N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==";
2445 };
2446 };
2447 "spdx-exceptions-2.1.0" = {
2441 version = "3.0.2";
2442 src = fetchurl {
2443 url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.2.tgz";
2444 sha512 = "q9hedtzyXHr5S0A1vEPoK/7l8NpfkFYTq6iCY+Pno2ZbdZR6WexZFtqeVGkGxW3TEJMN914Z55EnAGMmenlIQQ==";
2445 };
2446 };
2447 "spdx-exceptions-2.2.0" = {
2448 2448 name = "spdx-exceptions";
2449 2449 packageName = "spdx-exceptions";
2450 version = "2.1.0";
2451 src = fetchurl {
2452 url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz";
2453 sha512 = "4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==";
2450 version = "2.2.0";
2451 src = fetchurl {
2452 url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz";
2453 sha512 = "2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==";
2454 2454 };
2455 2455 };
2456 2456 "spdx-expression-parse-3.0.0" = {
@@ -2462,13 +2462,13 b' let'
2462 2462 sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==";
2463 2463 };
2464 2464 };
2465 "spdx-license-ids-3.0.0" = {
2465 "spdx-license-ids-3.0.1" = {
2466 2466 name = "spdx-license-ids";
2467 2467 packageName = "spdx-license-ids";
2468 version = "3.0.0";
2469 src = fetchurl {
2470 url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz";
2471 sha512 = "2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==";
2468 version = "3.0.1";
2469 src = fetchurl {
2470 url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz";
2471 sha512 = "TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w==";
2472 2472 };
2473 2473 };
2474 2474 "split-1.0.1" = {
@@ -2480,13 +2480,13 b' let'
2480 2480 sha512 = "mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==";
2481 2481 };
2482 2482 };
2483 "sshpk-1.14.2" = {
2483 "sshpk-1.15.1" = {
2484 2484 name = "sshpk";
2485 2485 packageName = "sshpk";
2486 version = "1.14.2";
2487 src = fetchurl {
2488 url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz";
2489 sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98";
2486 version = "1.15.1";
2487 src = fetchurl {
2488 url = "https://registry.npmjs.org/sshpk/-/sshpk-1.15.1.tgz";
2489 sha512 = "mSdgNUaidk+dRU5MhYtN9zebdzF2iG0cNPWy8HG+W8y+fT1JnSkh0fzzpjOa0L7P8i1Rscz38t0h4gPcKz43xA==";
2490 2490 };
2491 2491 };
2492 2492 "ssri-5.3.0" = {
@@ -2507,6 +2507,15 b' let'
2507 2507 sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0";
2508 2508 };
2509 2509 };
2510 "sticky-sidebar-3.3.1" = {
2511 name = "sticky-sidebar";
2512 packageName = "sticky-sidebar";
2513 version = "3.3.1";
2514 src = fetchurl {
2515 url = "https://registry.npmjs.org/sticky-sidebar/-/sticky-sidebar-3.3.1.tgz";
2516 sha1 = "142bf6b64c2b416e4b707ebf8f09b8b5a5043877";
2517 };
2518 };
2510 2519 "string-width-1.0.2" = {
2511 2520 name = "string-width";
2512 2521 packageName = "string-width";
@@ -2786,13 +2795,13 b' let'
2786 2795 sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==";
2787 2796 };
2788 2797 };
2789 "validate-npm-package-license-3.0.3" = {
2798 "validate-npm-package-license-3.0.4" = {
2790 2799 name = "validate-npm-package-license";
2791 2800 packageName = "validate-npm-package-license";
2792 version = "3.0.3";
2793 src = fetchurl {
2794 url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz";
2795 sha512 = "63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==";
2801 version = "3.0.4";
2802 src = fetchurl {
2803 url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz";
2804 sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==";
2796 2805 };
2797 2806 };
2798 2807 "validate-npm-package-name-3.0.0" = {
@@ -2831,6 +2840,15 b' let'
2831 2840 sha512 = "5skcWAUmySj6hkBdH6B6+3ddMjVQYH5Qy9QGbPmN8kVmLteXk+yVXg+yfk1nbX30EYakahLrr8iPcCxJQSCBeg==";
2832 2841 };
2833 2842 };
2843 "waypoints-4.0.1" = {
2844 name = "waypoints";
2845 packageName = "waypoints";
2846 version = "4.0.1";
2847 src = fetchurl {
2848 url = "https://registry.npmjs.org/waypoints/-/waypoints-4.0.1.tgz";
2849 sha1 = "09979a0573810b29627cba4366a284a062ec69c8";
2850 };
2851 };
2834 2852 "which-1.0.9" = {
2835 2853 name = "which";
2836 2854 packageName = "which";
@@ -2858,13 +2876,13 b' let'
2858 2876 sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==";
2859 2877 };
2860 2878 };
2861 "winston-2.4.3" = {
2879 "winston-2.4.4" = {
2862 2880 name = "winston";
2863 2881 packageName = "winston";
2864 version = "2.4.3";
2865 src = fetchurl {
2866 url = "https://registry.npmjs.org/winston/-/winston-2.4.3.tgz";
2867 sha512 = "GYKuysPz2pxYAVJD2NPsDLP5Z79SDEzPm9/j4tCjkF/n89iBNGBMJcR+dMUqxgPNgoSs6fVygPi+Vl2oxIpBuw==";
2882 version = "2.4.4";
2883 src = fetchurl {
2884 url = "https://registry.npmjs.org/winston/-/winston-2.4.4.tgz";
2885 sha512 = "NBo2Pepn4hK4V01UfcWcDlmiVTs7VTB1h7bgnB0rgP146bYhMxX0ypCz3lBOfNxCO4Zuek7yeT+y/zM1OfMw4Q==";
2868 2886 };
2869 2887 };
2870 2888 "wordwrap-1.0.0" = {
@@ -2920,10 +2938,10 b' let'
2920 2938 src = ./..;
2921 2939 dependencies = [
2922 2940 sources."@types/clone-0.1.30"
2923 sources."@types/node-4.2.23"
2941 sources."@types/node-4.9.0"
2924 2942 (sources."@types/parse5-0.0.31" // {
2925 2943 dependencies = [
2926 sources."@types/node-6.0.114"
2944 sources."@types/node-6.0.118"
2927 2945 ];
2928 2946 })
2929 2947 sources."abbrev-1.1.1"
@@ -2944,12 +2962,12 b' let'
2944 2962 })
2945 2963 sources."array-back-1.0.4"
2946 2964 sources."asap-2.0.6"
2947 sources."asn1-0.2.3"
2965 sources."asn1-0.2.4"
2948 2966 sources."assert-plus-0.2.0"
2949 2967 sources."async-0.1.22"
2950 2968 sources."asynckit-0.4.0"
2951 2969 sources."aws-sign2-0.6.0"
2952 sources."aws4-1.7.0"
2970 sources."aws4-1.8.0"
2953 2971 sources."babel-polyfill-6.26.0"
2954 2972 (sources."babel-runtime-6.26.0" // {
2955 2973 dependencies = [
@@ -2969,7 +2987,7 b' let'
2969 2987 sources."chalk-1.1.3"
2970 2988 (sources."cli-1.0.1" // {
2971 2989 dependencies = [
2972 sources."glob-7.1.2"
2990 sources."glob-7.1.3"
2973 2991 sources."minimatch-3.0.4"
2974 2992 ];
2975 2993 })
@@ -2979,12 +2997,12 b' let'
2979 2997 sources."code-point-at-1.1.0"
2980 2998 sources."coffee-script-1.3.3"
2981 2999 sources."colors-0.6.2"
2982 sources."combined-stream-1.0.6"
3000 sources."combined-stream-1.0.7"
2983 3001 sources."command-line-args-3.0.5"
2984 3002 sources."command-line-usage-3.0.8"
2985 3003 sources."concat-map-0.0.1"
2986 3004 sources."concat-stream-1.6.2"
2987 sources."config-chain-1.1.11"
3005 sources."config-chain-1.1.12"
2988 3006 sources."console-browserify-1.1.0"
2989 3007 sources."console-control-strings-1.1.0"
2990 3008 sources."core-js-2.5.7"
@@ -3031,7 +3049,7 b' let'
3031 3049 })
3032 3050 (sources."espree-3.5.4" // {
3033 3051 dependencies = [
3034 sources."acorn-5.7.1"
3052 sources."acorn-5.7.3"
3035 3053 ];
3036 3054 })
3037 3055 sources."esprima-1.0.4"
@@ -3112,7 +3130,7 b' let'
3112 3130 (sources."grunt-contrib-less-1.4.1" // {
3113 3131 dependencies = [
3114 3132 sources."async-2.6.1"
3115 sources."lodash-4.17.10"
3133 sources."lodash-4.17.11"
3116 3134 ];
3117 3135 })
3118 3136 (sources."grunt-contrib-watch-0.6.1" // {
@@ -3179,7 +3197,7 b' let'
3179 3197 sources."jsbn-0.1.1"
3180 3198 (sources."jshint-2.9.6" // {
3181 3199 dependencies = [
3182 sources."lodash-4.17.10"
3200 sources."lodash-4.17.11"
3183 3201 sources."minimatch-3.0.4"
3184 3202 ];
3185 3203 })
@@ -3209,12 +3227,12 b' let'
3209 3227 sources."lodash-0.9.2"
3210 3228 sources."lru-cache-2.7.3"
3211 3229 sources."mime-1.6.0"
3212 sources."mime-db-1.35.0"
3213 sources."mime-types-2.1.19"
3230 sources."mime-db-1.36.0"
3231 sources."mime-types-2.1.20"
3214 3232 sources."minimatch-0.2.14"
3215 3233 sources."minimist-0.0.8"
3216 sources."minipass-2.3.3"
3217 sources."minizlib-1.1.0"
3234 sources."minipass-2.3.4"
3235 sources."minizlib-1.1.1"
3218 3236 sources."mkdirp-0.5.1"
3219 3237 sources."moment-2.22.2"
3220 3238 sources."mousetrap-1.6.2"
@@ -3260,7 +3278,7 b' let'
3260 3278 sources."phantom-4.0.12"
3261 3279 (sources."phantomjs-prebuilt-2.1.16" // {
3262 3280 dependencies = [
3263 sources."es6-promise-4.2.4"
3281 sources."es6-promise-4.2.5"
3264 3282 sources."fs-extra-1.0.0"
3265 3283 sources."graceful-fs-4.1.11"
3266 3284 sources."jsonfile-2.4.0"
@@ -3292,7 +3310,7 b' let'
3292 3310 sources."safe-buffer-5.1.2"
3293 3311 sources."safer-buffer-2.1.2"
3294 3312 sources."select-1.1.2"
3295 sources."semver-5.5.0"
3313 sources."semver-5.5.1"
3296 3314 sources."set-blocking-2.0.0"
3297 3315 sources."shelljs-0.3.0"
3298 3316 sources."sigmund-1.0.1"
@@ -3301,18 +3319,19 b' let'
3301 3319 sources."slide-1.1.6"
3302 3320 sources."sntp-1.0.9"
3303 3321 sources."source-map-0.3.0"
3304 sources."spdx-correct-3.0.0"
3305 sources."spdx-exceptions-2.1.0"
3322 sources."spdx-correct-3.0.2"
3323 sources."spdx-exceptions-2.2.0"
3306 3324 sources."spdx-expression-parse-3.0.0"
3307 sources."spdx-license-ids-3.0.0"
3325 sources."spdx-license-ids-3.0.1"
3308 3326 sources."split-1.0.1"
3309 (sources."sshpk-1.14.2" // {
3327 (sources."sshpk-1.15.1" // {
3310 3328 dependencies = [
3311 3329 sources."assert-plus-1.0.0"
3312 3330 ];
3313 3331 })
3314 3332 sources."ssri-5.3.0"
3315 3333 sources."stack-trace-0.0.10"
3334 sources."sticky-sidebar-3.3.1"
3316 3335 sources."string-width-1.0.2"
3317 3336 sources."string_decoder-1.1.1"
3318 3337 sources."stringstream-0.0.6"
@@ -3343,7 +3362,7 b' let'
3343 3362 sources."unicode-5.2.0-0.7.5"
3344 3363 sources."util-deprecate-1.0.2"
3345 3364 sources."uuid-3.3.2"
3346 sources."validate-npm-package-license-3.0.3"
3365 sources."validate-npm-package-license-3.0.4"
3347 3366 sources."validate-npm-package-name-3.0.0"
3348 3367 (sources."verror-1.10.0" // {
3349 3368 dependencies = [
@@ -3356,9 +3375,10 b' let'
3356 3375 ];
3357 3376 })
3358 3377 sources."walk-2.3.14"
3378 sources."waypoints-4.0.1"
3359 3379 sources."which-1.0.9"
3360 3380 sources."wide-align-1.1.3"
3361 (sources."winston-2.4.3" // {
3381 (sources."winston-2.4.4" // {
3362 3382 dependencies = [
3363 3383 sources."async-1.0.0"
3364 3384 sources."colors-1.0.3"
@@ -135,18 +135,18 b' class TestRepoCommitCommentsView(TestCon'
135 135 if backend.alias == 'svn':
136 136 response.mustcontain(
137 137 '''data-f-path="vcs/commands/summary.py" '''
138 '''id="a_c-300-ad05457a43f8"'''
138 '''data-anchor-id="c-300-ad05457a43f8"'''
139 139 )
140 140 if backend.alias == 'git':
141 141 response.mustcontain(
142 142 '''data-f-path="vcs/backends/hg.py" '''
143 '''id="a_c-883e775e89ea-9c390eb52cd6"'''
143 '''data-anchor-id="c-883e775e89ea-9c390eb52cd6"'''
144 144 )
145 145
146 146 if backend.alias == 'hg':
147 147 response.mustcontain(
148 148 '''data-f-path="vcs/backends/hg.py" '''
149 '''id="a_c-e58d85a3973b-9c390eb52cd6"'''
149 '''data-anchor-id="c-e58d85a3973b-9c390eb52cd6"'''
150 150 )
151 151
152 152 assert Notification.query().count() == 1
@@ -618,7 +618,7 b' class ComparePage(AssertResponse):'
618 618 for filename, file_id in files:
619 619 self.contains_one_anchor(file_id)
620 620 diffblock = doc.cssselect('[data-f-path="%s"]' % filename)
621 assert len(diffblock) == 1
621 assert len(diffblock) == 2
622 622 assert len(diffblock[0].cssselect('a[href="#%s"]' % file_id)) == 1
623 623
624 624 def contains_change_summary(self, files_changed, inserted, deleted):
@@ -1136,7 +1136,7 b' class DiffLimitExceeded(Exception):'
1136 1136
1137 1137 # NOTE(marcink): if diffs.mako change, probably this
1138 1138 # needs a bump to next version
1139 CURRENT_DIFF_VERSION = 'v2'
1139 CURRENT_DIFF_VERSION = 'v3'
1140 1140
1141 1141
1142 1142 def _cleanup_cache_file(cached_diff_file):
@@ -668,7 +668,7 b' input.filediff-collapse-state {'
668 668 .filediff-menu {
669 669 display: none;
670 670 }
671 margin: 10px 0 0 0;
671
672 672 }
673 673
674 674 &+ .filediff { /* file diff is expanded */
@@ -690,10 +690,59 b' input.filediff-collapse-state {'
690 690 }
691 691 }
692 692 }
693
694 .filediffs .anchor {
695 display: block;
696 height: 40px;
697 margin-top: -40px;
698 visibility: hidden;
699 }
700
701 .filediffs .anchor:nth-of-type(1) {
702 display: block;
703 height: 80px;
704 margin-top: -80px;
705 visibility: hidden;
706 }
707
693 708 .cs_files {
694 709 clear: both;
695 710 }
696 711
712 #diff-file-sticky{
713 will-change: min-height;
714 }
715
716 .sidebar__inner{
717 transform: translate(0, 0); /* For browsers don't support translate3d. */
718 transform: translate3d(0, 0, 0);
719 will-change: position, transform;
720 height: 60px;
721 }
722
723 .fpath-placeholder {
724 clear: both;
725 visibility: hidden
726 }
727
728 .is-affixed {
729 .sidebar_inner_shadow {
730 position: fixed;
731 top: 43px;
732 right: 0;
733 left: 0;
734 z-index: 28;
735 display: block;
736 height: 5px;
737 content: "";
738 background: linear-gradient(rgba(0, 0, 0, 0.075), rgba(0, 0, 0, 0.001)) repeat-x 0 0;
739 border-top: 1px solid rgba(0, 0, 0, 0.15);
740 }
741 .fpath-placeholder {
742 visibility: visible !important;
743 }
744 }
745
697 746 .diffset-menu {
698 747 margin-bottom: 20px;
699 748 }
@@ -774,6 +774,13 b' var CommentsController = function() {'
774 774 // re trigger the linkification of next/prev navigation
775 775 linkifyComments($('.inline-comment-injected'));
776 776 timeagoActivate();
777
778 if (window.Waypoint !== undefined) {
779 // potentially our comments change the active window size, so we
780 // notify waypint to re-paint
781 Waypoint.refreshAll()
782 }
783
777 784 commentForm.setActionButtonsDisabled(false);
778 785
779 786 };
1 NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff
@@ -145,6 +145,7 b' collapse_all = len(diffset.files) > coll'
145 145 %endif
146 146
147 147 <div class="filediffs">
148
148 149 ## initial value could be marked as False later on
149 150 <% over_lines_changed_limit = False %>
150 151 %for i, filediff in enumerate(diffset.files):
@@ -153,20 +154,22 b' collapse_all = len(diffset.files) > coll'
153 154 lines_changed = filediff.patch['stats']['added'] + filediff.patch['stats']['deleted']
154 155 over_lines_changed_limit = lines_changed > lines_changed_limit
155 156 %>
157 ## anchor with support of sticky header
158 <div class="anchor" id="a_${h.FID(filediff.raw_id, filediff.patch['filename'])}"></div>
156 159
157 <input ${(collapse_all and 'checked' or '')} class="filediff-collapse-state" id="filediff-collapse-${id(filediff)}" type="checkbox">
160 <input ${(collapse_all and 'checked' or '')} class="filediff-collapse-state" id="filediff-collapse-${id(filediff)}" type="checkbox" onchange="Waypoint.refreshAll();">
158 161 <div
159 162 class="filediff"
160 163 data-f-path="${filediff.patch['filename']}"
161 id="a_${h.FID(filediff.raw_id, filediff.patch['filename'])}"
164 data-anchor-id="${h.FID(filediff.raw_id, filediff.patch['filename'])}"
162 165 >
163
164 166 <label for="filediff-collapse-${id(filediff)}" class="filediff-heading">
165 167 <div class="filediff-collapse-indicator"></div>
166 168 ${diff_ops(filediff)}
167 169 </label>
170
168 171 ${diff_menu(filediff, use_comments=use_comments)}
169 <table class="cb cb-diff-${c.user_session_attrs["diffmode"]} code-highlight ${(over_lines_changed_limit and 'cb-collapsed' or '')}">
172 <table data-f-path="${filediff.patch['filename']}" data-anchor-id="${h.FID(filediff.raw_id, filediff.patch['filename'])}" class="code-visible-block cb cb-diff-${c.user_session_attrs["diffmode"]} code-highlight ${(over_lines_changed_limit and 'cb-collapsed' or '')}">
170 173
171 174 ## new/deleted/empty content case
172 175 % if not filediff.hunks:
@@ -289,7 +292,7 b' collapse_all = len(diffset.files) > coll'
289 292 display_state = ''
290 293 %>
291 294 <div class="filediffs filediff-outdated" style="${display_state}">
292 <input ${(collapse_all and 'checked' or '')} class="filediff-collapse-state" id="filediff-collapse-${id(filename)}" type="checkbox">
295 <input ${(collapse_all and 'checked' or '')} class="filediff-collapse-state" id="filediff-collapse-${id(filename)}" type="checkbox" onchange="Waypoint.refreshAll();">
293 296 <div class="filediff" data-f-path="${filename}" id="a_${h.FID(filediff.raw_id, filename)}">
294 297 <label for="filediff-collapse-${id(filename)}" class="filediff-heading">
295 298 <div class="filediff-collapse-indicator"></div>
@@ -732,8 +735,10 b' def get_comments_for(diff_type, comments'
732 735
733 736 <%def name="render_diffset_menu(diffset=None, range_diff_on=None)">
734 737
735 <div class="diffset-menu clearinner">
736 <div class="pull-right">
738 <div id="diff-file-sticky" class="diffset-menu clearinner">
739 ## auto adjustable
740 <div class="sidebar__inner" style="z-index: 30;background-color: #fff; padding: 5px 0px;">
741 <div class="pull-right">
737 742 <div class="btn-group">
738 743
739 744 <a
@@ -764,36 +769,47 b' def get_comments_for(diff_type, comments'
764 769 % endif
765 770 </div>
766 771 </div>
767
768 <div class="pull-left">
769 <div class="btn-group">
772 <div class="pull-left">
773 <div class="btn-group">
770 774 <div class="pull-left">
771 775 ${h.hidden('file_filter')}
772 776 </div>
773 777 <a
774 778 class="btn"
775 779 href="#"
776 onclick="$('input[class=filediff-collapse-state]').prop('checked', false); return false">${_('Expand All Files')}</a>
780 onclick="$('input[class=filediff-collapse-state]').prop('checked', false); Waypoint.refreshAll(); return false">${_('Expand All Files')}</a>
781 <a
782 class="btn"
783 href="#"
784 onclick="$('input[class=filediff-collapse-state]').prop('checked', true); Waypoint.refreshAll(); return false">${_('Collapse All Files')}</a>
777 785 <a
778 786 class="btn"
779 787 href="#"
780 onclick="$('input[class=filediff-collapse-state]').prop('checked', true); return false">${_('Collapse All Files')}</a>
781 <a
782 class="btn"
783 href="#"
784 onclick="return Rhodecode.comments.toggleWideMode(this)">${_('Wide Mode Diff')}</a>
788 onclick="updateSticky();return Rhodecode.comments.toggleWideMode(this)">${_('Wide Mode Diff')}</a>
785 789
786 790 </div>
787 791 </div>
792 <div class="fpath-placeholder">
793 <i class="icon-file-text"></i>
794 <strong class="fpath-placeholder-text">
795
796 </strong>
797 </div>
798 <div class="sidebar_inner_shadow"></div>
799 </div>
788 800 </div>
789 801
790 802 % if diffset:
791 803
792 804 %if diffset.limited_diff:
793 <% file_placeholder = _ungettext('%(num)s file changed', '%(num)s files changed', diffset.changed_files) % {'num': diffset.changed_files}%>
805 <% file_placeholder = _ungettext('%(num)s file changed', '%(num)s files changed', diffset.changed_files) % {'num': diffset.changed_files} %>
794 806 %else:
795 807 <% file_placeholder = _ungettext('%(num)s file changed: %(linesadd)s inserted, ''%(linesdel)s deleted', '%(num)s files changed: %(linesadd)s inserted, %(linesdel)s deleted', diffset.changed_files) % {'num': diffset.changed_files, 'linesadd': diffset.lines_added, 'linesdel': diffset.lines_deleted}%>
796 808 %endif
809 ## case on range-diff placeholder needs to be updated
810 % if range_diff_on is True:
811 <% file_placeholder = _('Disabled on range diff') %>
812 % endif
797 813
798 814 <script>
799 815
@@ -856,29 +872,96 b' def get_comments_for(diff_type, comments'
856 872 ]
857 873 };
858 874
859 $("#file_filter").select2({
860 'dropdownAutoWidth': true,
861 'width': 'auto',
862 'placeholder': "${file_placeholder}",
863 containerCssClass: "drop-menu",
864 dropdownCssClass: "drop-menu-dropdown",
865 data: preloadData,
866 query: function(query) {
867 feedFilesOptions(query, preloadData);
868 },
869 formatResult: formatFileResult
875 $(document).ready(function () {
876
877 var fileFilter = $("#file_filter").select2({
878 'dropdownAutoWidth': true,
879 'width': 'auto',
880 'placeholder': "${file_placeholder}",
881 containerCssClass: "drop-menu",
882 dropdownCssClass: "drop-menu-dropdown",
883 data: preloadData,
884 query: function(query) {
885 feedFilesOptions(query, preloadData);
886 },
887 formatResult: formatFileResult
888 });
889 % if range_diff_on is True:
890 fileFilter.select2("enable", false);
891
892 % endif
893
894 $("#file_filter").on('click', function (e) {
895 e.preventDefault();
896 var selected = $('#file_filter').select2('data');
897 var idSelector = "#"+selected.id;
898 window.location.hash = idSelector;
899 // expand the container if we quick-select the field
900 $(idSelector).next().prop('checked', false);
901 Waypoint.refreshAll()
902 });
903
904 var contextPrefix = _gettext('Context file: ');
905 ## sticky sidebar
906 var sidebarElement = document.getElementById('diff-file-sticky');
907 sidebar = new StickySidebar(sidebarElement, {
908 topSpacing: 0,
909 bottomSpacing: 0,
910 innerWrapperSelector: '.sidebar__inner'
911 });
912 sidebarElement.addEventListener('affixed.static.stickySidebar', function () {
913 // reset our file so it's not holding new value
914 $('.fpath-placeholder-text').html(contextPrefix)
915 });
916
917 updateSticky = function () {
918 sidebar.updateSticky()
919 };
920
921 var animateText = $.debounce(100, function(fPath, anchorId) {
922 // animate setting the text
923 var callback = function () {
924 $('.fpath-placeholder-text').animate({'opacity': 1.00}, 200)
925 $('.fpath-placeholder-text').html(contextPrefix + '<a href="#a_' + anchorId + '">' + fPath + '</a>')
926 };
927 $('.fpath-placeholder-text').animate({'opacity': 0.15}, 200, callback);
928 });
929
930 ## dynamic file waypoints
931 var setFPathInfo = function(fPath, anchorId){
932 animateText(fPath, anchorId)
933 };
934
935 var codeBlock = $('.filediff');
936 // forward waypoint
937 codeBlock.waypoint(
938 function(direction) {
939 if (direction === "down"){
940 setFPathInfo($(this.element).data('fPath'), $(this.element).data('anchorId'))
941 }
942 }, {
943 offset: 60,
944 context: '.fpath-placeholder'
945 }
946 );
947
948 // backward waypoint
949 codeBlock.waypoint(
950 function(direction) {
951 if (direction === "up"){
952 setFPathInfo($(this.element).data('fPath'), $(this.element).data('anchorId'))
953 }
954 }, {
955 offset: function () {
956 return -this.element.clientHeight + 80
957 },
958 context: '.fpath-placeholder'
959 }
960 );
961
870 962 });
871 963
872 $("#file_filter").on('click', function (e) {
873 e.preventDefault();
874 var selected = $('#file_filter').select2('data');
875 var idSelector = "#"+selected.id;
876 window.location.hash = idSelector;
877 // expand the container if we quick-select the field
878 $(idSelector).prev().prop('checked', false);
879 })
880
881 964 </script>
882 965 % endif
883 966
884 </%def>
967 </%def> No newline at end of file
General Comments 0
You need to be logged in to leave comments. Login now