kallithea Changeset - 12455b1a1a6f

Changeset - 12455b1a1a6f

Parent rev.

Child rev.

[Not reviewed]

default

6 7 0

Mads Kiilerich (mads) - 7 years ago 2018-12-11 01:22:56
mads@kiilerich.com

front-end: Use select2 from node_modules and stop bundling it

select2 3.5.4 was added in 304e83e9bcde ... but the latest npm release in the 3
series is 3.5.1, so we use that one instead. We should probably upgrade to the
4 series.

The select2 images were not in the location the generated css pointed - now we
copy them from node_modules to the right location, next to the generated css.

Note: this will drop 190cb30841de "branches: fix performance of branch
selectors with many branches - only show the first 200 results" ... but it
should no longer be relevant now when we use server side filtering.

15e507047bae introduced select2-bootstrap.css - it is not clear what version
was used, but we use the latest 1.4.6 which also is very old.

13 files changed with 27 insertions and 4563 deletions:

.hgignore

LICENSE.md

kallithea/bin/kallithea_cli_front_end.py

kallithea/front-end/package.json

kallithea/public/js/select2/select2-bootstrap.css

115

kallithea/public/js/select2/select2-spinner.gif

bin+del

kallithea/public/js/select2/select2.css

692

kallithea/public/js/select2/select2.js

3748

kallithea/public/js/select2/select2.png

bin+del

kallithea/public/js/select2/select2x2.png

bin+del

kallithea/public/less/main.less

kallithea/templates/base/root.html

scripts/whitespacecleanup.sh

0 comments (0 inline, 0 general)

.hgignore

➞

Show inline comments

@@ @@ -21,18 +21,23 @@ syntax: regexp @@
 ^\.project$
 ^\.pydevproject$
 ^\.coverage$
 ^kallithea/front-end/node_modules$
 ^kallithea/front-end/package-lock\.json$
 ^kallithea/front-end/tmp$
 ^kallithea/public/css/style\.css(\.map)?$
 ^kallithea/public/css/select2-spinner\.gif$
 ^kallithea/public/css/select2\.png$
 ^kallithea/public/css/select2x2\.png$
 ^kallithea/public/css/style\.css$
 ^kallithea/public/css/style\.css\.map$
 ^kallithea/public/js/bootstrap\.js$
 ^kallithea/public/js/jquery\.flot\.js$
 ^kallithea/public/js/jquery\.flot\.selection\.js$
 ^kallithea/public/js/jquery\.flot\.time\.js$
 ^kallithea/public/js/jquery\.min\.js$
 ^kallithea/public/js/select2\.js$
 ^theme\.less$
 ^kallithea\.db$
 ^test\.db$
 ^Kallithea\.egg-info$
 ^my\.ini$
 ^fabfile.py

LICENSE.md

➞

Show inline comments

@@ @@ -110,13 +110,13 @@ tri-license. @@
 Select2
 -------
