Move to Require.js for async loading of JS. & Parse index.js into sma…

…ller chuncks (js/src) that use gulp, gulp-concat & gulp-uglify to merge back into one in the js/dist folder
Dunky13 · Jul 9, 2016 · eab588a · eab588a
1 parent 19821da
commit eab588a
Show file tree

Hide file tree

Showing 20 changed files with 1,080 additions and 3,306 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,41 @@
+
+# Created by https://www.gitignore.io/api/node
+
+### Node ###
+# Logs
+logs
+*.log
+npm-debug.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules
+jspm_packages
+
+# Optional npm cache directory
+.npm
+
+# Optional REPL history
+.node_repl_history
diff --git a/gulpfile.js b/gulpfile.js
@@ -0,0 +1,10 @@
+var gulp = require('gulp');
+var concat = require('gulp-concat');
+var uglify = require('gulp-uglify');  
+
+gulp.task('scripts', function() {
+	return gulp.src(['./js/src/preload.js', './js/src/jchar.js', './js/src/jblock.js', './js/src/q.js', './js/src/jall.js', './js/src/gapi.js', './js/src/index.js'])
+		.pipe(concat('index.js'))
+		.pipe(uglify())
+		.pipe(gulp.dest('./js/dist/'));
+});
diff --git a/index.html b/index.html
@@ -58,6 +58,8 @@
 
 		<link rel="preload" href="css/index.min.css" as="style" onload="this.rel='stylesheet'">
 		<noscript><link rel="stylesheet" href="css/index.min.css"></noscript>
+
+		<script data-main="js/main" src="js/require.js" async></script>
 	</head>
 	<body>
 		<div class="g-signin2" data-onsuccess="onSignIn" id="GoogleSignInButton"></div>
@@ -159,12 +161,12 @@ <h2 class="text-center title-text">Hiragana & Katakana</h2>
 		</div>
 
 		<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-		<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js" async></script>
+<!--		<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>//-->
 		<!-- Include all compiled plugins (below), or include individual files as needed -->
-		<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous" async ></script>
-		<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/msgpack-lite/0.1.20/msgpack.min.js" async defer></script>
-		<script src="https://apis.google.com/js/client:platform.js" async defer></script>
-		<script src="js/index.min.js" async></script>
+<!--		<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous" async ></script>//-->
+<!--		<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/msgpack-lite/0.1.20/msgpack.min.js" async defer></script>//-->
+<!--		<script src="https://apis.google.com/js/client:platform.js" async defer></script>//-->
+<!--		<script src="js/index.min.js" async></script>//-->
 		<script>
 			(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
 				(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),

diff --git a/js/.index.js.swp b/js/.index.js.swp