From 7025cbe760f191e00c30c4847ae0e4dd467e1fc8 Mon Sep 17 00:00:00 2001 From: Paul Chaignon Date: Fri, 21 Aug 2015 12:12:52 +0200 Subject: [PATCH 1/6] Fix CodeMirror regex for vendored files --- lib/linguist/vendor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/linguist/vendor.yml b/lib/linguist/vendor.yml index ed89eda8..314fe956 100644 --- a/lib/linguist/vendor.yml +++ b/lib/linguist/vendor.yml @@ -122,7 +122,7 @@ - (^|/)Chart\.js$ # Codemirror -- (^|/)[Cc]ode[Mm]irror/(lib|mode|theme|addon|keymap|demo) +- (^|/)[Cc]ode[Mm]irror/(\d+\.\d+/)?(lib|mode|theme|addon|keymap|demo) # SyntaxHighlighter - http://alexgorbatchev.com/ - (^|/)shBrush([^.]*)\.js$ From 1d9faff4c60e33fbdd0de8907ad2758279b19dd8 Mon Sep 17 00:00:00 2001 From: Paul Chaignon Date: Fri, 21 Aug 2015 12:13:42 +0200 Subject: [PATCH 2/6] New JS vendored files --- lib/linguist/vendor.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/lib/linguist/vendor.yml b/lib/linguist/vendor.yml index 314fe956..73b1071e 100644 --- a/lib/linguist/vendor.yml +++ b/lib/linguist/vendor.yml @@ -78,6 +78,9 @@ # Haxelib projects often contain a neko bytecode file named run.n - run.n$ +# Bootstrap Datepicker +- bootstrap-datepicker/ + ## Commonly Bundled JavaScript frameworks ## # jQuery @@ -88,6 +91,30 @@ - (^|/)jquery\-ui(\-\d\.\d+(\.\d+)?)?(\.\w+)?\.(js|css)$ - (^|/)jquery\.(ui|effects)\.([^.]*)\.(js|css)$ +# jQuery Gantt +- jquery.fn.gantt.js + +# jQuery fancyBox +- jquery.fancybox.js + +# Fuel UX +- fuelux.js + +# jQuery File Upload +- (^|/)jquery\.fileupload(-\w+)?\.js$ + +# Slick +- (^|/)slick\.(core|dataview|editors|formatters|grid|groupitemmetadataprovider|remotemodel)\.js$ + +# Leaflet plugins +- (^|/)Leaflet\.Coordinates-\d+\.\d+\.\d+\.src\.js$ +- leaflet.draw-src.js +- leaflet.draw.css +- Control.FullScreen.css +- Control.FullScreen.js +- leaflet.spin.js +- wicket-leaflet.js + # Prototype - (^|/)prototype(.*)\.js$ - (^|/)effects\.js$ From 4e6e69833d9b9c46395dbaecde66de1fe5916f0e Mon Sep 17 00:00:00 2001 From: Paul Chaignon Date: Fri, 21 Aug 2015 12:15:17 +0200 Subject: [PATCH 3/6] Test for new CodeMirror regexp --- test/test_blob.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/test/test_blob.rb b/test/test_blob.rb index 0a1cefe9..46869987 100644 --- a/test/test_blob.rb +++ b/test/test_blob.rb @@ -301,6 +301,7 @@ class TestBlob < Minitest::Test # Codemirror deps assert sample_blob("codemirror/mode/blah.js").vendored? + assert sample_blob("codemirror/5.0/mode/blah.js").vendored? # Debian packaging assert sample_blob("debian/cron.d").vendored? From e6b4428614664c5d72d7b799eb73d885e39f3cbc Mon Sep 17 00:00:00 2001 From: Paul Chaignon Date: Fri, 21 Aug 2015 12:24:04 +0200 Subject: [PATCH 4/6] Tests for new vendored files --- test/test_blob.rb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/test/test_blob.rb b/test/test_blob.rb index 46869987..ca9640c4 100644 --- a/test/test_blob.rb +++ b/test/test_blob.rb @@ -362,6 +362,26 @@ class TestBlob < Minitest::Test assert sample_blob("ui/minified/jquery.effects.blind.min.js").vendored? assert sample_blob("ui/minified/jquery.ui.accordion.min.js").vendored? + # jQuery Gantt + assert sample_blob("web-app/jquery-gantt/js/jquery.fn.gantt.js").vendored? + + # jQuery fancyBox + assert sample_blob("web-app/fancybox/jquery.fancybox.js").vendored? + + # Fuel UX + assert sample_blob("web-app/fuelux/js/fuelux.js").vendored? + + # jQuery File Upload + assert sample_blob("fileupload-9.0.0/jquery.fileupload-process.js").vendored? + + # Slick + assert sample_blob("web-app/slickgrid/controls/slick.columnpicker.js").vendored? + + # Leaflet plugins + assert sample_blob("leaflet-plugins/Leaflet.Coordinates-0.5.0.src.js").vendored? + assert sample_blob("leaflet-plugins/leaflet.draw-src.js").vendored? + assert sample_blob("leaflet-plugins/leaflet.spin.js").vendored? + # MooTools assert sample_blob("public/javascripts/mootools-core-1.3.2-full-compat.js").vendored? assert sample_blob("public/javascripts/mootools-core-1.3.2-full-compat-yc.js").vendored? From c0fff6c8a8e560188004b801d8cfe60da49e89e7 Mon Sep 17 00:00:00 2001 From: Paul Chaignon Date: Fri, 21 Aug 2015 12:30:01 +0200 Subject: [PATCH 5/6] Make Slick regexp more general --- lib/linguist/vendor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/linguist/vendor.yml b/lib/linguist/vendor.yml index 73b1071e..cf312d89 100644 --- a/lib/linguist/vendor.yml +++ b/lib/linguist/vendor.yml @@ -104,7 +104,7 @@ - (^|/)jquery\.fileupload(-\w+)?\.js$ # Slick -- (^|/)slick\.(core|dataview|editors|formatters|grid|groupitemmetadataprovider|remotemodel)\.js$ +- (^|/)slick\.\w+.js$ # Leaflet plugins - (^|/)Leaflet\.Coordinates-\d+\.\d+\.\d+\.src\.js$ From 0d8e0a29702d94ae83f1e2003ca23bc8fc4468c0 Mon Sep 17 00:00:00 2001 From: Paul Chaignon Date: Mon, 24 Aug 2015 12:32:26 +0200 Subject: [PATCH 6/6] Sublime Text workspace files as vendored --- lib/linguist/vendor.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/linguist/vendor.yml b/lib/linguist/vendor.yml index cf312d89..d5965bb2 100644 --- a/lib/linguist/vendor.yml +++ b/lib/linguist/vendor.yml @@ -115,6 +115,10 @@ - leaflet.spin.js - wicket-leaflet.js +# Sublime Text workspace files +- .sublime-project +- .sublime-workspace + # Prototype - (^|/)prototype(.*)\.js$ - (^|/)effects\.js$