-Kallithea incorporates parts of the Javascript system called
+Kallithea uses the Javascript system called
 [Select2](http://ivaynberg.github.io/select2/), which is:
 Copyright 2012 Igor Vaynberg (and probably others)
 and is licensed [under the following license](https://github.com/ivaynberg/select2/blob/master/LICENSE):
@@ @@ -129,26 +129,32 @@ and is licensed [under the following lic @@
 A [copy of the Apache License 2.0](Apache-License-2.0.txt) is also included
 in this distribution.
 Kallithea will take the Apache license fork of the dual license, since
 Kallithea is GPLv3'd.
 It is not distributed with Kallithea, but will be downloaded
 using the ''kallithea-cli front-end-build'' command.
 Select2-Bootstrap-CSS
 ---------------------
-Kallithea incorporates some CSS from a system called
+Kallithea uses some CSS from a system called
 [Select2-bootstrap-css](https://github.com/t0m/select2-bootstrap-css), which
 is:
 Copyright &copy; 2013 Tom Terrace (and likely others)
 and licensed under the MIT-permissive license, which is
 [included in this distribution](MIT-Permissive-License.txt).
 It is not distributed with Kallithea, but will be downloaded
 using the ''kallithea-cli front-end-build'' command.
 History.js
 ----------
 Kallithea incorporates some CSS from a system called History.js, which is

kallithea/bin/kallithea_cli_front_end.py

➞

Show inline comments

@@ @@ -69,12 +69,18 @@ def front_end_build(install_deps, genera @@
         click.echo("Preparing jQuery JS with Flot")
         shutil.copy(os.path.join(front_end_dir, 'node_modules', 'jquery', 'dist', 'jquery.min.js'), os.path.join(public_dir, 'js', 'jquery.min.js'))
         shutil.copy(os.path.join(front_end_dir, 'node_modules', 'jquery.flot', 'jquery.flot.js'), os.path.join(public_dir, 'js', 'jquery.flot.js'))
         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'))
         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'))
         click.echo("Preparing Select2 JS")
         shutil.copy(os.path.join(front_end_dir, 'node_modules', 'select2', 'select2.js'), os.path.join(public_dir, 'js', 'select2.js'))
         shutil.copy(os.path.join(front_end_dir, 'node_modules', 'select2', 'select2.png'), os.path.join(public_dir, 'css', 'select2.png'))
         shutil.copy(os.path.join(front_end_dir, 'node_modules', 'select2', 'select2x2.png'), os.path.join(public_dir, 'css', 'select2x2.png'))
         shutil.copy(os.path.join(front_end_dir, 'node_modules', 'select2', 'select2-spinner.gif'), os.path.join(public_dir, 'css', 'select2-spinner.gif'))
         click.echo("Generating LICENSES.txt")
         check_licensing_json_path = os.path.join(tmp_dir, 'licensing.json')
         licensing_txt_path = os.path.join(public_dir, 'LICENSES.txt')
         subprocess.check_call([
             os.path.join(front_end_dir, 'node_modules', '.bin', 'license-checker'),
             '--json',

kallithea/front-end/package.json

➞

Show inline comments

+{
   "name": "kallithea",
   "private": true,
   "dependencies": {
     "bootstrap": "3.3.7",
     "jquery": "1.12.3",
     "jquery.flot": "0.8.3"
     "jquery.flot": "0.8.3",
     "select2": "3.5.1",
     "select2-bootstrap-css": "1.2.4"
   },
   "devDependencies": {
     "less": "~2.7",
     "less-plugin-clean-css": "~1.5",
     "license-checker": "24.1.0"
+  }

kallithea/public/js/select2/select2-bootstrap.css

➞

Show inline comments

deleted file

kallithea/public/js/select2/select2-spinner.gif

➞

Show inline comments

		deleted file
		binary diff not shown

Show images

kallithea/public/js/select2/select2.css

➞

Show inline comments

deleted file

kallithea/public/js/select2/select2.js

➞

Show inline comments

deleted file

kallithea/public/js/select2/select2.png

➞

Show inline comments

		deleted file
		binary diff not shown

Show images

kallithea/public/js/select2/select2x2.png

➞

Show inline comments

		deleted file
		binary diff not shown

Show images

kallithea/public/less/main.less

➞

Show inline comments

@@ @@ -8,14 +8,14 @@ @@
+ *
  */
 /* 3rd party styles */
 @import "node_modules/bootstrap/less/bootstrap.less";
 @import (inline) "3rd-party/dataTables.bootstrap.css";
 @import (less) "../js/select2/select2.css";
 @import (less) "../js/select2/select2-bootstrap.css";
 @import (less) "node_modules/select2/select2.css";
 @import (less) "node_modules/select2-bootstrap-css/select2-bootstrap.css";
 @import (less) "tmp/pygments.css";
 @import (less) "../fontello/css/kallithea.css";
 /* kallithea styles */
 @import "kallithea-variables.less";
 @import "kallithea-labels.less";

kallithea/templates/base/root.html

➞

Show inline comments

@@ @@ -69,13 +69,13 @@ @@
         </script>
         <script type="text/javascript" src="${h.url('/js/yui.2.9.js', ver=c.kallithea_version)}"></script>
         <script type="text/javascript" src="${h.url('/js/jquery.min.js', ver=c.kallithea_version)}"></script>
         <script type="text/javascript" src="${h.url('/js/jquery.dataTables.min.js', ver=c.kallithea_version)}"></script>
         <script type="text/javascript" src="${h.url('/js/dataTables.bootstrap.js', ver=c.kallithea_version)}"></script>
         <script type="text/javascript" src="${h.url('/js/bootstrap.js', ver=c.kallithea_version)}"></script>
-        <script type="text/javascript" src="${h.url('/js/select2/select2.js', ver=c.kallithea_version)}"></script>
         <script type="text/javascript" src="${h.url('/js/select2.js', ver=c.kallithea_version)}"></script>
         <script type="text/javascript" src="${h.url('/js/native.history.js', ver=c.kallithea_version)}"></script>
         <script type="text/javascript" src="${h.url('/js/base.js', ver=c.kallithea_version)}"></script>
         ## EXTRA FOR JS
         <%block name="js_extra"/>
         <script type="text/javascript">
             (function(window,undefined){

scripts/whitespacecleanup.sh

➞

Show inline comments

 #!/bin/bash -x
 # Enforce some consistency in whitespace - just to avoid spurious whitespaces changes
-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)$'`
 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)$'`
 sed -i "s/`printf '\r'`//g" $files
 sed -i -e "s,`printf '\t'`,    ,g" $files
 sed -i -e "s,  *$,,g" $files
 sed -i -e 's,\([^ ]\)\\$,\1 \\,g' -e 's,\(["'"'"']["'"'"']["'"'"']\) \\$,\1\\,g' $files
 # ensure one trailing newline - remove empty last line and make last line include trailing newline:

0 comments (0 inline, 0 general)