Miguel Barão / perguntations

Download as
Browse Code »

Commit 152488815d23a3a5c49e9d094cad1b0c39819ec2

Authored by Miguel Barão
2 parents 36941fdb bb107b20
Exists in master and in 1 other branch dev

Merge branch 'master' into dev

Showing 5 changed files with 16 additions and 22 deletions   Show diff stats
package-lock.json
  Diff comments   View file @1524888
... ... @@ -13,16 +13,16 @@
13 13 "integrity": "sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA=="
14 14 },
15 15 "codemirror": {
16   - "version": "5.52.2",
17   - "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.52.2.tgz",
18   - "integrity": "sha512-WCGCixNUck2HGvY8/ZNI1jYfxPG5cRHv0VjmWuNzbtCLz8qYA5d+je4QhSSCtCaagyeOwMi/HmmPTjBgiTm2lQ=="
  16 + "version": "5.53.2",
  17 + "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.53.2.tgz",
  18 + "integrity": "sha512-wvSQKS4E+P8Fxn/AQ+tQtJnF1qH5UOlxtugFLpubEZ5jcdH2iXTVinb+Xc/4QjshuOxRm4fUsU2QPF1JJKiyXA=="
19 19 },
20 20 "datatables": {
21 21 "version": "1.10.18",
22 22 "resolved": "https://registry.npmjs.org/datatables/-/datatables-1.10.18.tgz",
23 23 "integrity": "sha512-ntatMgS9NN6UMpwbmO+QkYJuKlVeMA2Mi0Gu/QxyIh+dW7ZjLSDhPT2tWlzjpIWEkDYgieDzS9Nu7bdQCW0sbQ==",
24 24 "requires": {
25   - "jquery": "3.5.0"
  25 + "jquery": ">=1.7"
26 26 }
27 27 },
28 28 "jquery": {
... ... @@ -39,6 +39,11 @@
39 39 "version": "1.16.1",
40 40 "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
41 41 "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
  42 + },
  43 + "underscore": {
  44 + "version": "1.10.2",
  45 + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.10.2.tgz",
  46 + "integrity": "sha512-N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg=="
42 47 }
43 48 }
44 49 }
... ...
package.json
  Diff comments   View file @1524888
... ... @@ -4,10 +4,11 @@
4 4 "dependencies": {
5 5 "@fortawesome/fontawesome-free": "^5.13.0",
6 6 "bootstrap": "^4.4.1",
7   - "codemirror": "^5.52.2",
  7 + "codemirror": "^5.53.2",
8 8 "datatables": "^1.10",
9 9 "jquery": "^3.5.0",
10 10 "mathjax": "^3.0.5",
11   - "popper.js": "^1.16.1"
  11 + "popper.js": "^1.16.1",
  12 + "underscore": "^1.10"
12 13 }
13 14 }
... ...
perguntations/static/js/detect_unfocus.js
  Diff comments   View file @1524888
... ... @@ -31,24 +31,10 @@ $(document).ready(function() {
31 31 });
32 32 });
33 33  
34   - $(window).resize(function(){
  34 + $(window).resize(_.debounce(function(){
35 35 $.postJSON("/studentwebservice", {
36 36 "cmd": "size",
37 37 "value": JSON.stringify([screen.height, screen.width, $(window).height(), $(window).width()]),
38 38 });
39   -
40   -
41   - // // var n = $(window).scrollTop();
42   - // $.postJSON({"/studentwebservice", {
43   - // "cmd": "size",
44   - // "value": JSON.stringify([screen.height, screen.width, $(window).height(), $(window).width()]),
45   - // }});
46   - // // data: {
47   - // // "cmd": "resize",
48   - // // "name": $("#number").text(),
49   - // // "scroll": n
50   - // // }
51   - // // });
52   - });
53   -
  39 + }, 1000));
54 40 });
... ...
perguntations/static/underscore 0 → 120000
  Diff comments   View file @1524888
... ... @@ -0,0 +1 @@
  1 +../../node_modules/underscore
0 2 \ No newline at end of file
... ...
perguntations/templates/test.html
  Diff comments   View file @1524888
... ... @@ -24,6 +24,7 @@
24 24 <script defer src="/static/popper.js/popper.min.js"></script>
25 25 <script defer src="/static/fontawesome-free/js/all.min.js"></script>
26 26 <script defer src="/static/bootstrap/js/bootstrap.min.js"></script>
  27 + <script defer src="/static/underscore/underscore-min.js"></script>
27 28 <script src="/static/codemirror/lib/codemirror.js"></script>
28 29 <script src="/static/codemirror/addon/selection/active-line.js"></script>
29 30 <script src="/static/codemirror/addon/edit/matchbrackets.js"></script>
... ...