diff --git a/.gitignore b/.gitignore index 50cd6e212..32f9ea7d7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ node_modules settings.json -static/js/jquery.min.js +static/js/jquery.js APIKEY.txt bin/abiword.exe bin/node.exe diff --git a/bin/installDeps.sh b/bin/installDeps.sh index 0533caf2d..a3f767a24 100755 --- a/bin/installDeps.sh +++ b/bin/installDeps.sh @@ -48,8 +48,8 @@ npm install || { echo "Ensure jQuery is downloaded and up to date..." DOWNLOAD_JQUERY="true" NEEDED_VERSION="1.7" -if [ -f "static/js/jquery.min.js" ]; then - VERSION=$(cat static/js/jquery.min.js | head -n 3 | grep -o "v[0-9].[0-9]"); +if [ -f "static/js/jquery.js" ]; then + VERSION=$(cat static/js/jquery.js | head -n 3 | grep -o "v[0-9].[0-9]"); if [ ${VERSION#v} = $NEEDED_VERSION ]; then DOWNLOAD_JQUERY="false" @@ -57,7 +57,7 @@ if [ -f "static/js/jquery.min.js" ]; then fi if [ $DOWNLOAD_JQUERY = "true" ]; then - curl -lo static/js/jquery.min.js http://code.jquery.com/jquery-$NEEDED_VERSION.min.js || exit 1 + curl -lo static/js/jquery.js http://code.jquery.com/jquery-$NEEDED_VERSION.js || exit 1 fi #Remove all minified data to force node creating it new diff --git a/node/utils/tar.json b/node/utils/tar.json index 7cb606943..3b1ba63ca 100644 --- a/node/utils/tar.json +++ b/node/utils/tar.json @@ -1,6 +1,6 @@ { "pad.js": [ - "jquery.min.js" + "jquery.js" , "pad_utils.js" , "plugins.js" , "undo-xpopup.js" @@ -23,7 +23,7 @@ , "farbtastic.js" ] , "timeslider.js": [ - "jquery.min.js" + "jquery.js" , "plugins.js" , "undo-xpopup.js" , "json2.js"