Skip to content

Commit 672dd57

Browse files
tipiiraitipiirai
committed
Merge branch 'master' of git@github.com:tipiirai/jquerytools
Conflicts: README
2 parents 37cf07c + 93136a9 commit 672dd57

File tree

181 files changed

+1039
-1154
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

181 files changed

+1039
-1154
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
build

src/accordion/README renamed to 1.3.0/accordion/README

File renamed without changes.

src/accordion/accordion.html renamed to 1.3.0/accordion/accordion.html

File renamed without changes.

src/accordion/accordion.js renamed to 1.3.0/accordion/accordion.js

File renamed without changes.

src/form/form.upload.js renamed to 1.3.0/form/form.upload.js

File renamed without changes.

‎README‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,3 @@ Stefan Penner
2020
- localization
2121
- using custom validators
2222
- displaying all errors inside single DIV
23-

‎TODO‎

Lines changed: 39 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2+
GLOBAL
3+
# build.xml (closure compiler, tomcat copy)
4+
* new event model
5+
16
FORM
27
* validator
38
* stylable
@@ -6,35 +11,44 @@ FORM
611

712

813
TOOLBOX
9-
* tools.toolbox.drag
10-
* tools.toolbox.wheel
11-
* tools.toolbox.hash
12-
* tools.toolbox.lazyload
13-
support for tabs, scrollable, tooltip, overlay
14-
* tools.toolbox.flashembed
14+
# drag
15+
# wheel
16+
# history
17+
* lazyload
18+
# flashembed
19+
# mask
20+
21+
TOOLS
22+
# overlay.gallery --> tabs + slideshow
23+
# scrollable.navigator: history: true
24+
# scrollable.mousewheel: mousewheel: true
25+
* couple of scrollable easings
26+
* overlay effect #2
27+
* tooltip effect
28+
29+
FIXES
30+
* overlay trigger position: calculate when fired (ie. from tooltip)
31+
* forum bugs
32+
33+
WEBSITE
34+
* new download page
35+
36+
DEMOS & DOCUMENTATION
37+
* new event model
38+
* release notel
39+
--- this is a huge job ---
40+
41+
1542

16-
17-
# overlay.gallery --> tabs + slideshow
18-
# expose --> overlay.mask()
19-
# tabs.history: history: true
20-
# scrollable.navigator: history: true
21-
# scrollable.mousewheel: mousewheel: true
22-
23-
- couple of scrollable easings
24-
- overlay effect #2
25-
- tooltip effect
26-
27-
28-
DEMOS & DOCUMENTATION!!
29-
3043
**** 1.3 ****
3144

32-
- using.html --> Users Manual 2.0. "Developing web applications in modern world"
33-
- chaining talk
45+
Users Manual 2.0. "Developing web applications in modern world"
46+
- chain talk
3447
- lazy loading
48+
- single file vs. $.require / lab.js
3549
- more about events
3650

51+
Accordion (Dean Edwards)
52+
File upload
53+
3754

38-
- "Events" documentation to every tool (remove from configuration / JavaScript API)
39-
- horizontal accordion effect (kwicks / absolute positioning)
40-
- overlay trigger position: calculate when fired (ie. from tooltip)

‎build.properties‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
2+
# webapp root
3+
www = /opt/flowplayer/webapp/tools
4+
5+
jquery = 1.3.2
6+
sizzle = 0.9.3
7+
8+
# jQuery Tools version numbers
9+
10+
tools = 1.2.0
11+
12+
form.datepicker = 0.9.0
13+
form.slider = 0.9.0
14+
form.styleable = 0.9.0
15+
form.validator = 0.9.1
16+
17+
overlay = 1.2.0
18+
overlay.apple = 1.2.0
19+
20+
scrollable = 1.2.0
21+
scrollable.autoscroll = 1.2.0
22+
scrollable.circular = 0.9.1
23+
scrollable.navigator = 1.2.0
24+
25+
tabs = 1.2.0
26+
tabs.slideshow = 1.2.0
27+
28+
toolbox.drag = 1.0.0
29+
toolbox.flashembed = 1.2.0
30+
toolbox.history = 1.2.0
31+
toolbox.lazyload = 0.9.0
32+
toolbox.mask = 1.0.0
33+
toolbox.mousewheel = 1.0.0
34+
35+
tooltip = 1.2.0
36+
tooltip.dynamic = 1.2.0
37+
tooltip.slide = 1.2.0
38+

