IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Only use .jshintignore for the ignore rules.

Browse Source
This commit is contained in:
Robin Ward
2014-04-01 12:28:17 -04:00
parent 512746b436
commit 36bb4c02b7
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.jshintignore
View File

@@ -8,3 +8,4 @@ lib/javascripts/moment_locale/
public/javascripts/ public/javascripts/
spec/phantom_js/smoke_test.js spec/phantom_js/smoke_test.js
vendor/ vendor/
test/javascripts/helpers/

23
test/javascripts/jshint_all.js.erb
View File

@@ -91,34 +91,27 @@ qHint.sendRequest = function (url, callback) {
}; };
<% <%
def jshint(dir, remove, to_ignore) TO_IGNORE = File.read("#{Rails.root}/.jshintignore").split("\n")
def jshint(dir, remove)
result = "" result = ""
Dir.glob(dir).each do |f| Dir.glob(dir).each do |f|
filename = f.sub("#{Rails.root}#{remove}", "") filename = f.sub("#{Rails.root}/#{remove}", "")
ok = true ok = true
to_ignore.each do |ig| TO_IGNORE.each do |ig|
ok = false if (filename =~ ig) ok = false unless (filename.index(ig.sub(remove, '')).nil?)
end end
depend_on filename depend_on filename
result << "qHint('#{filename}', '/assets/#{filename}', #{File.read(File.join(Rails.root, '.jshintrc'))});\n" if ok result << "qHint('#{filename}', '/assets/#{filename}', #{File.read(File.join(Rails.root, '.jshintrc'))});\n" if ok
end end
result result
end end
%> %>
<%= jshint("#{Rails.root}/test/**/*.js", <%= jshint("#{Rails.root}/test/**/*.js", "test/javascripts/") %>
"/test/javascripts/", <%= jshint("#{Rails.root}/app/assets/javascripts/**/*.js", "app/assets/javascripts/") %>
[/helpers\//]) %>
<%= jshint("#{Rails.root}/app/assets/javascripts/**/*.js",
"/app/assets/javascripts/",
[/external\//,
/defer\//,
/locales\//,
/Markdown\.Editor\.js/]) %>