Fix inclusion of jQuery in release-mode. Tweak shippy

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1934 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Jeff Schiller 2011-01-18 19:04:34 +00:00
parent 717f596928
commit c6cd4c800a
2 changed files with 9 additions and 13 deletions

View File

@ -6,18 +6,17 @@
# Licensed under the Apache 2 License as is the rest of the project
# Copyright (c) 2011 Jeff Schiller
#
# This script has very little real-world application. It is only used in our pure-client web
# app served on GoogleCode so we can have one HTML file, run a build script and generate a 'release'
# version without having to maintain two separate HTML files.
# This script has very little real-world application. It is only used in our pure-client web app
# served on GoogleCode so we can have one HTML file, run a build script and generate a 'release'
# version without having to maintain two separate HTML files. It does this by evaluating
# 'processing comments' that are suspicously similar to IE conditional comments and then outputting
# a new HTML file after evaluating particular variables.
#
# This script takes the following inputs:
#
# * a HTML file (--i=in.html)
# * a series of flag names (--on=Foo --on=Bar)
#
# It parses, the HTML file, enables/disables sections of the markup based
# on if-else comments and flag values, then outputs a new HTML file.
#
# Example:
#
# in.html:
@ -125,12 +124,9 @@ def parseComment(line, line_num, enabled_flags):
def ship(inFileName, enabled_flags):
# read in HTML file
in_file = file(inFileName, 'r')
i = 0
lines = in_file.readlines()
lines = file(inFileName, 'r').readlines()
out_lines = []
i = 0
# loop for each line of markup
for line in lines:

View File

@ -11,9 +11,9 @@
<link rel="stylesheet" href="spinbtn/JQuerySpinBtn.css" type="text/css"/>
<!--{if jquery_release}>
<script type="text/javascript" src="jquery.js"></script>
<!{else}-->
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.js"></script>
<!{else}-->
<script type="text/javascript" src="jquery.js"></script>
<!--{endif}-->
<script type="text/javascript" src="js-hotkeys/jquery.hotkeys.min.js"></script>