Merge pull request #229 from xdarklight/dont-include-filepickerio-js-…

…if-disabled Don't include the filepicker.io JS when using inhouse file upload
caelum · Feb 13, 2016 · e1a4063 · e1a4063
2 parents 69568c2 + 0bd69c9
commit e1a4063
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/main/webapp/WEB-INF/jsp/coda.jspf b/src/main/webapp/WEB-INF/jsp/coda.jspf
@@ -61,14 +61,19 @@
 	</c:when>
 </c:choose>
 
+<c:if test="${not env.supports('feature.inhouse.upload')}">
+	<!-- build:js /js/filepicker.js -->
+		<script src="/assets/js/deps/filepicker.js"></script>
+		<script src="/assets/js/deps/feather.js"></script>
+	<!-- endbuild -->
+</c:if>
+
 <!-- build:js /js/mamute.js -->
 	<script src="/assets/js/deps/prettify.js"></script>
 	<script src="/assets/js/deps/Markdown.Converter.js"></script>
 	<script src="/assets/js/deps/Markdown.Sanitizer.js"></script>
 	<script src="/assets/js/deps/Markdown.Editor.js"></script>
 	<script src="/assets/js/deps/marked.js"></script>
-	<script src="/assets/js/deps/filepicker.js"></script>
-	<script src="/assets/js/deps/feather.js"></script>
 	<script src="/assets/js/messages.js"></script>
 	<script src="/assets/js/tags-manager.js"></script>
 	<script src="/assets/js/form-validation.js"></script>