From 2bbf92d5f8c2955c5ae7abb5485a36ac207eecca Mon Sep 17 00:00:00 2001 From: Oxan van Leeuwen Date: Fri, 10 Aug 2012 01:04:29 +0200 Subject: [PATCH 1/2] Update vendor.yml to include jQuery UI --- lib/linguist/vendor.yml | 4 ++++ test/test_blob.rb | 17 +++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/lib/linguist/vendor.yml b/lib/linguist/vendor.yml index 5ab1bb67..01551061 100644 --- a/lib/linguist/vendor.yml +++ b/lib/linguist/vendor.yml @@ -30,6 +30,10 @@ - (^|/)jquery([^.]*)(\.min)?\.js$ - (^|/)jquery\-\d\.\d(\.\d)?(\.min)?\.js$ +# jQuery UI +- (^|/)jquery\-ui(\-\d\.\d+(\.\d+)?)?(\.\w+)?(\.min)?\.(js|css)$ +- (^|/)jquery\.(ui|effects)\.([^.]*)(\.min)?\.(js|css)$ + # Prototype - (^|/)prototype(.*)\.js$ - (^|/)effects\.js$ diff --git a/test/test_blob.rb b/test/test_blob.rb index c8f103ee..9825e9f9 100644 --- a/test/test_blob.rb +++ b/test/test_blob.rb @@ -207,6 +207,23 @@ class TestBlob < Test::Unit::TestCase assert blob("public/javascripts/jquery-1.6.1.js").vendored? assert blob("public/javascripts/jquery-1.6.1.min.js").vendored? assert !blob("public/javascripts/jquery.github.menu.js").vendored? + + # jQuery UI + assert blob("themes/ui-lightness/jquery-ui.css").vendored? + assert blob("themes/ui-lightness/jquery-ui-1.8.22.custom.css").vendored? + assert blob("themes/ui-lightness/jquery.ui.accordion.css").vendored? + assert blob("ui/i18n/jquery.ui.datepicker-ar.js").vendored? + assert blob("ui/i18n/jquery-ui-i18n.js").vendored? + assert blob("ui/jquery.effects.blind.js").vendored? + assert blob("ui/jquery-ui-1.8.22.custom.js").vendored? + assert blob("ui/jquery-ui-1.8.22.custom.min.js").vendored? + assert blob("ui/jquery-ui-1.8.22.js").vendored? + assert blob("ui/jquery-ui-1.8.js").vendored? + assert blob("ui/jquery-ui.min.js").vendored? + assert blob("ui/jquery.ui.accordion.js").vendored? + assert blob("ui/minified/jquery.effects.blind.min.js").vendored? + assert blob("ui/minified/jquery.ui.accordion.min.js").vendored? + # MooTools assert blob("public/javascripts/mootools-core-1.3.2-full-compat.js").vendored? From 0f006af5834c84757fe4b8183bca611cb0e66e78 Mon Sep 17 00:00:00 2001 From: Oxan van Leeuwen Date: Fri, 10 Aug 2012 01:09:54 +0200 Subject: [PATCH 2/2] Improve detection for ASP.NET validation jQuery plugins --- lib/linguist/vendor.yml | 3 ++- test/test_blob.rb | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/linguist/vendor.yml b/lib/linguist/vendor.yml index 01551061..aa5fb195 100644 --- a/lib/linguist/vendor.yml +++ b/lib/linguist/vendor.yml @@ -85,7 +85,8 @@ - -vsdoc\.js$ # jQuery validation plugin (MS bundles this with asp.net mvc) -- (^|/)jquery([^.]*)\.validate(\.min)?\.js$ +- (^|/)jquery([^.]*)\.validate(\.unobtrusive)?(\.min)?\.js$ +- (^|/)jquery([^.]*)\.unobtrusive\-ajax(\.min)?\.js$ # Microsoft Ajax - (^|/)[Mm]icrosoft([Mm]vc)?([Aa]jax|[Vv]alidation)(\.debug)?\.js$ diff --git a/test/test_blob.rb b/test/test_blob.rb index 9825e9f9..16f228c3 100644 --- a/test/test_blob.rb +++ b/test/test_blob.rb @@ -269,6 +269,11 @@ class TestBlob < Test::Unit::TestCase # jQuery validation plugin (MS bundles this with asp.net mvc) assert blob("Scripts/jquery.validate.js").vendored? + assert blob("Scripts/jquery.validate.min.js").vendored? + assert blob("Scripts/jquery.validate.unobtrusive.js").vendored? + assert blob("Scripts/jquery.validate.unobtrusive.min.js").vendored? + assert blob("Scripts/jquery.unobtrusive-ajax.js").vendored? + assert blob("Scripts/jquery.unobtrusive-ajax.min.js").vendored? # NuGet Packages assert blob("packages/Modernizr.2.0.6/Content/Scripts/modernizr-2.0.6-development-only.js").vendored?