Update badges and some devDeps.

llopeziii · Jan 17, 2015 · 42eaaa0 · 42eaaa0
1 parent b9be59f
commit 42eaaa0
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 28 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -77,10 +77,6 @@ module.exports = function (grunt) {
  }
  },
 
- //qunit: {
- // files: ['test/**/*.html']
- //},
-
  less: {
  options: {
  strictMath: true,
@@ -98,7 +94,6 @@ module.exports = function (grunt) {
  usebanner: {
  css: {
  options: {
- position: 'top',
  banner: '<%= banner %>'
  },
  src: '<%= less.css.dest %>'
@@ -109,7 +104,7 @@ module.exports = function (grunt) {
  options: {
  compatibility: 'ie8',
  keepSpecialComments: '*',
- noAdvanced: true
+ advanced: false
  },
  css: {
  src: '<%= less.css.dest %>',
@@ -146,8 +141,7 @@ module.exports = function (grunt) {
  sed: {
  versionNumber: {
  path: [
- 'less',
- 'js',
+ 'js/<%= pkg.name %>.js',
  'bower.json',
  'composer.json',
  'package.json'
@@ -192,7 +186,7 @@ module.exports = function (grunt) {
  {
  expand: true,
  cwd: 'dist/',
- src: ['**'],
+ src: '**',
  dest: 'bootstrap-select-<%= pkg.version %>/'
  }, {
  src: ['bower.json', 'composer.json', 'package.json'],
@@ -219,7 +213,9 @@ module.exports = function (grunt) {
  });
 
  // These plugins provide necessary tasks.
- require('load-grunt-tasks')(grunt);
+ require('load-grunt-tasks')(grunt, {
+ scope: 'devDependencies'
+ });
 
  // Version numbering task.
  // grunt change-version-number --old=A.B.C --new=X.Y.Z

diff --git a/README.md b/README.md
@@ -1,10 +1,9 @@
 bootstrap-select
 ================
 
-[![Latest release](http:https://img.shields.io/github/release/silviomoreto/bootstrap-select.svg)](https://github.com/silviomoreto/bootstrap-select/releases/latest)
+[![Latest release](https://img.shields.io/github/release/silviomoreto/bootstrap-select.svg?style=flat)](https://github.com/silviomoreto/bootstrap-select/releases/latest)
+[![License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat)](LICENSE)
 [![Dependency Status](https://david-dm.org/silviomoreto/bootstrap-select.svg)](https://david-dm.org/silviomoreto/bootstrap-select)
-[![License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](LICENSE)
-
 [![devDependency Status](https://david-dm.org/silviomoreto/bootstrap-select/dev-status.svg)](https://david-dm.org/silviomoreto/bootstrap-select#info=devDependencies)
 
 A custom select / multiselect for Bootstrap using button dropdown, designed to behave like regular Bootstrap selects.

diff --git a/js/bootstrap-select.js b/js/bootstrap-select.js
@@ -113,12 +113,10 @@
  return (numSelected == 1) ? "{0} item selected" : "{0} items selected";
  },
  maxOptionsText: function (numAll, numGroup) {
- var arr = [];
-
- arr[0] = (numAll == 1) ? 'Limit reached ({n} item max)' : 'Limit reached ({n} items max)';
- arr[1] = (numGroup == 1) ? 'Group limit reached ({n} item max)' : 'Group limit reached ({n} items max)';
-
- return arr;
+ return [
+ (numAll == 1) ? 'Limit reached ({n} item max)' : 'Limit reached ({n} items max)',
+ (numGroup == 1) ? 'Group limit reached ({n} item max)' : 'Group limit reached ({n} items max)'
+ ];
  },
  selectAllText: 'Select All',
  deselectAllText: 'Deselect All',

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "bootstrap-select",
  "title": "bootstrap-select",
- "filename": "bootstrap-select.js",
+ "main": "dist/js/bootstrap-select.js",
  "description": "A custom <select> for Bootstrap using button dropdown as replacement",
  "version": "1.6.3",
  "homepage": "http:https://silviomoreto.github.io/bootstrap-select",
@@ -35,9 +35,6 @@
  "type": "git",
  "url": "git:https://github.com/silviomoreto/bootstrap-select.git"
  },
- "bugs": {
- "url": "https://github.com/silviomoreto/bootstrap-select/issues"
- },
  "license": {
  "type": "MIT",
  "url": "https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE"
@@ -48,18 +45,18 @@
  "devDependencies": {
  "grunt": "~0.4.5",
  "grunt-autoprefixer": "~1.0.0",
- "grunt-banner": "~0.2.3",
+ "grunt-banner": "~0.3.1",
  "grunt-contrib-clean": "~0.6.0",
- "grunt-contrib-compress": "^0.12.0",
+ "grunt-contrib-compress": "~0.13.0",
  "grunt-contrib-concat": "~0.5.0",
  "grunt-contrib-csslint": "~0.2.0",
- "grunt-contrib-cssmin": "~0.10.0",
+ "grunt-contrib-cssmin": "~0.11.0",
  "grunt-contrib-jshint": "~0.10.0",
  "grunt-contrib-less": "~0.11.3",
- "grunt-contrib-uglify": "~0.5.0",
+ "grunt-contrib-uglify": "~0.7.0",
  "grunt-contrib-watch": "~0.6.1",
  "grunt-sed": "~0.1.1",
- "load-grunt-tasks": "~0.6.0"
+ "load-grunt-tasks": "~2.0.0"
  },
  "keywords": [
  "form",