Skip to content

Commit e13262e

Browse files
committed
Merge branch 'master' into origin/1.3.0
2 parents 3b4a1e1 + 3e1e522 commit e13262e

File tree

123 files changed

+23997
-5619
lines changed

Some content is hidden

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

123 files changed

+23997
-5619
lines changed

README

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

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[jQuery Tools](http://flowplayer.org/tools/) - The Missing UI library for the Web
2+
================================
3+
4+
jQuery Tools is a collection of the most important user-interface components for modern websites. Used by large sites all over the world.

build.properties

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

build.xml

Lines changed: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<project name="jQuery.Tools" default="min">
22

33
<taskdef resource="net/sf/antcontrib/antlib.xml"/>
4-
<property file="build.properties" prefix="v"/>
5-
<property name="build" value="build/${v.tools}"/>
4+
<property name="version" value="1.2.5"/>
5+
<property name="build" value="build/${version}"/>
6+
<property name="file" value="none"/>
67

78
<!-- replace @VERSION and @DATE tags -->
89
<target name="sources">
@@ -29,7 +30,7 @@
2930
<sequential>
3031

3132
<!-- version number -->
32-
<replaceregexp match="@VERSION" replace="${v.tools}" byline="true" file="@{file}" />
33+
<replaceregexp match="@VERSION" replace="${version}" byline="true" file="@{file}" />
3334

3435
<!-- last modified (via <git log> command) -->
3536
<propertyregex property="source" input="@{file}" override="yes" replace="\1"
@@ -72,22 +73,38 @@
7273

7374
</target>
7475

75-
<!-- lint (http://www.jslint.com/lint.html) -->
76-
<target name="lint">
77-
<for param="file">
78-
<path>
79-
<fileset dir="src" includes="**/*.js"/>
80-
</path>
81-
82-
<sequential>
76+
<!-- lint (http://www.jslint.com/lint.html) -->
77+
<target name="lint">
78+
<if>
79+
<equals arg1="${file}" arg2="none" />
80+
81+
<!-- loop trough all files -->
82+
<then>
83+
<for param="file">
84+
<path>
85+
<fileset dir="src" includes="**/*.js"/>
86+
</path>
87+
88+
<sequential>
89+
<java jar="lib/rhino.jar" fork="true">
90+
<arg value="lib/jslint.js" />
91+
<arg value="@{file}" />
92+
</java>
93+
</sequential>
94+
</for>
95+
</then>
96+
97+
<!-- ant lint -Dfile=validator/validator.js -->
98+
<else>
8399
<java jar="lib/rhino.jar" fork="true">
84100
<arg value="lib/jslint.js" />
85-
<arg value="@{file}" />
101+
<arg value="src/${file}" />
86102
</java>
87-
</sequential>
88-
</for>
89-
</target>
90-
103+
</else>
104+
105+
</if>
106+
107+
</target>
91108

92109
</project>
93110

doc/TODO

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

0 commit comments

Comments
 (0)