Merge pull request #51 from SOCR/performance-refactor

v0.3.0

Author: chartotu19

.gitignore

@@ -1,3 +1,6 @@
+.DS_Store
+build/
+dist/
 node_modules
 npm-debug.log
 test/npm-debug.log

.travis.yml

@@ -1,5 +1,4 @@
 language: node_js
 node_js:
-      -  4.0.0
+      -  7.1.0
 install: npm install
-before_script: ./node_modules/grunt-cli/bin/grunt build

Gruntfile.coffee

@@ -7,13 +7,15 @@ module.exports = (grunt) ->
     coffee:
       compile:
         files:
-          "js/appController.js": "js/appController.coffee"
-          "js/appModel.js": "js/appModel.coffee"
-          "js/appView.js": "js/appView.coffee"
-          "js/appData.js": "js/appData.coffee"
-
           "test/spec/modelSpec.js": "test/spec/modelSpec.coffee"
           "test/spec/dataSpec.js": "test/spec/dataSpec.coffee"
+      glob_to_multipe:
+        # options:
+          # sourceMap: true
+        expand: true
+        src: ['src/*.coffee']
+        dest: 'build/'
+        ext: '.js'
 
     concat:
       css:
@@ -35,27 +37,92 @@ module.exports = (grunt) ->
           "bower_components/please-wait/build/please-wait.css"
         ]
         dest:"dist/app.css"
-
+      js:
+        src:[
+          "src/init.js"
+          "src/lib/jquery.min.js"
+          "src/lib/async.js"
+          "src/bootstrap/bootstrap.min.js"
+          "src/exp/core.js"
+          "src/exp/binomialCoin.js"
+          "src/exp/ballAndUrn.js"
+          "src/exp/cardExp.js"
+          "src/exp/betaBinomial.js"
+          "src/input/inputtable.js"
+          "build/src/appModel.js"
+          "build/src/appView.js"
+          "build/src/appController.js"
+          "build/src/appData.js"
+          "src/lib/jquery-ui.min.js"
+          "src/vis/d3.v2.min.js"
+          "src/vis/vis.js"
+          "src/jquery.paginate.js"
+          "src/update.js"
+          "src/lib/jtweet/jquery.jtweetsanywhere-1.3.1.min.js"
+          "src/lib/jquery.transit.min.js"
+          "src/lib/jquery.easing.1.3.js"
+          "src/lib/jquery.pubsub.js"
+          "src/lib/jquery.handsontable.full.js"
+          "src/input/data.js"
+          "src/input/worldbank.js"
+          "src/vis/tooltip.js"
+          "src/tools/FCal.js"
+          "src/tools/ZCal.js"
+          "src/lib/mustache/mustache.js"
+          "src/lib/chardinjs/chardinjs.min.js"
+          "src/tutorial/tutorial.js"
+          "src/utils.js"          
+          "src/bootstrap/bootstrapSwitch.js"
+          "src/config.js"
+          "src/bootstrap/bootstrap.min.js"
+        ]
+        dest:"dist/bundle.js"
+    copy:
+      main:
+        files:[
+          { 
+            expand: true
+            cwd: 'src'
+            src: ['exp/*']
+            dest: 'dist/'
+            filter: 'isFile'
+          }
+          {
+            expand: true
+            cwd: 'src'
+            src:'tutorial/tutorial-data.json'
+            dest:'dist/'
+            filter: 'isFile'
+          }
+          {
+            expand: true
+            cwd: 'src'
+            src:'partials/**/*'
+            dest:'dist/'
+            filter: 'isFile'
+          }
+        ]
 
     jasmine:
       #ideally the src should concatenated files.
-      src: ["js/init.js","js/lib/jquery.min.js","js/utils.js","js/lib/jquery.pubsub.js","js/tools/Fcal.js","js/tools/Zcal.js","js/exp/core.js","js/appModel.js","js/appData.js"]
+      src: ["src/init.js","src/lib/jquery.min.js","src/utils.js","src/lib/jquery.pubsub.js","src/tools/Fcal.js","src/tools/Zcal.js","src/exp/core.js","dist/bundle.js"]
       options:
         specs: "test/spec/*Spec.js"
 
     jshint:
