##// END OF EJS Templates
front-end: Use jQuery and Flot from node_modules and stop bundling them...
Mads Kiilerich -
r7383:2b8f69cb default
parent child Browse files
Show More
@@ -26,6 +26,10 b' syntax: regexp'
26 ^kallithea/front-end/tmp$
26 ^kallithea/front-end/tmp$
27 ^kallithea/public/css/style\.css(\.map)?$
27 ^kallithea/public/css/style\.css(\.map)?$
28 ^kallithea/public/js/bootstrap\.js$
28 ^kallithea/public/js/bootstrap\.js$
29 ^kallithea/public/js/jquery\.flot\.js$
30 ^kallithea/public/js/jquery\.flot\.selection\.js$
31 ^kallithea/public/js/jquery\.flot\.time\.js$
32 ^kallithea/public/js/jquery\.min\.js$
29 ^theme\.less$
33 ^theme\.less$
30 ^kallithea\.db$
34 ^kallithea\.db$
31 ^test\.db$
35 ^test\.db$
@@ -73,15 +73,15 b' release.'
73 jQuery
73 jQuery
74 ------
74 ------
75
75
76 Kallithea incorporates the Javascript system called
76 Kallithea uses the Javascript system called
77 [jQuery](http://jquery.org/), [herein](kallithea/public/js/jquery.min.js),
77 [jQuery](http://jquery.org/).
78 which can be found together with its Corresponding Source in
79 https://github.com/jquery/jquery at tag 1.12.3 (mirrored at
80 https://kallithea-scm.org/repos/mirror/jquery/files/1.12.3/ ).
81
78
82 It is Copyright 2013 jQuery Foundation and other contributors http://jquery.com/ and is under an
79 It is Copyright 2013 jQuery Foundation and other contributors http://jquery.com/ and is under an
83 [MIT-permissive license](MIT-Permissive-License.txt).
80 [MIT-permissive license](MIT-Permissive-License.txt).
84
81
82 It is not distributed with Kallithea, but will be downloaded
83 using the ''kallithea-cli front-end-build'' command.
84
85
85
86
86
87 DataTables
87 DataTables
@@ -254,7 +254,7 b' in this distribution.'
254 Flot
254 Flot
255 ----
255 ----
256
256
257 Kallithea incorporates some parts of a Javascript system called
257 Kallithea uses some parts of a Javascript system called
258 [Flot](http://www.flotcharts.org/), which is:
258 [Flot](http://www.flotcharts.org/), which is:
259
259
260 Copyright (c) 2007-2014 IOLA and Ole Laursen
260 Copyright (c) 2007-2014 IOLA and Ole Laursen
@@ -280,6 +280,9 b' WHETHER IN AN ACTION OF CONTRACT, TORT O'
280 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
280 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
281 OTHER DEALINGS IN THE SOFTWARE.
281 OTHER DEALINGS IN THE SOFTWARE.
282
282
283 It is not distributed with Kallithea, but will be downloaded
284 using the ''kallithea-cli front-end-build'' command.
285
283
286
284
287
285 Icon fonts
288 Icon fonts
@@ -66,6 +66,12 b' def front_end_build(install_deps, genera'
66 click.echo("Preparing Bootstrap JS")
66 click.echo("Preparing Bootstrap JS")
67 shutil.copy(os.path.join(front_end_dir, 'node_modules', 'bootstrap', 'dist', 'js', 'bootstrap.js'), os.path.join(public_dir, 'js', 'bootstrap.js'))
67 shutil.copy(os.path.join(front_end_dir, 'node_modules', 'bootstrap', 'dist', 'js', 'bootstrap.js'), os.path.join(public_dir, 'js', 'bootstrap.js'))
68
68
69 click.echo("Preparing jQuery JS with Flot")
70 shutil.copy(os.path.join(front_end_dir, 'node_modules', 'jquery', 'dist', 'jquery.min.js'), os.path.join(public_dir, 'js', 'jquery.min.js'))
71 shutil.copy(os.path.join(front_end_dir, 'node_modules', 'jquery.flot', 'jquery.flot.js'), os.path.join(public_dir, 'js', 'jquery.flot.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'))
74
69 click.echo("Generating LICENSES.txt")
75 click.echo("Generating LICENSES.txt")
70 check_licensing_json_path = os.path.join(tmp_dir, 'licensing.json')
76 check_licensing_json_path = os.path.join(tmp_dir, 'licensing.json')
71 licensing_txt_path = os.path.join(public_dir, 'LICENSES.txt')
77 licensing_txt_path = os.path.join(public_dir, 'LICENSES.txt')
@@ -2,7 +2,9 b''
2 "name": "kallithea",
2 "name": "kallithea",
3 "private": true,
3 "private": true,
4 "dependencies": {
4 "dependencies": {
5 "bootstrap": "3.3.7"
5 "bootstrap": "3.3.7",
6 "jquery": "1.12.3",
7 "jquery.flot": "0.8.3"
6 },
8 },
7 "devDependencies": {
9 "devDependencies": {
8 "less": "~2.7",
10 "less": "~2.7",
@@ -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|select2/select2|yui.flot|jquery.flot.*|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|select2/select2|yui.2.9|jquery.dataTables)\.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
This diff has been collapsed as it changes many lines, (3168 lines changed) Show them Hide them
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
This diff has been collapsed as it changes many lines, (2483 lines changed) Show them Hide them
General Comments 0
You need to be logged in to leave comments. Login now