?

.gitattributes

@@ -1,63 +1,63 @@
-###############################################################################
-# Set default behavior to automatically normalize line endings.
-###############################################################################
-# * text=auto
-
-###############################################################################
-# Set default behavior for command prompt diff.
-#
-# This is need for earlier builds of msysgit that does not have it on by
-# default for csharp files.
-# Note: This is only used by command line
-###############################################################################
-#*.cs     diff=csharp
-
-###############################################################################
-# Set the merge driver for project and solution files
-#
-# Merging from the command prompt will add diff markers to the files if there
-# are conflicts (Merging from VS is not affected by the settings below, in VS
-# the diff markers are never inserted). Diff markers may cause the following 
-# file extensions to fail to load in VS. An alternative would be to treat
-# these files as binary and thus will always conflict and require user
-# intervention with every merge. To do so, just uncomment the entries below
-###############################################################################
-#*.sln       merge=binary
-#*.csproj    merge=binary
-#*.vbproj    merge=binary
-#*.vcxproj   merge=binary
-#*.vcproj    merge=binary
-#*.dbproj    merge=binary
-#*.fsproj    merge=binary
-#*.lsproj    merge=binary
-#*.wixproj   merge=binary
-#*.modelproj merge=binary
-#*.sqlproj   merge=binary
-#*.wwaproj   merge=binary
-
-###############################################################################
-# behavior for image files
-#
-# image files are treated as binary by default.
-###############################################################################
-#*.jpg   binary
-#*.png   binary
-#*.gif   binary
-
-###############################################################################
-# diff behavior for common document formats
-# 
-# Convert binary document formats to text before diffing them. This feature
-# is only available from the command line. Turn it on by uncommenting the 
-# entries below.
-###############################################################################
-#*.doc   diff=astextplain
-#*.DOC   diff=astextplain
-#*.docx  diff=astextplain
-#*.DOCX  diff=astextplain
-#*.dot   diff=astextplain
-#*.DOT   diff=astextplain
-#*.pdf   diff=astextplain
-#*.PDF   diff=astextplain
-#*.rtf   diff=astextplain
-#*.RTF   diff=astextplain
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+# * text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain

Gruntfile.js