‎build.xml‎

Lines changed: 84 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -1,135 +1,111 @@
11
<project name="jQuery.Tools" default="min">
22

3-
<taskdef resource="net/sf/antcontrib/antlib.xml"/>
3+
<taskdef resource="net/sf/antcontrib/antlib.xml"/>
4+
<property file="build.properties" prefix="v"/>
45

5-
<property name="dir" value="/home/tipiirai/svn/flowplayer"/>
6-
<property file="${dir}/www/trunk/etc/version.properties" prefix="v"/>
7-
<property name="rhino" value="${dir}/builder/lib/rhino.jar"/>
8-
<property name="target.dir" value="/opt/flowplayer/webapp/js/tools"/>
9-
<property name="yui.path" value="/opt/yuicompressor-2.4.2/build/yuicompressor-2.4.2.jar"/>
10-
11-
12-
<target name="closure">
6+
<property name="www" value="${v.www}-${v.tools}"/>
7+
<property name="js" value="${www}/js"/>
8+
<property name="build" value="build/${v.tools}"/>
139

14-
<apply
15-
executable="/usr/lib/jvm/java-6-sun-1.6.0.10/bin/java"
16-
parallel="false"
17-
verbose="true"
18-
dest="src">
19-
20-
<fileset dir="src" includes="form/*.js"/>
21-
<arg line="-jar"/>
22-
<arg path="lib/compiler.jar"/>
23-
<arg line="--js"/>
24-
<srcfile/>
25-
<arg line="--js_output_file"/>
26-
<mapper type="glob" from="*.js" to="../build/*.min.js"/>
27-
<targetfile/>
28-
</apply>
10+
<!-- replace @VERSION and @DATE tags -->
11+
<target name="sources">
12+
13+
<!-- copy sources to build directory -->
14+
<mkdir dir="${build}"/>
15+
<copy todir="${build}">
16+
<fileset dir="src"/>
17+
</copy>
2918

30-
</target>
31-
32-
<target name="loop">
33-
<for param="file">
3419

20+
<!-- loop trough them -->
21+
<for param="file">
3522
<path>
36-
<fileset dir="${basedir}" includes="**/tools.*.js"/>
23+
<fileset dir="${build}" includes="*/*.js" excludes="*/*.min.js"/>
3724
</path>
3825

3926
<sequential>
40-
<!-- source file -->
41-
<var name="sourceFile" value="@{file}"/>
42-
43-
<!-- tool name -->
44-
<propertyregex input="@{file}" override="yes" property="tool" replace="\1"
45-
regexp=".*tools.(.*)\.js"/>
46-
47-
<!-- version number -->
27+
28+
<!-- version number -->
29+
<propertyregex property="tool" input="@{file}" override="yes" replace="\1"
30+
regexp=".+/(.*)\.js"/>
31+
4832
<propertycopy name="version" from="v.${tool}" override="yes"/>
49-
50-
<!-- base file name -->
51-
<var name="base" value="${target.dir}/tools.${tool}-${version}"/>
52-
53-
<!-- only process if the source file is modified -->
54-
<outofdate property="isModified">
55-
<sourcefiles path="@{file}"/>
56-
<targetfiles path="${base}.js"/>
57-
58-
<sequential>
59-
<antcall target="${target}"/>
60-
</sequential>
33+
34+
<replaceregexp match="@VERSION" replace="${version}" flags="g" byline="true"
35+
file="@{file}" />
6136

62-
</outofdate>
37+
38+
<!-- last modified (via <git log> command) -->
39+
<propertyregex property="source" input="@{file}" override="yes" replace="\1"
40+
regexp=".+/\d.\d.\d/(.*)\.js"/>
41+
42+
<exec executable="git" outputproperty="git.log" >
43+
<arg line="log src/${source}.js"/>
44+
</exec>
45+
46+
<propertyregex property="date" input="${git.log}" select="\1">
47+
<regexp pattern="Date:(.+)"/>
48+
</propertyregex>
49+
50+
<replaceregexp match="@DATE" replace="${date}" file="@{file}" />
6351

