kallithea Changeset - 2b8f69cb7d8c

Changeset - 2b8f69cb7d8c

Parent rev.

Child rev.

[Not reviewed]

default

5 5 0

Mads Kiilerich (mads) - 7 years ago 2018-12-10 23:20:54
mads@kiilerich.com

front-end: Use jQuery and Flot from node_modules and stop bundling them

jquery.min.js 1.12.3 was introduced in 7a4dec17e837.

jquery.flot.js 0.8.3 was introduced in 322ce5147fe0.

8 files changed:

.hgignore

LICENSE.md

kallithea/bin/kallithea_cli_front_end.py

kallithea/front-end/package.json

kallithea/public/js/jquery.flot.js

3168

kallithea/public/js/jquery.flot.selection.js

360

kallithea/public/js/jquery.flot.time.js

432

kallithea/public/js/jquery.min.js

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)

.hgignore

➞

Show inline comments

@@ @@ -23,12 +23,16 @@ syntax: regexp @@
 ^\.coverage$
 ^kallithea/front-end/node_modules$
 ^kallithea/front-end/package-lock\.json$
 ^kallithea/front-end/tmp$
 ^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$
 ^theme\.less$
 ^kallithea\.db$
 ^test\.db$
 ^Kallithea\.egg-info$
 ^my\.ini$
 ^fabfile.py

LICENSE.md

➞

Show inline comments

@@ @@ -70,21 +70,21 @@ release. @@
 jQuery
 ------
 Kallithea incorporates the Javascript system called
 [jQuery](http://jquery.org/), [herein](kallithea/public/js/jquery.min.js),
 which can be found together with its Corresponding Source in
 https://github.com/jquery/jquery at tag 1.12.3 (mirrored at
 https://kallithea-scm.org/repos/mirror/jquery/files/1.12.3/ ).
 Kallithea uses the Javascript system called
 [jQuery](http://jquery.org/).
 It is Copyright 2013 jQuery Foundation and other contributors http://jquery.com/ and is under an
 [MIT-permissive license](MIT-Permissive-License.txt).
 It is not distributed with Kallithea, but will be downloaded
 using the ''kallithea-cli front-end-build'' command.
 DataTables
 ----------
 Kallithea incorporates the Javascript system called
@@ @@ -251,13 +251,13 @@ in this distribution. @@
 Flot
 ----
-Kallithea incorporates some parts of a Javascript system called
+Kallithea uses some parts of a Javascript system called
 [Flot](http://www.flotcharts.org/), which is:
 Copyright (c) 2007-2014 IOLA and Ole Laursen
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
@@ @@ -277,12 +277,15 @@ OF MERCHANTABILITY, FITNESS FOR A PARTIC @@
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 It is not distributed with Kallithea, but will be downloaded
 using the ''kallithea-cli front-end-build'' command.
 Icon fonts
 ----------
 Kallithea incorporates subsets of both

kallithea/bin/kallithea_cli_front_end.py

➞

Show inline comments

@@ @@ -63,12 +63,18 @@ def front_end_build(install_deps, genera @@
                 '--source-map-less-inline', lesspath, csspath],
                 cwd=front_end_dir)
         click.echo("Preparing Bootstrap JS")
         shutil.copy(os.path.join(front_end_dir, 'node_modules', 'bootstrap', 'dist', 'js', 'bootstrap.js'), os.path.join(public_dir, 'js', 'bootstrap.js'))
         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("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"
     "bootstrap": "3.3.7",
     "jquery": "1.12.3",
     "jquery.flot": "0.8.3"
   },
   "devDependencies": {
     "less": "~2.7",
     "less-plugin-clean-css": "~1.5",
     "license-checker": "24.1.0"
+  }

kallithea/public/js/jquery.flot.js

➞

Show inline comments

deleted file

kallithea/public/js/jquery.flot.selection.js

➞

Show inline comments

deleted file

kallithea/public/js/jquery.flot.time.js

➞

Show inline comments

deleted file

kallithea/public/js/jquery.min.js

➞

Show inline comments

deleted file

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)