Skip to content

Commit ca3e6df

Browse files
author
Tero Piirainen
committed
learning git.
1 parent feb1e43 commit ca3e6df

File tree

16 files changed

+130
-947
lines changed

16 files changed

+130
-947
lines changed

‎README‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
2+
test

‎TODO‎

Lines changed: 35 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
GLOBAL
2+
* build.xml (closure compiler, tomcat copy)
3+
* new event model
4+
15
FORM
26
* validator
37
* stylable
@@ -6,35 +10,41 @@ FORM
610

711

812
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
13+
# drag
14+
# wheel
15+
# history
16+
* lazyload
17+
# flashembed
18+
# mask
19+
20+
TOOLS
21+
# overlay.gallery --> tabs + slideshow
22+
# scrollable.navigator: history: true
23+
# scrollable.mousewheel: mousewheel: true
24+
* couple of scrollable easings
25+
* overlay effect #2
26+
* tooltip effect
27+
28+
FIXES
29+
* overlay trigger position: calculate when fired (ie. from tooltip)
30+
* forum bugs
31+
32+
DEMOS & DOCUMENTATION
33+
* new event model
34+
* release notel
35+
--- this is a huge job ---
36+
37+
1538

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-
3039
**** 1.3 ****
3140

32-
- using.html --> Users Manual 2.0. "Developing web applications in modern world"
33-
- chaining talk
41+
Users Manual 2.0. "Developing web applications in modern world"
42+
- chain talk
3443
- lazy loading
44+
- single file vs. $.require / lab.js
3545
- more about events
3646

47+
Accordion (Dean Edwards)
48+
File upload
49+
3750

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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ overlay.apple = 1.2.0
1515

1616
scrollable = 1.2.0
1717
scrollable.autoscroll = 1.2.0
18-
scrollable.circular = 1.2.0
18+
scrollable.circular = 0.9.1
1919
scrollable.navigator = 1.2.0
2020

2121
tabs = 1.2.0

‎build.xml‎

Lines changed: 64 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,31 @@
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="version.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+
<!-- hardcoded -->
7+
<property name="www" value="/opt/flowplayer/webapp/tools-${v.tools}"/>
8+
<property name="js" value="/opt/flowplayer/webapp/js/tools/${v.tools}"/>
9+
10+
<!-- minify with Closure Compiler (default mode) -->
11+
<target name="min">
1312

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">
13+
<!-- create build directories -->
14+
<mkdir dir="build/${v.tools}/form"/>
15+
<mkdir dir="build/${v.tools}/toolbox"/>
16+
<mkdir dir="build/${v.tools}/overlay"/>
17+
<mkdir dir="build/${v.tools}/scrollable"/>
18+
<mkdir dir="build/${v.tools}/tabs"/>
19+
<mkdir dir="build/${v.tools}/tooltip"/>
20+
21+
<!-- do the hard work -->
22+
<apply
23+
executable="java"
24+
parallel="false"
25+
verbose="true"
26+
dest="src">
1927

20-
<fileset dir="src" includes="form/*.js"/>
28+
<fileset dir="src" includes="*/*.js"/>
2129
<arg line="-jar"/>
2230
<arg path="lib/compiler.jar"/>
2331
<arg line="--js"/>
@@ -29,107 +37,61 @@
2937

3038
</target>
3139

32-
<target name="loop">
33-
<for param="file">
40+
<!-- copy stuff under web folder -->
41+
<target name="www">
42+
<mkdir dir="${www}"/>
43+
<copy todir="${www}">
44+
<fileset dir="www"/>
45+
</copy>
46+
</target>
3447

48+
49+
<!-- deploy task -->
50+
<target name="deploy" depends="min">
51+
52+
<!-- loop trough files and update version number and last modified date -->
53+
<for param="file">
3554
<path>
36-
<fileset dir="${basedir}" includes="**/tools.*.js"/>
55+
<fileset dir="build/${v.tools}" includes="*/*.js"/>
3756
</path>
3857

3958
<sequential>
40-
<!-- source file -->
41-
<var name="sourceFile" value="@{file}"/>
42-
43-
<!-- tool name -->
59+
60+
<!-- version number -->
4461
<propertyregex input="@{file}" override="yes" property="tool" replace="\1"
45-
regexp=".*tools.(.*)\.js"/>
46-
47-
<!-- version number -->
62+
regexp=".+/(.*)\.min.js"/>
63+
4864
<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>
65+
66+
<replaceregexp match="@VERSION" replace="${version}" flags="g" byline="true"
67+
file="@{file}" />
6168

62-
</outofdate>
69+
70+
<!-- last modified (via <git log> command) -->
71+
<propertyregex input="@{file}" override="yes" property="source" replace="\1"
72+
regexp=".+/\d.\d.\d/(.*)\.min.js"/>
73+
74+
<exec executable="git" outputproperty="git.log" >
75+
<arg line="log src/${source}.js"/>
76+
</exec>
77+
78+
<propertyregex property="date" input="${git.log}" select="\1">
79+
<regexp pattern="Date:(.+)"/>
80+
</propertyregex>
81+
82+
<replaceregexp match="@DATE" replace="${date}" file="@{file}" />
6383

6484
</sequential>
6585
</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>
8186

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>
100-
101-
<!-- yuicompress: http://www.julienlecomte.net/blog/2007/09/16/ -->
102-
<target name="min.do" depends="source">
103-
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/>
112-
</apply>
87+
<mkdir dir="${js}"/>
11388

114-
<replaceregexp match="/\*!" replace="/\*\*" file="${base}.js" />
115-
<echo message="Minified: ${base}.min.js"/>
116-
117-
</target>
118-
119-
120-
<!-- lint -->
121-
<target name="lint">
122-
<property name="target" value="lint.do"/>
123-
<antcall target="loop"/>
89+
<copy todir="${js}">
90+
<fileset dir="build/${v.tools}"/>
91+
</copy>
92+
12493
</target>
125-
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>
132-
</target>
94+
13395

13496
</project>
13597

‎src/accordion/README‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)