summaryrefslogtreecommitdiffstats
path: root/public/js
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2015-08-28 14:24:05 +0800
committerUnknwon <u@gogs.io>2015-08-28 14:24:05 +0800
commita7686e8749f46b13c62c67c7b4fc5dbc0c5a42c3 (patch)
tree150b15f67361e43a3870dc267bdbf69ef126790d /public/js
parentff35a37769cbf60cd1522eb05411adbf965c9950 (diff)
downloadgitea-a7686e8749f46b13c62c67c7b4fc5dbc0c5a42c3.tar.gz
gitea-a7686e8749f46b13c62c67c7b4fc5dbc0c5a42c3.zip
#1203 bundle jquery with gogs
Diffstat (limited to 'public/js')
-rw-r--r--public/js/gogs.js4
-rw-r--r--public/js/libs/dropzone-4.0.1.js (renamed from public/js/libs/dropzone.js)0
-rw-r--r--public/js/libs/highlight-8.7.pack.js (renamed from public/js/libs/highlight.pack.js)0
-rw-r--r--public/js/libs/jquery.datetimepicker-2.4.5.js (renamed from public/js/libs/jquery.datetimepicker.js)0
-rw-r--r--public/js/libs/jquery.minicolors-2.1.12.min.js (renamed from public/js/libs/jquery.minicolors.min.js)0
-rwxr-xr-xpublic/js/semantic-2.0.8.min.js (renamed from public/js/semantic.min.js)2
6 files changed, 4 insertions, 2 deletions
diff --git a/public/js/gogs.js b/public/js/gogs.js
index 72fc48f6a0..34bd840606 100644
--- a/public/js/gogs.js
+++ b/public/js/gogs.js
@@ -409,7 +409,9 @@ $(document).ready(function () {
});
// Highlight JS
- hljs.initHighlightingOnLoad();
+ if (typeof hljs != 'undefined') {
+ hljs.initHighlightingOnLoad();
+ }
// Dropzone
if ($('#dropzone').length > 0) {
diff --git a/public/js/libs/dropzone.js b/public/js/libs/dropzone-4.0.1.js
index babbdd450e..babbdd450e 100644
--- a/public/js/libs/dropzone.js
+++ b/public/js/libs/dropzone-4.0.1.js
diff --git a/public/js/libs/highlight.pack.js b/public/js/libs/highlight-8.7.pack.js
index 0cb072e47b..0cb072e47b 100644
--- a/public/js/libs/highlight.pack.js
+++ b/public/js/libs/highlight-8.7.pack.js
diff --git a/public/js/libs/jquery.datetimepicker.js b/public/js/libs/jquery.datetimepicker-2.4.5.js
index 9c00413c2d..9c00413c2d 100644
--- a/public/js/libs/jquery.datetimepicker.js
+++ b/public/js/libs/jquery.datetimepicker-2.4.5.js
diff --git a/public/js/libs/jquery.minicolors.min.js b/public/js/libs/jquery.minicolors-2.1.12.min.js
index 12480abb06..12480abb06 100644
--- a/public/js/libs/jquery.minicolors.min.js
+++ b/public/js/libs/jquery.minicolors-2.1.12.min.js
diff --git a/public/js/semantic.min.js b/public/js/semantic-2.0.8.min.js
index 8b3ee09253..59940be950 100755
--- a/public/js/semantic.min.js
+++ b/public/js/semantic-2.0.8.min.js
@@ -1,5 +1,5 @@
/*
- * # Semantic UI - 2.0.7
+ * # Semantic UI - 2.0.8
* https://github.com/Semantic-Org/Semantic-UI
* http://www.semantic-ui.com/
*