Merge branch 'disable-js-validation'

kborchers · Apr 23, 2012 · 2201c62 · 2201c62
2 parents adef451 + 58ae92d
commit 2201c62
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1,120 deletions.
diff --git a/kitchensink-html5-mobile/.settings/.jsdtscope b/kitchensink-html5-mobile/.settings/.jsdtscope
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry excluding="js/libs/*" kind="src" path="src/main/webapp"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>
diff --git a/kitchensink-html5-mobile/src/main/webapp/index.html b/kitchensink-html5-mobile/src/main/webapp/index.html
@@ -33,10 +33,7 @@
     <!-- Set viewport scaling and zoom features -->
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <!-- Include the full development version of Modernizr. In production, you should use a -->
-    <!-- minimized custom build to reduce file size -->
-    <script type="text/javascript" src="js/libs/modernizr-2.0.6.js"></script>
-    <script type="text/javascript" src="js/libs/yepnope.1.0.2-min.js"></script>
+    <script type="text/javascript" src="js/libs/modernizr-2.5.3.min.js"></script>
     <script type="text/javascript" src="js/libs/underscore-min.js"></script>
 
     <!-- Minification - See Readme for details -->