From 95b47b4940d63e2b97747a79d47ee2fe5345173b Mon Sep 17 00:00:00 2001
From: Peter 'Pita' Martischka <petermartischka@googlemail.com>
Date: Thu, 30 Jun 2011 18:06:07 +0100
Subject: [PATCH] use a downloaded jQuery instead of using googles CDN, and
 fixed btw a bug that let pad.js fails randomly

---
 .gitignore             |  3 ++-
 bin/run.sh             | 15 +++++++++++++++
 node/minify.js         |  6 +++---
 static/pad.html        |  1 -
 static/timeslider.html |  2 +-
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index ea051b290..df6d75bec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 node_modules
-settings.json
\ No newline at end of file
+settings.json
+static/js/jquery.min.js
\ No newline at end of file
diff --git a/bin/run.sh b/bin/run.sh
index 3940e87c4..f1a1af995 100755
--- a/bin/run.sh
+++ b/bin/run.sh
@@ -37,6 +37,21 @@ fi
 echo "Ensure that all dependencies are up to date..."
 npm install
 
+echo "Ensure jQuery is downloaded and up to date..."
+DOWNLOAD_JQUERY="true"
+NEEDED_VERSION="1.6.1"
+if [ -f "static/js/jquery.min.js" ]; then
+  VERSION=$(cat static/js/jquery.min.js | head -n 2 | tail -n 1 | grep -o "v[0-9]*\.[0-9]*\.[0-9]*");
+  
+  if [[ ${VERSION:1} = $NEEDED_VERSION ]]; then
+    DOWNLOAD_JQUERY="false"
+  fi
+fi
+
+if [[ $DOWNLOAD_JQUERY = "true" ]]; then
+  wget -O static/js/jquery.min.js http://code.jquery.com/jquery-$NEEDED_VERSION.min.js
+fi
+
 #Remove all minified data to force node creating it new
 echo "Clear minfified cache..."
 rm var/minified* 2> /dev/null
diff --git a/node/minify.js b/node/minify.js
index 7245b214f..aee3d3c05 100644
--- a/node/minify.js
+++ b/node/minify.js
@@ -39,7 +39,7 @@ exports.padJS = function(req, res)
 {
   res.header("Content-Type","text/javascript");
 
-  var jsFiles = ["plugins.js", "undo-xpopup.js", "json2.js", "pad_utils.js", "pad_cookie.js", "pad_editor.js", "pad_editbar.js", "pad_docbar.js", "pad_modals.js", "ace.js", "collab_client.js", "pad_userlist.js", "pad_impexp.js", "pad_savedrevs.js", "pad_connectionstatus.js", "pad2.js"];
+  var jsFiles = ["jquery.min.js", "plugins.js", "undo-xpopup.js", "json2.js", "pad_utils.js", "pad_cookie.js", "pad_editor.js", "pad_editbar.js", "pad_docbar.js", "pad_modals.js", "ace.js", "collab_client.js", "pad_userlist.js", "pad_impexp.js", "pad_savedrevs.js", "pad_connectionstatus.js", "pad2.js"];
   
   //minifying is enabled
   if(settings.minify)
@@ -182,9 +182,9 @@ exports.padJS = function(req, res)
       {
         //put all javascript files in an array
         var values = [];
-        for(var i in fileValues)
+        for(var i in jsFiles)
         {
-          values.push(fileValues[i]);
+          values.push(fileValues[jsFiles[i]]);
         }
         
         //minify all javascript files to one
diff --git a/static/pad.html b/static/pad.html
index 1ce2a6f05..5b263648d 100644
--- a/static/pad.html
+++ b/static/pad.html
@@ -19,7 +19,6 @@
 var clientVars = {};  // ]]>
 </script>
 
-<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
 <script type="text/javascript" src="/socket.io/socket.io.js"></script>
 
 <!--<script type="text/javascript" src="/static/js/plugins.js"></script>
diff --git a/static/timeslider.html b/static/timeslider.html
index 996b01450..2a40e001d 100644
--- a/static/timeslider.html
+++ b/static/timeslider.html
@@ -11,7 +11,7 @@
   <link href="/static/css/pad_lite.css" rel="stylesheet" type="text/css" />
   <link href="/static/css/broadcast.css" rel="stylesheet" type="text/css" />
   <style type="text/css" title="dynamicsyntax"></style>
-  <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
+  <script type="text/javascript" src="/static/js/jquery.min.js"></script>
   <script type="text/javascript">
 // <![CDATA[
   var clientVars = {};