Merge branch 'ditch-typeahead-css' of git://github.com/jharding/typea…

…head.js into integration-0.9.0 Conflicts: Gruntfile.js dist/typeahead.css dist/typeahead.min.css package.json src/dropdown_view.js src/typeahead.js test/dropdown_view_spec.js test/typeahead_view_spec.js
twitter · Mar 4, 2013 · f7b55de · f7b55de
2 parents 662156f + 1c095a0
commit f7b55de
Show file tree

Hide file tree

Showing 23 changed files with 506 additions and 584 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,17 +1,17 @@
 var semver = require('semver'),
     f = require('util').format,
     jsFiles = [
-      'src/js/version.js',
-      'src/js/utils.js',
-      'src/js/event_target.js',
-      'src/js/persistent_storage.js',
-      'src/js/request_cache.js',
-      'src/js/transport.js',
-      'src/js/dataset.js',
-      'src/js/input_view.js',
-      'src/js/dropdown_view.js',
-      'src/js/typeahead_view.js',
-      'src/js/typeahead.js'
+      'src/version.js',
+      'src/utils.js',
+      'src/event_target.js',
+      'src/persistent_storage.js',
+      'src/request_cache.js',
+      'src/transport.js',
+      'src/dataset.js',
+      'src/input_view.js',
+      'src/dropdown_view.js',
+      'src/typeahead_view.js',
+      'src/typeahead.js'
     ];
 
 module.exports = function(grunt) {
@@ -28,41 +28,13 @@ module.exports = function(grunt) {
       ' */\n\n'
     ].join('\n'),
 
-    less: {
-      css: {
-        src: 'src/css/typeahead.css',
-        dest: '<%= buildDir %>/typeahead.css'
-      },
-      cssmin: {
-        options: { yuicompress: true },
-        src: 'src/css/typeahead.css',
-        dest: '<%= buildDir %>/typeahead.min.css'
-      }
-    },
-
     concat: {
-      css: {
-        options: {
-          banner: '<%= banner %>',
-          stripBanners: true
-        },
-        src: '<%= less.css.dest %>',
-        dest: '<%= less.css.dest %>'
-      },
-      cssmin: {
-        options: {
-          banner: '<%= banner %>',
-          stripBanners: true
-        },
-        src: '<%= less.cssmin.dest %>',
-        dest: '<%= less.cssmin.dest %>'
-      },
       js: {
-        src: ['src/js/intro.js', jsFiles, 'src/js/outro.js'],
+        src: ['src/intro.js', jsFiles, 'src/outro.js'],
         dest: '<%= buildDir %>/typeahead.js'
       },
       jsmin: {
-        src: ['src/js/intro.js', jsFiles, 'src/js/outro.js'],
+        src: ['src/intro.js', jsFiles, 'src/outro.js'],
         dest: '<%= buildDir %>/typeahead.min.js'
       }
     },
@@ -111,10 +83,6 @@ module.exports = function(grunt) {
       js: {
         files: jsFiles,
         tasks: 'build:js'
-      },
-      css: {
-        files: '<%= less.css.src %>',
-        tasks: 'build:css'
       }
     },
 
@@ -252,9 +220,7 @@ module.exports = function(grunt) {
   // -------
 
   grunt.registerTask('default', 'build');
-  grunt.registerTask('build', ['build:js', 'build:css']);
-  grunt.registerTask('build:js', ['concat:js', 'concat:jsmin', 'sed:version', 'uglify']);
-  grunt.registerTask('build:css', ['less', 'concat:css', 'concat:cssmin']);
+  grunt.registerTask('build', ['concat:js', 'concat:jsmin', 'sed:version', 'uglify']);
   grunt.registerTask('server', 'connect:server');
   grunt.registerTask('lint', 'jshint');
   grunt.registerTask('test', 'jasmine:js');
@@ -267,7 +233,6 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-sed');
   grunt.loadNpmTasks('grunt-exec');
   grunt.loadNpmTasks('grunt-parallel');
-  grunt.loadNpmTasks('grunt-contrib-less');
   grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-contrib-uglify');

diff --git a/component.json b/component.json
@@ -2,10 +2,9 @@
   "name": "typeahead.js",
   "version": "0.8.2",
   "main": [
-    "dist/typeahead.css",
     "dist/typeahead.js"
   ],
   "dependencies": {
     "jquery": "~1.9"
   }
-}
+}
diff --git a/dist/typeahead.css b/dist/typeahead.css
diff --git a/dist/typeahead.min.css b/dist/typeahead.min.css
diff --git a/package.json b/package.json
@@ -29,7 +29,6 @@
     "grunt": "~0.4",
     "grunt-sed": "~0.1",
     "grunt-exec": "~0.4",
-    "grunt-contrib-less": "~0.5",
     "grunt-contrib-watch": "~0.2",
     "grunt-contrib-jshint": "~0.1",
     "grunt-contrib-uglify": "~0.1",
@@ -45,4 +44,4 @@
   },
   "private": true,
   "version": "0.8.2"
-}
+}
diff --git a/src/css/typeahead.css b/src/css/typeahead.css
diff --git a/src/js/dataset.js → src/dataset.js b/src/js/dataset.js → src/dataset.js
@@ -285,7 +285,7 @@ var Dataset = (function() {
   return Dataset;
 
   function compileTemplate(template, engine) {
-    var wrapper = '<li class="tt-suggestion">%body</li>',
+    var wrapper = '<div class="tt-suggestion">%body</div>',
        compiledTemplate;
 
     if (template) {