Merge branch 'master' into issue/2726

Author: JJJ

.github/ISSUE_TEMPLATE.md

@@ -18,7 +18,7 @@ Tell us how to reproduce this issue.
 
   3. Further steps, etc.
 
-Additionally, please link to a working demo that shows the issue so we can attempt to reproduce.  You can use [this template](https://jsfiddle.net/5v3v353z/) as a base.  Alternatively, confirm that the [Chosen demo page](http://harvesthq.github.io/chosen/) shows the issue.
+Additionally, please link to a working demo that shows the issue so we can attempt to reproduce.  You can use [this template](https://jsfiddle.net/j7k727cp/) as a base.  Alternatively, confirm that the [Chosen demo page](http://harvesthq.github.io/chosen/) shows the issue.
 
 
 ### Expected behavior

.gitignore

@@ -4,6 +4,7 @@ node_modules
 public/*.js
 public/*.css
 public/*.json
+public/LICENSE.md
 chosen*.zip
 .sass-cache
 .ruby-version

.travis.yml

@@ -3,7 +3,7 @@ sudo: false
 language: node_js
 
 node_js:
-  - "node"
+  - 6
 
 addons:
   apt:
@@ -19,4 +19,4 @@ after_success: ./publish-package.sh
 
 env:
   global:
-    secure: FHc3fAbJDydJywQ3HcFrTxqyAmmKbiAwP5Bi3qIzvXXCKNYbZb45iSjrMPFq7sHQR/evxDKl3zzBd8k6lvx0Sr77GDkmbN7HjI22fb3wu1Pi3WhmIM90/70ATs6hSZunsNEHCtQa4fDFM3NYeOeiwHFX8HQ9tVlqtjeAZngONL8=
+    secure: "SOYNh0YO4eLAM38FQxrg7iqytXgdjJHRkmj/1lFzGrGeuuXP6Owe/2TaMyTJXWb9nHAAtRRwQyhAUE07eKhxI6b3YNyozeRulMK4B0K8P3P1B2MslpROyvQYtZupno3dWc0tyvsQ3ucnZE25mtetH6KYcwiI+vHv6hT8HnzBnp0="

Gruntfile.coffee

@@ -1,5 +1,6 @@
 module.exports = (grunt) ->
   require('load-grunt-tasks')(grunt)
+  grunt.loadNpmTasks('grunt1.0-dom-munger') # the naming convention of the package does not allow auto-discovery.
 
   grunt.initConfig
     pkg: grunt.file.readJSON('package.json')
@@ -33,24 +34,40 @@ This file is generated by `grunt build`, do not edit it by hand.
         src: ['public/chosen.css']
         dest: 'public/chosen.css'
 
+    copy:
+      main:
+        src: 'LICENSE.md'
+        dest: 'public/'
+      php:
+        src: 'composer.json'
+        dest: 'public/'
+
     coffee:
       options:
         join: true
-      compile:
+      jquery:
         files:
           'public/chosen.jquery.js': ['coffee/lib/select-parser.coffee', 'coffee/lib/abstract-chosen.coffee', 'coffee/chosen.jquery.coffee']
+      proto:
+        files:
           'public/chosen.proto.js': ['coffee/lib/select-parser.coffee', 'coffee/lib/abstract-chosen.coffee', 'coffee/chosen.proto.coffee']
+      test:
+        files:
           'spec/public/jquery_specs.js': 'spec/jquery/*.spec.coffee'
           'spec/public/proto_specs.js': 'spec/proto/*.spec.coffee'
 
     uglify:
       options:
-        mangle:
-          except: ['jQuery', 'AbstractChosen', 'Chosen', 'SelectParser']
         banner: '<%= minified_comments %>'
-      minified_chosen_js:
+      jquery:
+        options:
+          ie8: true
+          mangle:
+            reserved: ['jQuery']
         files:
           'public/chosen.jquery.min.js': ['public/chosen.jquery.js']
+      proto:
+        files:
           'public/chosen.proto.min.js': ['public/chosen.proto.js']
 
     sass:
@@ -65,41 +82,55 @@ This file is generated by `grunt build`, do not edit it by hand.
         processors: [
           require('autoprefixer')(browsers: 'last 2 versions, IE 8')
         ]
-      dist:
+      main:
         src: 'public/chosen.css'
 
     cssmin:
-      minified_chosen_css:
-        options:
-          banner: '<%= minified_comments %>'
-          keepSpecialComments: 0
+      options:
+        banner: '<%= minified_comments %>'
+        keepSpecialComments: 0
+      main:
         src: 'public/chosen.css'
         dest: 'public/chosen.min.css'
 
     watch:
-      scripts:
+      default:
         files: ['coffee/**/*.coffee', 'sass/*.scss']
-        tasks: ['build']
+        tasks: ['build', 'jasmine']
+      test:
+        files: ['spec/**/*.coffee']
+        tasks: ['jasmine']
 
     jasmine:
       jquery:
+        options:
+          vendor: [
+            'public/docsupport/jquery-3.2.1.min.js'
+          ]
+          specs: 'spec/public/jquery_specs.js'
         src: [ 'public/chosen.jquery.js' ]
+      jquery_old:
         options:
-          vendor: [ 'https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js' ]
+          vendor: [
+            'public/docsupport/jquery-1.12.4.min.js'
+          ]
           specs: 'spec/public/jquery_specs.js'
+        src: [ 'public/chosen.jquery.js' ]
       proto:
-        src: [ 'public/chosen.proto.js' ]
         options:
           vendor: [
-            'https://ajax.googleapis.com/ajax/libs/prototype/1.7.0.0/prototype.js',
-            'public/docsupport/event.simulate.js'
+            'public/docsupport/prototype-1.7.0.0.js'
+            'node_modules/simulant/dist/simulant.umd.js'
           ]
           specs: 'spec/public/proto_specs.js'
+        src: [ 'public/chosen.proto.js' ]
 
   grunt.loadTasks 'tasks'
 
   grunt.registerTask 'default', ['build']
-  grunt.registerTask 'build', ['coffee', 'sass', 'concat', 'uglify', 'postcss', 'cssmin', 'package-bower']
+  grunt.registerTask 'build', ['coffee:jquery', 'coffee:proto', 'sass', 'concat', 'uglify', 'postcss', 'cssmin', 'copy']
   grunt.registerTask 'test',  ['coffee', 'jasmine']
+  grunt.registerTask 'test:jquery',  ['coffee:test', 'coffee:jquery', 'jasmine:jquery', 'jasmine:jquery_old']
+  grunt.registerTask 'test:proto',  ['coffee:test', 'coffee:proto', 'jasmine:proto']
 
 

README.md

@@ -2,7 +2,7 @@
 
 Chosen is a library for making long, unwieldy select boxes more user friendly.
 
-- jQuery support: 1.4+
+- jQuery support: 1.7+
 - Prototype support: 1.7+
 
 For **documentation**, usage, and examples, see:
@@ -13,8 +13,7 @@ https://github.com/harvesthq/chosen/releases/
 
 ### Package managers
 
-Chosen is available through [Bower](https://bower.io/) and [npm](https://www.npmjs.com),
-_however, the package names are not the same_.
+Chosen is available through [Bower](https://bower.io/), [npm](https://www.npmjs.com), and [Composer](https://getcomposer.org/), _however, the package names are not the same_.
 
 To install with Bower:
 
@@ -28,6 +27,12 @@ To install with npm:
 npm install chosen-js
 ```
 
+To install with Composer:
+
+```
+composer require harvesthq/chosen
+```
+
 The compiled files for these packages are automatically generated and stored in a [2nd Chosen repository](https://github.com/harvesthq/chosen-package). No pull requests will be accepted to that repository.
 
 ### Contributing to this project