Skip to content

Commit

Permalink
Merge pull request #264 from nschonni/jshint-fail-build
Browse files Browse the repository at this point in the history
JSHint fail build
  • Loading branch information
Paul Jackson authored and Paul Jackson committed Aug 23, 2012
2 parents 00f661f + 815fb0f commit 5106f38
Show file tree
Hide file tree
Showing 17 changed files with 429 additions and 403 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
@@ -1,7 +1,7 @@
language: java

script:
- ant
before_script:
- ant test -Djshint.failbuild=true

after_script:
- ant test
script:
- ant
3 changes: 2 additions & 1 deletion build/build-tasks.properties
Expand Up @@ -16,4 +16,5 @@ jruby.jar=${lib.dir}/jruby.jar

#JSLint
jshint.jar=${lib.dir}/ant-jshint-0.3.1-deps.jar
jshint.globals.file=${tasks.basedir}/jshint.globals.properties
jshint.globals.file=${tasks.basedir}/jshint.globals.properties
jshint.failbuild=false
2 changes: 1 addition & 1 deletion build/build-tasks.xml
Expand Up @@ -91,7 +91,7 @@
</target>

<target name="-jshint">
<jshint dir="${src.dir}" fail="false" globalsFile="${jshint.globals.file}">
<jshint dir="${src.dir}" fail="${jshint.failbuild}" globalsFile="${jshint.globals.file}">
<report type="xml" destfile="${build.dir}/jshint.out.xml" />
<include name="**/*.js"/>
<exclude name="**/*.min.js"/>
Expand Down
28 changes: 14 additions & 14 deletions build/js/dependencies/equalheights-min.js
@@ -1,17 +1,17 @@
/*!--------------------------------------------------------------------
* JQuery Plugin: "EqualHeights"
* by: Scott Jehl, Todd Parker, Maggie Costello Wachs (http://www.filamentgroup.com)
*
* Copyright (c) 2008 Filament Group
* Licensed under GPL (http://www.opensource.org/licenses/gpl-license.php)
*
* Description: Compares the heights or widths of the top-level children of a provided element
and sets their min-height to the tallest height (or width to widest width). Sets in em units
by default if pxToEm() method is available.
* Dependencies: jQuery library, pxToEm method (article:
http://www.filamentgroup.com/lab/retaining_scalable_interfaces_with_pixel_to_em_conversion/)
* Usage Example: $(element).equalHeights();
Optional: to set min-height in px, pass a true argument: $(element).equalHeights(true);
* Version: 2.0, 08.01.2008
* JQuery Plugin: "EqualHeights"
* by: Scott Jehl, Todd Parker, Maggie Costello Wachs (http://www.filamentgroup.com)
*
* Copyright (c) 2008 Filament Group
* Licensed under GPL (http://www.opensource.org/licenses/gpl-license.php)
*
* Description: Compares the heights or widths of the top-level children of a provided element
and sets their min-height to the tallest height (or width to widest width). Sets in em units
by default if pxToEm() method is available.
* Dependencies: jQuery library, pxToEm method (article:
http://www.filamentgroup.com/lab/retaining_scalable_interfaces_with_pixel_to_em_conversion/)
* Usage Example: $(element).equalHeights();
Optional: to set min-height in px, pass a true argument: $(element).equalHeights(true);
* Version: 2.0, 08.01.2008
--------------------------------------------------------------------*/
(function(a){a.fn.equalHeights=function(b){a(this).each(function(){var c=0;a(this).children().each(function(){if(a(this).height()>c){c=a(this).height()}});if(!b&&typeof Number.prototype.pxToEm!=="undefined"){c=c.pxToEm()}if(a.browser.msie&&a.browser.version==="6.0"){a(this).children().css({height:c})}a(this).children().css({"min-height":c})});return this}}(jQuery));
28 changes: 14 additions & 14 deletions build/js/dependencies/json-min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

56 changes: 28 additions & 28 deletions build/js/dependencies/resize-min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/js/i18n/formvalid/methods_nl-min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 27 additions & 3 deletions src/js/build.xml
Expand Up @@ -145,12 +145,36 @@
<target name="test" depends="-jshint"/>

