From: Jeff Godin <jgodin@tadl.org>
Date: Sat, 16 May 2015 17:19:12 +0000 (-0700)
Subject: LP#1312309: JSPAC remove javascript, combined.js, etc.
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=6004dac34f698b725131422538ada2ceaccc3e2b;p=evergreen%2Fmasslnc.git

LP#1312309: JSPAC remove javascript, combined.js, etc.

Signed-off-by: Jeff Godin <jgodin@tadl.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
---

diff --git a/Open-ILS/src/extras/autogen.sh b/Open-ILS/src/extras/autogen.sh
index acecbbaac7..37c9d90d93 100755
--- a/Open-ILS/src/extras/autogen.sh
+++ b/Open-ILS/src/extras/autogen.sh
@@ -109,55 +109,12 @@ perl -MOpenILS::Utils::Configure -e "print OpenILS::Utils::Configure::locale_htm
 echo " -> $OUTFILE"
 OUTFILES="$OUTFILES $OUTFILE"
 
-OUTFILE="$JSDIR/OrgLasso.js"
-echo "Updating Search Groups";
-perl -MOpenILS::Utils::Configure -e "print OpenILS::Utils::Configure::org_lasso();" > "$OUTFILE";
-cp "$OUTFILE" "$FMDOJODIR/"
-echo " -> $OUTFILE"
-OUTFILES="$OUTFILES $OUTFILE"
-
-OUTFILE="$JSDIR/*/FacetDefs.js"
-echo "Updating Facet Definitions";
-perl -MOpenILS::Utils::Configure -e "OpenILS::Utils::Configure::facet_types('$JSDIR', 'FacetDefs.js');"
-cp "$JSDIR/en-US/FacetDefs.js" "$FMDOJODIR/"
-echo " -> $OUTFILE"
-OUTFILES="$OUTFILES $OUTFILE"
-
 if [ ! -z "$PROXIMITY" ]
 then
 	echo "Refreshing proximity of org units";
 	perl -MOpenILS::Utils::Configure -e "OpenILS::Utils::Configure::org_tree_proximity();"
 fi
 
