IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-26 02:40:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix double include

Browse Source
This commit is contained in:
Sam 2013-04-16 18:43:07 +10:00
parent 1d4b69332c
commit 3bc4aefe87
2 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
.jshintrc
View File

@ -1 +1,48 @@
{"paths":["app/assets/javascripts/**/*.js","spec/javascripts/**/*.js","spec/phantom_js/**/*.js"],"exclude_paths":["app/assets/javascripts/external/*","app/assets/javascripts/external_production/*","app/assets/javascripts/external_development/*","app/assets/javascripts/defer/*","app/assets/javascripts/locales/i18n.js"],"adsafe":false,"bitwise":true,"newcap":true,"eqeqeq":true,"immed":false,"nomen":false,"onevar":false,"plusplus":false,"regexp":false,"safe":false,"strict":false,"undef":true,"white":false,"eqnull":false,"cap":false,"css":false,"debug":false,"es5":false,"evil":false,"forin":false,"fragment":false,"laxbreak":false,"true":false,"sub":false,"maxlen":200,"indent":2,"maxerr":50,"passfail":false,"predef":["Ember","jQuery","$","RSVP","Discourse","$LAB","Em","PreloadStore","Handlebars","I18n","bootbox"],"browser":true,"rhino":false,"windows":false,"widget":false,"devel":true,"loopfunc":true,"asi":true,"boss":true,"couch":true,"curly":false,"noarg":true,"node":false,"noempty":false,"nonew":true,"lastsemic":false,"newstat":false,"statinexp":false} {
"bitwise":true,
"newcap":true,
"eqeqeq":true,
"immed":false,
"nomen":false,
"onevar":false,
"plusplus":false,
"regexp":false,
"strict":false,
/*"undef":true,*/
"white":false,
"eqnull":false,
"debug":false,
"es5":false,
"evil":false,
"forin":false,
"laxbreak":false,
"sub":false,
"maxlen":200,
"indent":2,
"maxerr":50,
"passfail":false,
"predef":["Ember",
"jQuery",
"$",
"RSVP",
"Discourse",
"$LAB",
"Em",
"PreloadStore",
"Handlebars",
"I18n",
"bootbox"],
"browser":true,
"rhino":false,
"devel":true,
"loopfunc":true,
"asi":true,
"boss":true,
"couch":true,
"curly":false,
"noarg":true,
"node":false,
"noempty":false,
"nonew":true,
"lastsemic":false
}

1
app/views/common/_discourse_javascript.html.erb
View File

@ -17,7 +17,6 @@
<%# load the selected locale before any other scripts %> <%# load the selected locale before any other scripts %>
<%= javascript_include_tag "locales/#{I18n.locale}" %> <%= javascript_include_tag "locales/#{I18n.locale}" %>
<%= javascript_include_tag "application" %> <%= javascript_include_tag "application" %>
<%= javascript_include_tag "admin"%>
<%- if admin? %> <%- if admin? %>
<%= javascript_include_tag "admin"%> <%= javascript_include_tag "admin"%>
<%- end %> <%- end %>