summaryrefslogtreecommitdiff
path: root/git-instaweb.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-12-01 11:28:15 -0800
committerJunio C Hamano <gitster@pobox.com>2009-12-01 11:28:15 -0800
commit8678bc09e3a553fdacfbf7f8493e400c399f8e7b (patch)
tree91306cb18175d699dc7fd375609b7882df081704 /git-instaweb.sh
parent9eba92f684ad9fb1b2e9b99f3f406048fece266d (diff)
parent87e573f660dd0e871f3eb673d0b856488b6d8336 (diff)
downloadgit-8678bc09e3a553fdacfbf7f8493e400c399f8e7b.tar.gz
Merge branch 'jn/gitweb-blame'
* jn/gitweb-blame: gitweb: Add link to other blame implementation in blame views gitweb: Make linking to actions requiring JavaScript a feature gitweb.js: fix padLeftStr() and its usage gitweb.js: Harden setting blamed commit info in incremental blame gitweb.js: fix null object exception in initials calculation gitweb: Minify gitweb.js if JSMIN is defined gitweb: Create links leading to 'blame_incremental' using JavaScript gitweb: Colorize 'blame_incremental' view during processing gitweb: Incremental blame (using JavaScript) gitweb: Add optional "time to generate page" info in footer Conflicts: Makefile gitweb/gitweb.css
Diffstat (limited to 'git-instaweb.sh')
-rwxr-xr-xgit-instaweb.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/git-instaweb.sh b/git-instaweb.sh
index 341930ca9d..b8e6456208 100755
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -394,8 +394,15 @@ gitweb_css () {
EOFGITWEB
}
+gitweb_js () {
+ cat > "$1" <<\EOFGITWEB
+@@GITWEB_JS@@
+EOFGITWEB
+}
+
gitweb_cgi "$GIT_DIR/gitweb/gitweb.cgi"
gitweb_css "$GIT_DIR/gitweb/gitweb.css"
+gitweb_js "$GIT_DIR/gitweb/gitweb.js"
case "$httpd" in
*lighttpd*)