-echo "Creating combined JS..."
-cd $JSDIR;
-
-for skin in $(ls $SKINDIR); do
-
-    [ ! -f $SKINDIR/$skin/xml/common/js_common.xml ] && continue;
-
-    files=$(sed -n -e "/<\!--START COMPRESSION-->/,/<\!--END COMPRESSION-->/  s/.*\?\/\([^']*\.js\)'.*/\1/p" $SKINDIR/$skin/xml/common/js_common.xml);
-
-    if [ -n "$files" ]; then
-
-        # add the selected files to one combined file
-        COMPRESS_FILE="$SKINDIR/$skin/js/combined.js"
-        cat $files > $COMPRESS_FILE
-
-        # if a compressor is configured, compress and report the size savings
-        if [ -n "$COMPRESSOR" ]; then
-
-            echo -n "before: "; du -h $COMPRESS_FILE;
-
-            $COMPRESSOR $COMPRESS_FILE > $COMPRESS_FILE.t;
-            mv $COMPRESS_FILE.t $COMPRESS_FILE;
-
-            echo -n "after:  "; du -h $COMPRESS_FILE;
-            echo " -> $COMPRESS_FILE";
-        fi;
-    fi;
-done;
-
 # Generate a hash of the generated files
 (
 	date +%Y%m%d
diff --git a/Open-ILS/web/opac/skin/default/xml/common/js_common.xml b/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
deleted file mode 100644
index 4fc46053a2..0000000000
--- a/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<!--#if expr="$OILS_PAGE='myopac.xml'"-->
-<!-- my acccount uses a lot more classes -->
-<script language='javascript'  
-    src='/IDL2js?mvr,bre,aou,aout,pgt,lasso,cmf,cmc,cmsa,cam,cifm,clfm,citm,cblvl,ccs,accs,au,ahr,ahrn,acn,actscecm,cbreb,cbreb,cbrebi,acp,cust,ac,aua,mous,circ,mbts,mb,ausp,csp'
-    type='text/javascript'></script>
-<!--#else-->
-<script language='javascript'  
-    src='/IDL2js?mvr,bre,aou,aout,pgt,lasso,cmf,cmc,cmsa,cam,cifm,clfm,citm,cblvl,ccs,aba,acs,at,abaafm,acsaf,acsbf'
-    type='text/javascript'></script>
-<!--#endif-->
-
-<script language='javascript' type="text/javascript">
-    var locale = location.href.replace( /.+opac\/([^\/]+)\/skin.+/, '$1' );
-    if (!locale) locale = '<!--#echo var="locale"-->';
-     var djConfig = {
-         locale: locale.toLowerCase(),
-         parseOnLoad: true,
-         isDebug: false
-     }, lang, bidi;
-</script>
-
-<script language='javascript' src='/js/dojo/dojo/dojo.js?<!--#include virtual="/eg_cache_hash"-->'></script>
-<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/JSON_v1.js?<!--#include virtual="/eg_cache_hash"-->'></script>
-<script language='javascript' type="text/javascript" src='/js/dojo/opensrf/opensrf.js?<!--#include virtual="/eg_cache_hash"-->'></script>
-<script language='javascript' type="text/javascript" src='/js/dojo/dojo/openils_dojo.js?<!--#include virtual="/eg_cache_hash"-->'></script>
-<script language='javascript' type="text/javascript" src='/js/dojo/fieldmapper/AutoIDL.js?<!--#include virtual="/eg_cache_hash"-->'></script>
-
-<script language='javascript' type="text/javascript" src='<!--#echo var="OILS_JS_BASE"-->/<!--#echo var="locale"-->/OrgTree.js?<!--#include virtual="/eg_cache_hash"-->'></script>
-<script language='javascript' type="text/javascript" src='<!--#echo var="OILS_JS_BASE"-->/<!--#echo var="locale"-->/FacetDefs.js?<!--#include virtual="/eg_cache_hash"-->'></script>
-<script language='javascript' type="text/javascript" src='<!--#echo var="OILS_JS_BASE"-->/OrgLasso.js?<!--#include virtual="/eg_cache_hash"-->'></script>
-
-<!--#if expr="$OILS_OPAC_COMBINED_JS"-->
-<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/combined.js?<!--#include virtual="/eg_cache_hash"-->'></script>
-<!--#else --> 
-<!-- 
-    When combined JS is enabled in the Apache config, the block 
-    below defines which files are added to the final combined JS file. 
-    Currently, only files in $OPAC/common/js/ are eligible for automatic combination.
--->
-<!--START COMPRESSION-->
-<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/utils.js'></script>
-<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/config.js'></script>
-<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/CGI.js'></script>
-<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/md5.js'></script>
-<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/slimtree.js'></script>
-<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/opac_utils.js'></script>
-<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/org_utils.js'></script>
-<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/RemoteRequest.js'></script>
-<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/init.js'></script>
-<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/added_content.js'></script>
-<!--END COMPRESSION--> 
-<!--#endif -->
-
-<!-- Some global js -->
-<script language='javascript' type='text/javascript'>
-    config.css.color_1 = "color_1";
-    config.css.color_2 = "color_2";
-    config.css.color_3 = "color_3";
-    <!-- set up some global JS config variables, read from the Apache config -->
-    var OILS_OPAC_IMAGES_HOST = null;
-    <!--#if expr="$OILS_OPAC_IMAGES_HOST"-->
-        OILS_OPAC_IMAGES_HOST = '<!--#echo var="OILS_OPAC_IMAGES_HOST"-->extras/ac/jacket/';
-    <!--#endif -->
-    var OILS_OPAC_STATIC_PROTOCOL = null;
-    <!--#if expr="$OILS_OPAC_STATIC_PROTOCOL"-->
-        OILS_OPAC_STATIC_PROTOCOL = '<!--#echo var="OILS_OPAC_STATIC_PROTOCOL"-->';
-    <!--#endif -->
-    <!-- builds the "Now searching: <org_unit>" text on the home page -->
-    function home_init() {
-        getId("home_adv_search_link").setAttribute("href", buildOPACLink({page:ADVANCED})); 
-        getId("home_myopac_link").setAttribute("href", buildOPACLink({page:MYOPAC}, false, true));
-    }
-    <!--#if expr="$OILS_OPAC_FORCE_LOGIN_SSL"-->
-        forceLoginSSL = true;
-    <!--#endif -->
-</script>