-      files:"js/appController.js"
+      files:"dist/bundle.js"
 
 
   # Load the plugin that provides the "uglify" task.
   grunt.loadNpmTasks "grunt-contrib-jasmine"
   grunt.loadNpmTasks "grunt-contrib-jshint"
   grunt.loadNpmTasks "grunt-contrib-coffee"
   grunt.loadNpmTasks "grunt-contrib-concat"
+  grunt.loadNpmTasks "grunt-contrib-copy"
 
   # Default task(s).
-  grunt.registerTask "build" , ["coffee","concat"]
+  grunt.registerTask "build", ["coffee","concat"]
   grunt.registerTask "compile", ["coffee"]
-  grunt.registerTask "test", ["coffee","jasmine"]
-  grunt.registerTask "default", ["coffee","concat"]
+  grunt.registerTask "test", ["coffee","concat","copy","jasmine"]
+  grunt.registerTask "default", ["coffee","concat","copy"]
 

index.html

@@ -9,8 +9,7 @@
     <meta name="author" content="selvam,ashwini,ivo">
     <meta http-equiv="X-UA-Compatible" content="IE=9; IE=8;" />
 
-    <!-- head.js ... its a javascript loader tool -->
-    <script src="js/lib/head.min.js"></script>
+    <script src="dist/bundle.js"></script>
     <script type="text/javascript" src="bower_components/please-wait/build/please-wait.min.js"></script>
 
     <!-- Le styles -->
@@ -77,7 +76,7 @@ <h2 class="font">Processing...</h2>
 			<div class="row-fluid">
 				<div class='span8'>
 					<div id='accordion'>
-						<h3><a href="#">Data Driven</a></h3>
+						<h3><a href="#">Input</a></h3>
 						<div>
 							<section id = "datadriven-splash">
 								<div class="page-header">
@@ -482,45 +481,7 @@ <h4>How to install my own experiment into SOCR webapp?</h4>
 		console.error = console.error || function(){};
 		console.info = console.info || function(){};
 
-    head.js("js/init.js",
-    		"js/lib/jquery.min.js",
-    		"js/lib/async.js",
-            "js/bootstrap/bootstrap.min.js",
-			{coreFunctions:"js/exp/core.js"},
-			{binomialCoin:"js/exp/binomialCoin.js"},
-			{ballAndUrn:"js/exp/ballAndUrn.js"},
-			{cardExp:"js/exp/cardExp.js"},
-			{betaBinomial:"js/exp/betaBinomial.js"},
-            {inputTile:"js/input/inputtable.js"},
-			{Model:"js/appModel.js"},
-			{View:"js/appView.js"},
-			{Controller:"js/appController.js"},
-			"js/lib/jquery-ui.min.js",
-			{D3:"js/vis/d3.v2.min.js"},
-			"js/vis/vis.js",
-			"js/jquery.paginate.js",
-			"js/update.js",
-			"js/lib/jtweet/jquery.jtweetsanywhere-1.3.1.min.js",
-			"js/lib/jquery.transit.min.js",
-			"js/lib/jquery.easing.1.3.js",
-            "js/lib/jquery.pubsub.js",
-            "js/lib/jquery.handsontable.full.js",
-			"js/input/data.js",
-			"js/input/worldbank.js",
-			"js/vis/tooltip.js",
-			"js/tools/FCal.js",
-			"js/tools/ZCal.js",
-            "js/lib/mustache/mustache.js",
-            "js/lib/chardinjs/chardinjs.min.js",
-            "js/tutorial/tutorial.js",
-            "js/utils.js",
-            "js/appData.js",
-            "js/bootstrap/bootstrapSwitch.js",
-            "js/config.js",
-            "js/bootstrap/bootstrap.min.js"
-	    	);
-    
-	head.ready(function () {
+	$(document).ready(function () {
 
 		var url = window.location.href;
 		var baseUrl = url.substring(0, url.indexOf('index.html'));