##// END OF EJS Templates
front-end: Use DataTables from node_modules and stop bundling it...
Mads Kiilerich -
r7385:cc2c473a default
parent child Browse files
Show More
@@ -30,6 +30,8 b' syntax: regexp'
30 ^kallithea/public/css/style\.css$
30 ^kallithea/public/css/style\.css$
31 ^kallithea/public/css/style\.css\.map$
31 ^kallithea/public/css/style\.css\.map$
32 ^kallithea/public/js/bootstrap\.js$
32 ^kallithea/public/js/bootstrap\.js$
33 ^kallithea/public/js/dataTables\.bootstrap\.js$
34 ^kallithea/public/js/jquery\.dataTables\.js$
33 ^kallithea/public/js/jquery\.flot\.js$
35 ^kallithea/public/js/jquery\.flot\.js$
34 ^kallithea/public/js/jquery\.flot\.selection\.js$
36 ^kallithea/public/js/jquery\.flot\.selection\.js$
35 ^kallithea/public/js/jquery\.flot\.time\.js$
37 ^kallithea/public/js/jquery\.flot\.time\.js$
@@ -87,15 +87,15 b" using the ''kallithea-cli front-end-buil"
87 DataTables
87 DataTables
88 ----------
88 ----------
89
89
90 Kallithea incorporates the Javascript system called
90 Kallithea uses the Javascript system called
91 [DataTables](http://www.datatables.net/)
91 [DataTables](http://www.datatables.net/).
92 which can be found together with their Corresponding Source in
93 https://github.com/DataTables/DataTables at tag 1.10.13 (mirrored at
94 https://kallithea-scm.org/repos/mirror/DataTables/files/1.10.13/ ).
95
92
96 It is Copyright 2008-2015 SpryMedia Ltd. and is under an
93 It is Copyright 2008-2015 SpryMedia Ltd. and is under an
97 [MIT-permissive license](MIT-Permissive-License.txt).
94 [MIT-permissive license](MIT-Permissive-License.txt).
98
95
96 It is not distributed with Kallithea, but will be downloaded
97 using the ''kallithea-cli front-end-build'' command.
98
99
99
100
100
101 Mergely
101 Mergely
@@ -72,6 +72,10 b' def front_end_build(install_deps, genera'
72 shutil.copy(os.path.join(front_end_dir, 'node_modules', 'jquery.flot', 'jquery.flot.selection.js'), os.path.join(public_dir, 'js', 'jquery.flot.selection.js'))
72 shutil.copy(os.path.join(front_end_dir, 'node_modules', 'jquery.flot', 'jquery.flot.selection.js'), os.path.join(public_dir, 'js', 'jquery.flot.selection.js'))
73 shutil.copy(os.path.join(front_end_dir, 'node_modules', 'jquery.flot', 'jquery.flot.time.js'), os.path.join(public_dir, 'js', 'jquery.flot.time.js'))
73 shutil.copy(os.path.join(front_end_dir, 'node_modules', 'jquery.flot', 'jquery.flot.time.js'), os.path.join(public_dir, 'js', 'jquery.flot.time.js'))
74
74
75 click.echo("Preparing DataTables JS")
76 shutil.copy(os.path.join(front_end_dir, 'node_modules', 'datatables.net', 'js', 'jquery.dataTables.js'), os.path.join(public_dir, 'js', 'jquery.dataTables.js'))
77 shutil.copy(os.path.join(front_end_dir, 'node_modules', 'datatables.net-bs', 'js', 'dataTables.bootstrap.js'), os.path.join(public_dir, 'js', 'dataTables.bootstrap.js'))
78
75 click.echo("Preparing Select2 JS")
79 click.echo("Preparing Select2 JS")
76 shutil.copy(os.path.join(front_end_dir, 'node_modules', 'select2', 'select2.js'), os.path.join(public_dir, 'js', 'select2.js'))
80 shutil.copy(os.path.join(front_end_dir, 'node_modules', 'select2', 'select2.js'), os.path.join(public_dir, 'js', 'select2.js'))
77 shutil.copy(os.path.join(front_end_dir, 'node_modules', 'select2', 'select2.png'), os.path.join(public_dir, 'css', 'select2.png'))
81 shutil.copy(os.path.join(front_end_dir, 'node_modules', 'select2', 'select2.png'), os.path.join(public_dir, 'css', 'select2.png'))
@@ -3,6 +3,8 b''
3 "private": true,
3 "private": true,
4 "dependencies": {
4 "dependencies": {
5 "bootstrap": "3.3.7",
5 "bootstrap": "3.3.7",
6 "datatables.net": "1.10.13",
7 "datatables.net-bs": "1.10.13",
6 "jquery": "1.12.3",
8 "jquery": "1.12.3",
7 "jquery.flot": "0.8.3",
9 "jquery.flot": "0.8.3",
8 "select2": "3.5.1",
10 "select2": "3.5.1",
@@ -10,7 +10,7 b''
10
10
11 /* 3rd party styles */
11 /* 3rd party styles */
12 @import "node_modules/bootstrap/less/bootstrap.less";
12 @import "node_modules/bootstrap/less/bootstrap.less";
13 @import (inline) "3rd-party/dataTables.bootstrap.css";
13 @import (inline) "node_modules/datatables.net-bs/css/dataTables.bootstrap.css";
14 @import (less) "node_modules/select2/select2.css";
14 @import (less) "node_modules/select2/select2.css";
15 @import (less) "node_modules/select2-bootstrap-css/select2-bootstrap.css";
15 @import (less) "node_modules/select2-bootstrap-css/select2-bootstrap.css";
16 @import (less) "tmp/pygments.css";
16 @import (less) "tmp/pygments.css";
@@ -69,7 +69,7 b''
69 </script>
69 </script>
70 <script type="text/javascript" src="${h.url('/js/yui.2.9.js', ver=c.kallithea_version)}"></script>
70 <script type="text/javascript" src="${h.url('/js/yui.2.9.js', ver=c.kallithea_version)}"></script>
71 <script type="text/javascript" src="${h.url('/js/jquery.min.js', ver=c.kallithea_version)}"></script>
71 <script type="text/javascript" src="${h.url('/js/jquery.min.js', ver=c.kallithea_version)}"></script>
72 <script type="text/javascript" src="${h.url('/js/jquery.dataTables.min.js', ver=c.kallithea_version)}"></script>
72 <script type="text/javascript" src="${h.url('/js/jquery.dataTables.js', ver=c.kallithea_version)}"></script>
73 <script type="text/javascript" src="${h.url('/js/dataTables.bootstrap.js', ver=c.kallithea_version)}"></script>
73 <script type="text/javascript" src="${h.url('/js/dataTables.bootstrap.js', ver=c.kallithea_version)}"></script>
74 <script type="text/javascript" src="${h.url('/js/bootstrap.js', ver=c.kallithea_version)}"></script>
74 <script type="text/javascript" src="${h.url('/js/bootstrap.js', ver=c.kallithea_version)}"></script>
75 <script type="text/javascript" src="${h.url('/js/select2.js', ver=c.kallithea_version)}"></script>
75 <script type="text/javascript" src="${h.url('/js/select2.js', ver=c.kallithea_version)}"></script>
@@ -2,7 +2,7 b''
2
2
3 # Enforce some consistency in whitespace - just to avoid spurious whitespaces changes
3 # Enforce some consistency in whitespace - just to avoid spurious whitespaces changes
4
4
5 files=`hg mani | egrep -v '/codemirror/|/fontello/|/email_templates/|(/lockfiles.py|^LICENSE-MERGELY.html|^docs/Makefile|^scripts/whitespacecleanup.sh|/(graph|mergely|native.history|yui.2.9|jquery.dataTables)\.js|/test_dump_html_mails.ref.html|\.png|\.gif|\.ico|\.pot|\.po|\.mo|\.tar\.gz|\.diff)$'`
5 files=`hg mani | egrep -v '/codemirror/|/fontello/|/email_templates/|(/lockfiles.py|^LICENSE-MERGELY.html|^docs/Makefile|^scripts/whitespacecleanup.sh|/(graph|mergely|native.history|yui.2.9)\.js|/test_dump_html_mails.ref.html|\.png|\.gif|\.ico|\.pot|\.po|\.mo|\.tar\.gz|\.diff)$'`
6
6
7 sed -i "s/`printf '\r'`//g" $files
7 sed -i "s/`printf '\r'`//g" $files
8 sed -i -e "s,`printf '\t'`, ,g" $files
8 sed -i -e "s,`printf '\t'`, ,g" $files
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now