6452
</sequential>
6553
</for>
66-
67-
</target>
68-
69-
<!-- source code -->
70-
<target name="source">
71-
72-
<copy file="${sourceFile}" tofile="${base}.js"/>
73-
74-
<!-- <exec executable="svn" outputproperty="svnlog.out" >
75-
<arg line="info ${sourceFile}"/>
76-
</exec> -->
77-
78-
<propertyregex property="revision" input="${svnlog.out}" select="\1">
79-
<regexp pattern="Revision: ([0-9]*)"/>
80-
</propertyregex>
81-
82-
<propertyregex property="date" input="${svnlog.out}" select="\1">
83-
<regexp pattern="Date: (.+\))"/>
84-
</propertyregex>
85-
86-
<replaceregexp match="@VERSION" replace="${version}" flags="g" byline="true"
87-
file="${base}.js" />
88-
89-
<replaceregexp match="@DATE" replace="${date}" file="${base}.js" />
90-
<replaceregexp match="@REVISION" replace="${revision}" file="${base}.js" />
91-
<echo message="Source code: ${base}.js" />
92-
93-
</target>
94-
95-
<!-- minify -->
96-
<target name="min">
97-
<property name="target" value="min.do"/>
98-
<antcall target="loop"/>
99-
</target>
54+
</target>
10055

101-
<!-- yuicompress: http://www.julienlecomte.net/blog/2007/09/16/ -->
102-
<target name="min.do" depends="source">
10356

104-
<apply executable="java" parallel="false">
105-
<fileset file="${base}.js"/>
106-
<arg line="-jar"/>
107-
<arg path="${yui.path}"/>
108-
<srcfile/>
109-
<arg line="-o"/>
110-
<mapper type="glob" from="*.js" to="${target.dir}/*.min.js"/>
111-
<targetfile/>
57+
<!-- minify with Closure Compiler (default mode) -->
58+
<target name="min" depends="sources">
59+
60+
<!-- do the hard work -->
61+
<apply
62+
executable="java"
63+
parallel="false"
64+
verbose="true"
65+
dest="${build}">
66+
67+
<fileset dir="${build}" includes="*/*.js" excludes="*/*.min.js"/>
68+
<arg line="-jar"/>
69+
<arg path="lib/compiler.jar"/>
70+
<arg line="--js"/>
71+
<srcfile/>
72+
<arg line="--js_output_file"/>
73+
<mapper type="glob" from="*.js" to="*.min.js"/>
74+
<targetfile/>
11275
</apply>
11376

114-
<replaceregexp match="/\*!" replace="/\*\*" file="${base}.js" />
115-
<echo message="Minified: ${base}.min.js"/>
116-
11777
</target>
11878

79+
<!-- copy stuff under web folder -->
80+
<target name="www">
11981

120-
<!-- lint -->
121-
<target name="lint">
122-
<property name="target" value="lint.do"/>
123-
<antcall target="loop"/>
124-
</target>
82+
<!-- documentation -->
83+
<mkdir dir="${www}"/>
84+
<copy todir="${www}">
85+
<fileset dir="www"/>
86+
</copy>
87+
88+
</target>
12589

126-
<target name="lint.do">
127-
<echo message="Verifying ${tool}"/>
128-
<java jar="${rhino}" fork="true">
129-
<arg value="${dir}/builder/lib/jslint.js" />
130-
<arg value="${sourceFile}" />
131-
</java>
90+
<!-- deploy -->
91+
<target name="deploy" depends="www">
92+
93+
<!-- zip -->
94+
<zip destfile="${build}/tools-${v.tools}.zip"
95+
basedir="${build}"
96+
excludes="*.zip" />
97+
98+
<!-- javascript -->
99+
<mkdir dir="${js}"/>
100+
<copy todir="${js}">
101+
<fileset dir="${build}"/>
102+
</copy>
103+
104+
<!-- properties -->
105+
<copy file="build.properties" tofile="${www}/../WEB-INF/tools.properties"/>
106+
132107
</target>
108+
133109

134110
</project>
135111

0 commit comments

Comments
 (0)