f · f · Nov 6, 2014 · Nov 6, 2014 · Nov 6, 2014
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,106 +1,13 @@
-module.exports = function (grunt) {
-  grunt.loadNpmTasks('grunt-karma');
-  grunt.loadNpmTasks('grunt-docco');
-  grunt.loadNpmTasks('grunt-browserify');
-  grunt.loadNpmTasks('grunt-contrib-uglify');
-  grunt.loadNpmTasks('grunt-contrib-concat');
-  grunt.loadNpmTasks('grunt-contrib-connect');
-  grunt.loadNpmTasks('grunt-contrib-watch');
-  grunt.loadNpmTasks('grunt-jscs-checker');
-  grunt.loadNpmTasks('grunt-contrib-jshint');
-  grunt.loadNpmTasks('grunt-release');
+'use strict';
 
+module.exports = function (grunt) {
   grunt.initConfig({
-
-    pkg: grunt.file.readJSON('package.json'),
-
-    jshint: {
-      options: {
-        laxbreak: true
-      },
-      all: ['Gruntfile.js', 'src/**/*.js', 'test/**/*.js', '!test/vendor/**/*.js']
-    },
-    jscs: {
-      src: ['Gruntfile.js', 'src/**/*.js', 'test/**/*.js', '!test/vendor/**/*.js'],
-      options: {
-        config: '.jscsrc',
-        validateIndentation: 2,
-        disallowDanglingUnderscores: null,
-        disallowMultipleVarDecl: null,
-        requireMultipleVarDecl: null
-      }
-    },
-    docco: {
-      dist: {
-        src: ['src/*.js'],
-        options: {
-          output: 'docs/api/'
-        }
-      }
-    },
-    karma: {
-      unit: {
-        configFile: 'test/karma.conf.js'
-      }
-    },
-    browserify: {
-      dist: {
-        files: {
-          'dist/.tmp/delorean-requirements.js': 'src/requirements.js'
-        }
-      }
-    },
-    concat: {
-      options: {
-        separator: ';',
-        banner: '/*! <%= pkg.name %> - v<%= pkg.version %> - ' +
-                '<%= grunt.template.today("yyyy-mm-dd") %> */\n'
-      },
-      build: {
-        src: ['src/delorean.js', 'dist/.tmp/delorean-requirements.js'],
-        dest: 'dist/delorean.js'
-      }
-    },
-    uglify: {
-      options: {
-        sourceMap: true,
-        mangle: {
-          except: ['DeLorean', 'Store', 'Dispatcher', 'Flux']
-        }
-      },
-      build: {
-        files: {
-          'dist/delorean.min.js': ['dist/delorean.js']
-        }
-      }
-    },
-    connect: {
-      server: {
-        options: {
-          livereload: true,
-          port: 9001,
-          base: 'coverage/'
-        }
-      }
-    },
-    watch: {
-      development: {
-        files: ['!src/index.js', 'src/**/*.js', 'test/**/*.js'],
-        tasks: ['default'],
-        options: {
-          livereload: true
-        }
-      }
-    },
-    release: {
-      options: {
-        files: ['package.json', 'bower.json']
-      }
-    }
+    pkg: grunt.file.readJSON('package.json')
   });
 
+  grunt.loadTasks('build/tasks');
+
   grunt.registerTask('default', ['jscs', 'jshint', 'browserify', 'concat', 'uglify']);
   grunt.registerTask('test', ['karma', 'docco']);
   grunt.registerTask('dev', ['connect', 'watch']);
-
 };
diff --git a/build/tasks/browserify.js b/build/tasks/browserify.js
@@ -0,0 +1,13 @@
+'use strict';
+
+module.exports = function(grunt) {
+  grunt.config('browserify', {
+    dist: {
+      files: {
+        'dist/.tmp/delorean-requirements.js': 'src/requirements.js'
+      }
+    }
+  });
+
+  grunt.loadNpmTasks('grunt-browserify');
+};
diff --git a/build/tasks/concat.js b/build/tasks/concat.js
@@ -0,0 +1,17 @@
+'use strict';
+
+module.exports = function(grunt) {
+  grunt.config('concat', {
+    options: {
+      separator: ';',
+      banner: '/*! <%= pkg.name %> - v<%= pkg.version %> - ' +
+              '<%= grunt.template.today("yyyy-mm-dd") %> */\n'
+    },
+    build: {
+      src: ['src/delorean.js', 'dist/.tmp/delorean-requirements.js'],
+      dest: 'dist/delorean.js'
+    }
+  });
+
+  grunt.loadNpmTasks('grunt-contrib-concat');
+};
diff --git a/build/tasks/connect.js b/build/tasks/connect.js
@@ -0,0 +1,15 @@
+'use strict';
+
+module.exports = function(grunt) {
+  grunt.config('connect', {
+    server: {
+      options: {
+        livereload: true,
+        port: 9001,
+        base: 'coverage/'
+      }
+    }
+  });
+
+  grunt.loadNpmTasks('grunt-contrib-connect');
+};
diff --git a/build/tasks/docco.js b/build/tasks/docco.js
@@ -0,0 +1,14 @@
+'use strict';
+
+module.exports = function(grunt) {
+  grunt.config('docco', {
+    dist: {
+      src: ['src/*.js'],
+      options: {
+        output: 'docs/api/'
+      }
+    }
+  });
+
+  grunt.loadNpmTasks('grunt-docco');
+};
diff --git a/build/tasks/jscs.js b/build/tasks/jscs.js
@@ -0,0 +1,16 @@
+'use strict';
+
+module.exports = function(grunt) {
+  grunt.config('jscs', {
+    src: ['Gruntfile.js', 'src/**/*.js', 'test/**/*.js', '!test/vendor/**/*.js'],
+    options: {
+      config: '.jscsrc',
+      validateIndentation: 2,
+      disallowDanglingUnderscores: null,
+      disallowMultipleVarDecl: null,
+      requireMultipleVarDecl: null
+    }
+  });
+
+  grunt.loadNpmTasks('grunt-jscs-checker');
+};
diff --git a/build/tasks/jshint.js b/build/tasks/jshint.js
@@ -0,0 +1,14 @@
+'use strict';
+
+module.exports = function(grunt) {
+  grunt.config('jshint', {
+    options: {
+      laxbreak: true,
+      node: true,
+      eqnull: true
+    },
+    all: ['Gruntfile.js', 'src/**/*.js', 'test/**/*.js', '!test/vendor/**/*.js']
+  });
+
+  grunt.loadNpmTasks('grunt-contrib-jshint');
+};
diff --git a/build/tasks/karma.js b/build/tasks/karma.js
@@ -0,0 +1,11 @@
+'use strict';
+
+module.exports = function(grunt) {
+  grunt.config('karma', {
+    unit: {
+      configFile: 'test/karma.conf.js'
+    }
+  });
+
+  grunt.loadNpmTasks('grunt-karma');
+};
diff --git a/build/tasks/release.js b/build/tasks/release.js
@@ -0,0 +1,11 @@
+'use strict';
+
+module.exports = function(grunt) {
+  grunt.config('release', {
+    options: {
+      files: ['package.json', 'bower.json']
+    }
+  });
+
+  grunt.loadNpmTasks('grunt-release');
+};
diff --git a/build/tasks/uglify.js b/build/tasks/uglify.js
@@ -0,0 +1,19 @@
+'use strict';
+
+module.exports = function(grunt) {
+  grunt.config('uglify', {
+    options: {
+      sourceMap: true,
+      mangle: {
+        except: ['DeLorean', 'Store', 'Dispatcher', 'Flux']
+      }
+    },
+    build: {
+      files: {
+        'dist/delorean.min.js': ['dist/delorean.js']
+      }
+    }
+  });
+
+  grunt.loadNpmTasks('grunt-contrib-uglify');
+};
diff --git a/build/tasks/watch.js b/build/tasks/watch.js
@@ -0,0 +1,15 @@
+'use strict';
+
+module.exports = function(grunt) {
+  grunt.config('watch', {
+    development: {
+      files: ['!src/index.js', 'src/**/*.js', 'test/**/*.js'],
+      tasks: ['default'],
+      options: {
+        livereload: true
+      }
+    }
+  });
+
+  grunt.loadNpmTasks('grunt-contrib-watch');
+};
diff --git a/src/delorean.js b/src/delorean.js
@@ -34,7 +34,7 @@
   function __findDispatcher(view) {
      // Provide a useful error message if no dispatcher is found in the chain
     if (view == null) {
-      throw 'No disaptcher found. The DeLoreanJS mixin requires a "dispatcher" property to be passed to a component, or one of it\'s ancestors.'
+      throw 'No disaptcher found. The DeLoreanJS mixin requires a "dispatcher" property to be passed to a component, or one of it\'s ancestors.';
     }
     /* `view` should be a component instance. If a component don't have
         any dispatcher, it tries to find a dispatcher from the parents. */
@@ -228,15 +228,15 @@
       var changedProps = [];
       if (typeof arg1 === 'object') {
         for (var keyName in arg1) {
-          changedProps.push(keyName)
+          changedProps.push(keyName);
           this.setValue(keyName, arg1[keyName]);
         }
       } else {
         changedProps.push(arg1);
         this.setValue(arg1, value);
       }
       this.recalculate(changedProps);
-    },
+    };
 
     // `set` method updates the data defined at the `scheme` of the store.
     Store.prototype.setValue = function (key, value) {
@@ -266,7 +266,9 @@
     Store.prototype.formatScheme = function (scheme) {
       var formattedScheme = {}, definition, defaultValue, calculatedValue;
       for (var keyName in scheme) {
-        definition = scheme[keyName], defaultValue = null, calculatedValue = null;
+        definition = scheme[keyName];
+        defaultValue = null;
+        calculatedValue = null;
 
         formattedScheme[keyName] = {default: null};
 
@@ -282,7 +284,7 @@
           if (definition.deps) {
             formattedScheme[keyName].deps = definition.deps;
           } else {
-            formattedScheme[keyName].deps = []
+            formattedScheme[keyName].deps = [];
           }
 
         } else if (typeof definition === 'function') {
@@ -322,7 +324,7 @@
               if (dependencyMap[dep] == null) {
                 dependencyMap[dep] = [];
               }
-              dependencyMap[dep].push(keyName)
+              dependencyMap[dep].push(keyName);
             }
 
             this.store[__generateOriginalName(keyName)] = definition.default;
@@ -387,7 +389,7 @@
         if (__hasOwn(this.store.actions, actionName)) {
           callback = this.store.actions[actionName];
           if (typeof this.store[callback] !== 'function') {
-            throw 'Callback "' + callback + '" defined for action "' + actionName + '" should be a method defined on the store!';
+            throw 'Callback \'' + callback + '\' defined for action \'' + actionName + '\' should be a method defined on the store!';
           }
           /* And `actionName` should be a name generated by `__generateActionName` */
           this.listener.on(__generateActionName(actionName),
@@ -527,7 +529,7 @@
        this.__changeHandlers = {};
 
         /* Generate and bind the change handlers to the stores. */
-        for (var storeName in this.__watchStores) {
+        for (storeName in this.__watchStores) {
           if (__hasOwn(this.stores, storeName)) {
             store = this.stores[storeName];
             this.__changeHandlers[storeName] = __changeHandler(store, storeName);
@@ -565,10 +567,10 @@
         // You can use `this.stores` from the React component.
         this.stores = this.__dispatcher.stores;
 
-        this.__watchStores = {}
+        this.__watchStores = {};
         if (this.watchStores != null) {
           for (var i = 0; i < this.watchStores.length;  i++) {
-            storeName = this.watchStores[i]
+            storeName = this.watchStores[i];
             this.__watchStores[storeName] = this.stores[storeName];
           }
         } else {
@@ -587,7 +589,7 @@
         /* Set `state.stores` for all present stores with a `setState` method defined. */
         for (var storeName in this.__watchStores) {
           if (__hasOwn(this.stores, storeName)) {
-            store = this.__watchStores[storeName].store
+            store = this.__watchStores[storeName].store;
             if (store && store.getState) {
               state.stores[storeName] = store.getState();
             } else if (typeof store.scheme === 'object') {