<target name="-jshint">
<jshint dir="${src.dir}" fail="false" globalsFile="${jshint.globals.file}" options="strict:false">
<jshint dir="${src.dir}" fail="${jshint.failbuild}" globalsFile="${jshint.globals.file}" options="strict:false">
<report type="xml" destfile="${build.dir}/jshint.out.xml" />
<include name="**/*.js"/>
<include name="dependencies/calendar.js"/>
<exclude name="**/*.min.js"/>
<exclude name="dependencies/**/*.js"/>
<exclude name="jquery.mobile/jquery.mobile.js"/>
<exclude name="polyfills/datalist.js"/>
<exclude name="polyfills/detailssummary.js"/>
<exclude name="polyfills/html5shiv.js"/>
<exclude name="polyfills/localstorage.js"/>
<exclude name="polyfills/slider.js"/>
<exclude name="workers/parser.table.js"/>
<exclude name="workers/webwidget.js"/>
<exclude name="dependencies/bookmark.js"/>
<exclude name="dependencies/browsertweaks.js"/>
<exclude name="dependencies/colorbox.js"/>
<exclude name="dependencies/easytabs.js"/>
<exclude name="dependencies/hashchange.js"/>
<exclude name="dependencies/hoverintent.js"/>
<exclude name="dependencies/json.js"/>
<exclude name="dependencies/matchMedia.js"/>
<exclude name="dependencies/metadata.js"/>
<exclude name="dependencies/outside.js"/>
<exclude name="dependencies/pie.js"/>
<exclude name="dependencies/prettify.js"/>
<exclude name="dependencies/prettify/**/*.js"/>
<exclude name="dependencies/raphael.js"/>
<exclude name="dependencies/resize.js"/>
<exclude name="dependencies/validate.js"/>
<exclude name="dependencies/validateAdditional.js"/>
<exclude name="dependencies/xregexp.js"/>
</jshint>
</target>
</project>
2 changes: 1 addition & 1 deletion src/js/dependencies/colorbox.js

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions src/js/dependencies/equalheights.js
@@ -1,18 +1,18 @@
/*--------------------------------------------------------------------
* JQuery Plugin: "EqualHeights"
* by: Scott Jehl, Todd Parker, Maggie Costello Wachs (http://www.filamentgroup.com)
*
* Copyright (c) 2008 Filament Group
* Licensed under GPL (http://www.opensource.org/licenses/gpl-license.php)
*
* Description: Compares the heights or widths of the top-level children of a provided element
and sets their min-height to the tallest height (or width to widest width). Sets in em units
by default if pxToEm() method is available.
* Dependencies: jQuery library, pxToEm method (article:
http://www.filamentgroup.com/lab/retaining_scalable_interfaces_with_pixel_to_em_conversion/)
* Usage Example: $(element).equalHeights();
Optional: to set min-height in px, pass a true argument: $(element).equalHeights(true);
* Version: 2.0, 08.01.2008
* JQuery Plugin: "EqualHeights"
* by: Scott Jehl, Todd Parker, Maggie Costello Wachs (http://www.filamentgroup.com)
*
* Copyright (c) 2008 Filament Group
* Licensed under GPL (http://www.opensource.org/licenses/gpl-license.php)
*
* Description: Compares the heights or widths of the top-level children of a provided element
and sets their min-height to the tallest height (or width to widest width). Sets in em units
by default if pxToEm() method is available.
* Dependencies: jQuery library, pxToEm method (article:
http://www.filamentgroup.com/lab/retaining_scalable_interfaces_with_pixel_to_em_conversion/)
* Usage Example: $(element).equalHeights();
Optional: to set min-height in px, pass a true argument: $(element).equalHeights(true);
* Version: 2.0, 08.01.2008
--------------------------------------------------------------------*/

(function ($) {
Expand All @@ -24,9 +24,9 @@
});
if (!px && typeof Number.prototype.pxToEm !== 'undefined') { currentTallest = currentTallest.pxToEm(); } //use ems unless px is specified
// for ie6, set height since min-height isn't supported
if ($.browser.msie && $.browser.version === '6.0') { $(this).children().css({'height': currentTallest}); }
$(this).children().css({'min-height': currentTallest});
if ($.browser.msie && $.browser.version === '6.0') { $(this).children().css({ 'height': currentTallest }); }
$(this).children().css({ 'min-height': currentTallest });
});
return this;
};
}(jQuery));
} (jQuery));

0 comments on commit 5106f38

Please sign in to comment.