Permalink
Browse files

cleaning up

  • Loading branch information...
1 parent 1070369 commit a72702f3db76fc8187d5f2995a439d324644c78d davetayls committed Mar 8, 2013
Showing with 29 additions and 41 deletions.
  1. +7 −4 .gitignore
  2. +6 −3 root/.jshintrc
  3. +11 −25 root/gruntfile.js
  4. +0 −1 root/package.json
  5. +5 −5 root/partials/scriptrefs.html
  6. +0 −1 root/ui/scripts/config.js
  7. +0 −1 root/ui/scripts/main.js
  8. +0 −1 root/ui/scripts/ui.js
View
@@ -14,7 +14,10 @@ results
node_modules
npm-debug.log
-tasks/init/generic/root/ui/lib/jquery.js
-tasks/init/generic/root/ui/lib/matchMedia/matchMedia.addListener.js
-tasks/init/generic/root/ui/lib/matchMedia/matchMedia.js
-tasks/init/generic/root/ui/lib/require.js
+root/ui/lib/jquery.js
+root/ui/lib/matchMedia/matchMedia.addListener.js
+root/ui/lib/matchMedia/matchMedia.js
+root/ui/lib/require.js
+root/ui/dist
+root/ui/dev
+
View
@@ -7,17 +7,20 @@
"noarg": true,
"sub": true,
"undef": true,
- "unused": true,
+ "unused": false,
"boss": true,
"eqnull": false,
- "node": true,
"es5": false,
+ "browser": true,
+ "node": true,
"maxparams": 3,
"maxdepth": 4,
"maxcomplexity": 4,
"maxstatements": 10,
- "globals": {}
+ "globals": {
+ "define": true
+ }
}
View
@@ -10,17 +10,14 @@ module.exports = function(grunt) {
/**
* Main task names
*/
- // Default task.
- grunt.registerTask("default", ["lint","scripts","styles"]);
+ grunt.registerTask("default", ["jshint", "scripts", "styles"]);
+ grunt.registerTask("dev", ["jshint", "stylus:dev", "watch"]);
- // other tasks
+ // sub tasks
grunt.registerTask("install", ["volo:add"]);
- grunt.registerTask("scripts", ["requirejs","concat"]);
- grunt.registerTask("styles", ["stylus"]);
+ grunt.registerTask("scripts", ["requirejs:dist", "concat"]);
+ grunt.registerTask("styles", ["stylus:dist"]);
- // watch tasks
- grunt.registerTask("watch-dev", "default","watch:styles");
- grunt.registerTask("watch-dist", ["default","watch"]);
/**
* => Stylus Configuration
@@ -86,34 +83,31 @@ module.exports = function(grunt) {
// The compression configuration is built above (https://github.com/mishoo/UglifyJS)
uglify: uglify,
- // Javascript Unit Tests
- test: {
- files: ["test/**/*.js"]
- },
-
// file watcher using grunt-contrib-watch
watch: {
styles: {
files: [
uiPath + "/styles/**/*.styl"
],
- tasks: "styles"
+ tasks: "stylus:dev"
},
scripts: {
files: [
uiPath + "/scripts/**/*.js"
],
- tasks: "scripts"
+ tasks: "jshint"
}
},
// The JavaScript linting configuration for JsHint (http://www.jshint.com/docs/)
jshint: {
files: [
"grunt.js",
- uiPath + "/js/**/*.js"
+ uiPath + "/scripts/**/*.js"
],
- jshintrc: '.jshintrc'
+ options: {
+ jshintrc: '.jshintrc'
+ }
},
// This task uses James Burke's excellent r.js AMD build tool. In the
@@ -148,12 +142,6 @@ module.exports = function(grunt) {
separator: ";"
}
- },
-
- // The volo task is used to grab front-end dependecies
- // like jQuery from the package.json file
- volo: {
- install: {}
}
});
@@ -171,7 +159,5 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-requirejs');
grunt.loadNpmTasks('grunt-contrib-stylus');
grunt.loadNpmTasks('grunt-contrib-qunit');
- grunt.loadNpmTasks('grunt-volo');
-
};
View
@@ -15,7 +15,6 @@
"grunt-contrib-uglify": "~0.1.1",
"grunt-contrib-qunit": "~0.2.0",
- "grunt-volo": "0.x.x",
"nib": "0.8.x",
"volo": "0.2.x",
"express": "3.x.x",
@@ -1,6 +1,6 @@
-{{#app.development}}
-<script data-main="/scripts/config" src="/lib/require.js"></script>
-{{/app.development}}
-{{^app.development}}
+{{#development}}
+<script data-main="/ui/scripts/config" src="/ui/lib/require.js"></script>
+{{/development}}
+{{^development}}
<script data-main="config" src="/ui/dist/require.js"></script>
-{{/app.development}}
+{{/development}}
@@ -1,4 +1,3 @@
-/*global require */
// Set the require.js configuration for your application.
require.config({
@@ -1,4 +1,3 @@
-/*global require,alert */
require([
'jquery',
'ui'
@@ -1,4 +1,3 @@
-/*global define, require */
define(
[
'jquery',

0 comments on commit a72702f

Please sign in to comment.