Merge branch 'master' of git://github.com/gronke/dokuwiki into pull-request-158

* 'master' of git://github.com/gronke/dokuwiki:
  update.js applied
  update.sh must overwrite stylesheet
  jQuery update.sh
  jQuery latest

1 files changed, 6 insertions, 8 deletions

diff --git a/lib/scripts/jquery/update.sh b/lib/scripts/jquery/update.sh
index fde46f4d7..3bc2c761e 100755
--- a/lib/scripts/jquery/update.sh
+++ b/lib/scripts/jquery/update.sh
@@ -5,24 +5,22 @@
 # It also loads the 'smoothness' jQuery-UI theme and all referenced images.
 #
 # @author Andreas Gohr <andi@splitbrain.org>
+# @author Stefan Grönke <stefan@gronke.net>
 # @link   https://code.google.com/apis/libraries/devguide.html#jquery
-
+ 
 # load jQuery
 wget -nv https://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js      -O jquery.min.js
 wget -nv https://ajax.googleapis.com/ajax/libs/jquery/1/jquery.js          -O jquery.js
-
+ 
 # load jQuery-UI
 wget -nv https://ajax.googleapis.com/ajax/libs/jqueryui/1/jquery-ui.min.js -O jquery-ui.min.js
 wget -nv https://ajax.googleapis.com/ajax/libs/jqueryui/1/jquery-ui.js     -O jquery-ui.js
-
+ 
 # load the smoothness theme
 mkdir -p jquery-ui-theme/images
-wget -nv https://ajax.googleapis.com/ajax/libs/jqueryui/1/themes/smoothness/jquery-ui.css -O jquery-ui-theme/smoothness.css
+wget -nv -qO- https://ajax.googleapis.com/ajax/libs/jqueryui/1/themes/smoothness/jquery-ui.css | sed "s/font-family:[^;]*;//" > jquery-ui-theme/smoothness.css
 images=`gawk 'match($0, /url\((images\/[^\)]+)\)/, m) { print m[1] }' jquery-ui-theme/smoothness.css`
 for img in $images
 do
     wget -nv https://ajax.googleapis.com/ajax/libs/jqueryui/1/themes/smoothness/$img -O jquery-ui-theme/$img
-done
-
-# remove font family declarations from smoothness CSS
-sed -i "s/font-family:[^;]*; \?//" jquery-ui-theme/smoothness.css
+done
\ No newline at end of file