@@ -1,120 +1,120 @@
-module.exports = function (grunt) {
-  require('load-grunt-tasks')(grunt);
-  require('./tasks/examples')(grunt);
-  grunt.loadNpmTasks('typedoc');
-  grunt.loadNpmTasks('dts-generator');
-  grunt.initConfig({
-      pkg: grunt.file.readJSON('package.json'),
-      copy: {
-          d3: {
-              src: 'node_modules/d3/d3.min.js',
-              dest: 'WebCola/extern/d3.min.js'
-          },
-          qunit: {
-              src: 'node_modules/qunitjs/qunit/*',
-              dest: 'WebCola/test/'
-          },
-      },
-    watch: {
-      typescript: {
-        files: ["<%= typescript.base.src %>","<%= typescript.examples.src %>"],
-        tasks: ["typescript"]
-      },
-      test: {
-        files: ["WebCola/test/*.js"],
-        tasks: ["qunit"]
-      }
-    },
-    typescript: {
-      base: {
-        src: ['WebCola/src/*.ts'],
-        dest: 'WebCola/cola.js',
-        options: {
-          module: 'amd',
-          target: 'es5',
-          sourceMap: true
-        }
-      },
-      test: {
-        src: ['WebCola/test/*.ts'],
-        options: {
-          module: 'amd',
-          target: 'es5',
-          sourceMap: true
-        }
-      },
-      commonjs: {
-        src: ['WebCola/index.ts'],
-        dest: 'WebCola/index.js',
-        options: {
-          module: 'commonjs',
-          target: 'es5'
-        }
-      },
-      examples: {
-        src: ['WebCola/examples/*.ts'],
-        options: {
-          module: 'amd',
-          target: 'es5',
-          sourceMap: true
-        }
-      }
-    },
-    dtsGenerator: {
-        options: {
-            name: 'cola',
-            baseDir: 'WebCola',
-            out: 'WebCola/cola.d.ts',
-	    excludes: ['extern/d3.d.ts']
-        },
-        default: {
-            src: [ 'WebCola/src/*.ts' ]
-        }
-    },
-    umd: {
-      all: {
-        src: '<%= dist.dest %>',
-        template: 'templates/umd.hbs',
-        objectToExport: 'cola',
-        deps: {
-          'default': ['d3']
-        }
-      }
-    },
-    uglify: {    
-      options: {
-        sourceMap: true
-      },
-      dist: {
-        files: {
-          'WebCola/cola.min.js': [
-            '<%= typescript.base.dest %>'
-          ]
-        }
-      }
-    },
-    qunit: {
-      all: ['WebCola/test/*.html']
-    },
-    examples: {
-      all: ["WebCola/examples/*.html"]
-    },
-    typedoc: {
-      options: {
-          module: 'amd',
-          target: 'es5',
-          out: 'doc/',
-          name: 'WebCoLa AKA cola.js',
-          theme: 'minimal'
-      },
-      src: ["<%= typescript.base.src %>"]
-    }
-  });
-
-  grunt.registerTask('default', ['copy', 'typescript', 'uglify', 'qunit']);
-  grunt.registerTask('nougly', ['typescript', 'qunit']);
-  grunt.registerTask('nougly-notest', ['typescript']);
-  grunt.registerTask('docs', ['typedoc', 'typescript:examples']);
-  grunt.registerTask('examples', ['typescript:examples']);
-  grunt.registerTask('full', ['default', 'typescript:examples', 'examples']);
-};
+module.exports = function (grunt) {
+  require('load-grunt-tasks')(grunt);
+  require('./tasks/examples')(grunt);
+  grunt.loadNpmTasks('typedoc');
+  grunt.loadNpmTasks('dts-generator');
+  grunt.initConfig({
+      pkg: grunt.file.readJSON('package.json'),
+      copy: {
+          d3: {
+              src: 'node_modules/d3/d3.min.js',
+              dest: 'WebCola/extern/d3.min.js'
+          },
+          qunit: {
+              src: 'node_modules/qunitjs/qunit/*',
+              dest: 'WebCola/test/'
+          },
+      },
+    watch: {
+      typescript: {
+        files: ["<%= typescript.base.src %>","<%= typescript.examples.src %>"],
+        tasks: ["typescript"]
+      },
+      test: {
+        files: ["WebCola/test/*.js"],
+        tasks: ["qunit"]
+      }
+    },
+    typescript: {
+      base: {
+        src: ['WebCola/src/*.ts'],
+        dest: 'WebCola/cola.js',
+        options: {
+          module: 'amd',
+          target: 'es5',
+          sourceMap: true
+        }
+      },
+      test: {
+        src: ['WebCola/test/*.ts'],
+        options: {
+          module: 'amd',
+          target: 'es5',
+          sourceMap: true
+        }
+      },
+      commonjs: {
+        src: ['WebCola/index.ts'],
+        dest: 'WebCola/index.js',
+        options: {
+          module: 'commonjs',
+          target: 'es5'
+        }
+      },
+      examples: {
+        src: ['WebCola/examples/*.ts'],
+        options: {
+          module: 'amd',
+          target: 'es5',
+          sourceMap: true
+        }
+      }
+    },
+    dtsGenerator: {
+        options: {
+            name: 'cola',
+            baseDir: 'WebCola',
+            out: 'WebCola/cola.d.ts',
+	    excludes: ['extern/d3.d.ts']
+        },
+        default: {
+            src: [ 'WebCola/src/*.ts' ]
+        }
+    },
+    umd: {
+      all: {
+        src: '<%= dist.dest %>',
+        template: 'templates/umd.hbs',
+        objectToExport: 'cola',
+        deps: {
+          'default': ['d3']
+        }
+      }
+    },
+    uglify: {    
+      options: {
+        sourceMap: true
+      },
+      dist: {
+        files: {
+          'WebCola/cola.min.js': [
+            '<%= typescript.base.dest %>'
+          ]
+        }
+      }
+    },
+    qunit: {
+      all: ['WebCola/test/*.html']
+    },
+    examples: {
+      all: ["WebCola/examples/*.html"]
+    },
+    typedoc: {
+      options: {
+          module: 'amd',
+          target: 'es5',
+          out: 'doc/',
+          name: 'WebCoLa AKA cola.js',
+          theme: 'minimal'
+      },
+      src: ["<%= typescript.base.src %>"]
+    }
+  });
+
+  grunt.registerTask('default', ['copy', 'typescript', 'uglify', 'qunit']);
+  grunt.registerTask('nougly', ['typescript', 'qunit']);
+  grunt.registerTask('nougly-notest', ['typescript']);
+  grunt.registerTask('docs', ['typedoc', 'typescript:examples']);
+  grunt.registerTask('examples', ['typescript:examples']);
+  grunt.registerTask('full', ['default', 'typescript:examples', 'examples']);
+};