From e07c59218a6b4f26b600aab5d2396cdf636daa02 Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Sat, 22 Apr 2017 23:55:55 +0200 Subject: [PATCH 01/37] include minified and prototype files in package fixes #2804 fixes #2635 --- package.json | 4 ++++ publish-package.sh | 2 +- tasks/package.coffee | 5 +++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 30ca5606338..6700ccce0af 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,11 @@ }, "files": [ "chosen.jquery.js", + "chosen.jquery.min.js", + "chosen.proto.js", + "chosen.proto.min.js", "chosen.css", + "chosen.min.css", "chosen-sprite@2x.png", "chosen-sprite.png" ] diff --git a/publish-package.sh b/publish-package.sh index cc770ae785d..fe5e4bf53ec 100755 --- a/publish-package.sh +++ b/publish-package.sh @@ -14,7 +14,7 @@ GITHUB_URL=https://pfiller:${GH_TOKEN}@github.com/harvesthq/chosen-package.git git clone $GITHUB_URL rm -rf chosen-package/* -cp README.md public/*.json public/*.png public/chosen.jquery.js public/chosen.css chosen-package/ +cp README.md public/*.json public/*.png public/*.js public/*.css chosen-package/ cp package-travis.yml chosen-package/.travis.yml cd chosen-package diff --git a/tasks/package.coffee b/tasks/package.coffee index 8578e3d7e29..7cb3a930b99 100644 --- a/tasks/package.coffee +++ b/tasks/package.coffee @@ -24,6 +24,7 @@ module.exports = (grunt) -> grunt.registerTask 'package-npm', 'Generate npm manifest', () -> pkg = grunt.config.get('pkg') + extra = pkg._extra json = name: "#{pkg.name}-js" @@ -35,8 +36,8 @@ module.exports = (grunt) -> license: pkg.license contributors: pkg.contributors dependencies: pkg.dependencies - files: pkg._extra.files - main: pkg._extra.files[0] + files: extra.files + main: extra.files[0] repository: pkg.repository grunt.file.write('public/package.json', JSON.stringify(json, null, 2) + "\n") From e4bab396266054578f2813f61697777b536271ff Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Sat, 22 Apr 2017 23:56:35 +0200 Subject: [PATCH 02/37] remove extraneous `package-bower` --- Gruntfile.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gruntfile.coffee b/Gruntfile.coffee index 85c5feaf883..d459ab78e43 100644 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -111,7 +111,7 @@ This file is generated by `grunt build`, do not edit it by hand. grunt.loadTasks 'tasks' grunt.registerTask 'default', ['build'] - grunt.registerTask 'build', ['coffee:jquery', 'coffee:proto', 'sass', 'concat', 'uglify', 'postcss', 'cssmin', 'package-bower'] + grunt.registerTask 'build', ['coffee:jquery', 'coffee:proto', 'sass', 'concat', 'uglify', 'postcss', 'cssmin'] grunt.registerTask 'test', ['coffee', 'jasmine'] grunt.registerTask 'test:jquery', ['coffee:test', 'coffee:jquery', 'jasmine:jquery'] grunt.registerTask 'test:proto', ['coffee:test', 'coffee:proto', 'jasmine:proto'] From 4475df826ca5e33f97bc48e6cb1cca6c726cff94 Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Sun, 23 Apr 2017 00:03:19 +0200 Subject: [PATCH 03/37] specify main explicitly --- package.json | 4 ++++ tasks/package.coffee | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 6700ccce0af..c21a2df2dea 100644 --- a/package.json +++ b/package.json @@ -71,6 +71,10 @@ "download": "https://github.com/harvesthq/chosen/releases", "docs": "https://harvesthq.github.io/chosen/" }, + "main": [ + "chosen.jquery.js", + "chosen.css" + ], "files": [ "chosen.jquery.js", "chosen.jquery.min.js", diff --git a/tasks/package.coffee b/tasks/package.coffee index 7cb3a930b99..70f1e997d97 100644 --- a/tasks/package.coffee +++ b/tasks/package.coffee @@ -37,7 +37,7 @@ module.exports = (grunt) -> contributors: pkg.contributors dependencies: pkg.dependencies files: extra.files - main: extra.files[0] + main: extra.main[0] repository: pkg.repository grunt.file.write('public/package.json', JSON.stringify(json, null, 2) + "\n") @@ -54,7 +54,7 @@ module.exports = (grunt) -> license: extra.license.url authors: pkg.contributors dependencies: pkg.dependencies - main: extra.files + main: extra.main ignore: [] repository: pkg.repository From 40cb8a0a658cc856990a97d0aaa3707830c7a71c Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Wed, 21 Jun 2017 20:49:49 +0200 Subject: [PATCH 04/37] chosen doesn't build with node > 6 (#2841) --- .travis.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a1f3e2132cb..e9e5fc596c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,8 @@ sudo: false language: node_js node_js: - - "node" + - 6 + - node addons: apt: @@ -12,6 +13,11 @@ addons: packages: - git +matrix: + fast_finish: true + allow_failures: + - node_js: node + before_install: npm install -g grunt-cli before_script: grunt build package-npm package-bower From 6cfe4c98c7b7749fac67908a7c92ec446e3a79c0 Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Wed, 21 Jun 2017 20:59:09 +0200 Subject: [PATCH 05/37] fix useless condition (#2840) without parens the argument to `hasClass` included the `or ...` clause fixes #2833 --- coffee/chosen.jquery.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coffee/chosen.jquery.coffee b/coffee/chosen.jquery.coffee index 95b7b878bb8..76e5bda0f1a 100644 --- a/coffee/chosen.jquery.coffee +++ b/coffee/chosen.jquery.coffee @@ -299,7 +299,7 @@ class Chosen extends AbstractChosen this.result_do_highlight( target ) if target search_results_mouseout: (evt) -> - this.result_clear_highlight() if $(evt.target).hasClass "active-result" or $(evt.target).parents('.active-result').first() + this.result_clear_highlight() if $(evt.target).hasClass("active-result") or $(evt.target).parents('.active-result').first() choice_build: (item) -> choice = $('
  • ', { class: "search-choice" }).html("#{this.choice_label(item)}") From 114da058e768265ded699715a3d6f70e21032f81 Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Sun, 11 Aug 2013 16:22:00 +0200 Subject: [PATCH 06/37] word boundary matching --- coffee/lib/abstract-chosen.coffee | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/coffee/lib/abstract-chosen.coffee b/coffee/lib/abstract-chosen.coffee index f6f337ed5eb..d5bdb78f888 100644 --- a/coffee/lib/abstract-chosen.coffee +++ b/coffee/lib/abstract-chosen.coffee @@ -167,7 +167,6 @@ class AbstractChosen searchText = this.get_search_text() escapedSearchText = searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&") regex = this.get_search_regex(escapedSearchText) - highlightRegex = this.get_highlight_regex(escapedSearchText) for option in @results_data @@ -188,12 +187,14 @@ class AbstractChosen option.search_text = if option.group then option.label else option.html unless option.group and not @group_search - option.search_match = this.search_string_match(option.search_text, regex) + option.search_match = regex.test(option.search_text) + results += 1 if option.search_match and not option.group if option.search_match if searchText.length - startpos = option.search_text.search highlightRegex + match = regex.exec(option.search_text) + startpos = match.index text = option.search_text.substr(0, startpos + searchText.length) + '' + option.search_text.substr(startpos + searchText.length) option.search_text = text.substr(0, startpos) + '' + text.substr(startpos) @@ -212,25 +213,8 @@ class AbstractChosen this.winnow_results_set_highlight() get_search_regex: (escaped_search_string) -> - regex_anchor = if @search_contains then "" else "^" - regex_flag = if @case_sensitive_search then "" else "i" - new RegExp(regex_anchor + escaped_search_string, regex_flag) - - get_highlight_regex: (escaped_search_string) -> - regex_anchor = if @search_contains then "" else "\\b" - regex_flag = if @case_sensitive_search then "" else "i" - new RegExp(regex_anchor + escaped_search_string, regex_flag) - - search_string_match: (search_string, regex) -> - if regex.test search_string - return true - else if @enable_split_word_search and (search_string.indexOf(" ") >= 0 or search_string.indexOf("[") == 0) - #TODO: replace this substitution of /\[\]/ with a list of characters to skip. - parts = search_string.replace(/\[|\]/g, "").split(" ") - if parts.length - for part in parts - if regex.test part - return true + regex_string = if @search_contains then escaped_search_string else "\\b#{escaped_search_string}\\w*\\b" + new RegExp(regex_string, 'i') choices_count: -> return @selected_option_count if @selected_option_count? From b9500e0018e78aa19dd23cd0e629a640ecdae051 Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Sun, 11 Aug 2013 16:43:47 +0200 Subject: [PATCH 07/37] restored start of string matching --- coffee/lib/abstract-chosen.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/coffee/lib/abstract-chosen.coffee b/coffee/lib/abstract-chosen.coffee index d5bdb78f888..22bda62612a 100644 --- a/coffee/lib/abstract-chosen.coffee +++ b/coffee/lib/abstract-chosen.coffee @@ -214,6 +214,7 @@ class AbstractChosen get_search_regex: (escaped_search_string) -> regex_string = if @search_contains then escaped_search_string else "\\b#{escaped_search_string}\\w*\\b" + regex_string = "^#{regex_string}" unless @enable_split_word_search or @search_contains new RegExp(regex_string, 'i') choices_count: -> From 21fa0010f174b53b51dba6fdd37d227db112459b Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Sat, 17 Aug 2013 21:45:07 +0200 Subject: [PATCH 08/37] removed .test() in favor of .exec(), separated search match function --- coffee/lib/abstract-chosen.coffee | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/coffee/lib/abstract-chosen.coffee b/coffee/lib/abstract-chosen.coffee index 22bda62612a..9ac069df168 100644 --- a/coffee/lib/abstract-chosen.coffee +++ b/coffee/lib/abstract-chosen.coffee @@ -172,6 +172,7 @@ class AbstractChosen option.search_match = false results_group = null + search_match = null if this.include_option_in_results(option) @@ -187,14 +188,14 @@ class AbstractChosen option.search_text = if option.group then option.label else option.html unless option.group and not @group_search - option.search_match = regex.test(option.search_text) + search_match = this.search_string_match(option.search_text, regex) + option.search_match = search_match? results += 1 if option.search_match and not option.group if option.search_match if searchText.length - match = regex.exec(option.search_text) - startpos = match.index + startpos = search_match.index text = option.search_text.substr(0, startpos + searchText.length) + '' + option.search_text.substr(startpos + searchText.length) option.search_text = text.substr(0, startpos) + '' + text.substr(startpos) @@ -217,6 +218,9 @@ class AbstractChosen regex_string = "^#{regex_string}" unless @enable_split_word_search or @search_contains new RegExp(regex_string, 'i') + search_string_match: (search_string, regex) -> + regex.exec(search_string) + choices_count: -> return @selected_option_count if @selected_option_count? From 4cfeb094a32d8efd74e11c28b60ee0205270c369 Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Fri, 28 Jul 2017 23:52:42 +0200 Subject: [PATCH 09/37] restore case sensitive searching --- coffee/lib/abstract-chosen.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/coffee/lib/abstract-chosen.coffee b/coffee/lib/abstract-chosen.coffee index 9ac069df168..8b68764ebf8 100644 --- a/coffee/lib/abstract-chosen.coffee +++ b/coffee/lib/abstract-chosen.coffee @@ -216,7 +216,8 @@ class AbstractChosen get_search_regex: (escaped_search_string) -> regex_string = if @search_contains then escaped_search_string else "\\b#{escaped_search_string}\\w*\\b" regex_string = "^#{regex_string}" unless @enable_split_word_search or @search_contains - new RegExp(regex_string, 'i') + regex_flag = if @case_sensitive_search then "" else "i" + new RegExp(regex_string, regex_flag) search_string_match: (search_string, regex) -> regex.exec(search_string) From 6eb3b5d0031cdfb7f16843fdc434d91f4facc22c Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Mon, 31 Jul 2017 12:55:27 +0200 Subject: [PATCH 10/37] Update dev dependencies to use uptodate packages --- Gruntfile.coffee | 4 +++- package.json | 30 +++++++++++++++--------------- public/index.html | 2 +- public/index.proto.html | 2 +- public/options.html | 2 +- 5 files changed, 21 insertions(+), 19 deletions(-) diff --git a/Gruntfile.coffee b/Gruntfile.coffee index d459ab78e43..811e413353a 100644 --- a/Gruntfile.coffee +++ b/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') @@ -52,8 +53,9 @@ This file is generated by `grunt build`, do not edit it by hand. banner: '<%= minified_comments %>' jquery: options: + ie8: true mangle: - except: ['jQuery'] + reserved: ['jQuery'] files: 'public/chosen.jquery.min.js': ['public/chosen.jquery.js'] proto: diff --git a/package.json b/package.json index c21a2df2dea..65205e3c334 100644 --- a/package.json +++ b/package.json @@ -16,28 +16,28 @@ "url": "https://github.com/harvesthq/chosen.git" }, "engines": { - "node": ">=0.4.0" + "node": ">=4" }, "scripts": { "test": "grunt test" }, "dependencies": {}, "devDependencies": { - "autoprefixer": "^6.1.2", + "autoprefixer": "^7.1.2", "coffee-script": ">= 1.6", - "grunt": "~0.4.1", - "grunt-contrib-coffee": "~0.6.4", - "grunt-contrib-concat": "~0.1.3", - "grunt-contrib-cssmin": "~0.6.1", - "grunt-contrib-jasmine": "~1.0.3", - "grunt-contrib-uglify": "~0.2.0", - "grunt-contrib-watch": "~0.3.1", - "grunt-dom-munger": "~2.0.1", - "grunt-gh-pages": "~0.10.0", - "grunt-postcss": "^0.7.1", - "grunt-sass": "^1.1.0", - "grunt-zip": "~0.9.2", - "load-grunt-tasks": "^3.0.0", + "grunt": "~1.0", + "grunt-contrib-coffee": "~1.0", + "grunt-contrib-concat": "~1.0", + "grunt-contrib-cssmin": "~2.2", + "grunt-contrib-jasmine": "~1.1", + "grunt-contrib-uglify": "~3.0", + "grunt-contrib-watch": "~1.0", + "grunt-gh-pages": "~2.0", + "grunt-postcss": "^0.8.0", + "grunt-sass": "^2.0", + "grunt-zip": "~0.17.1", + "grunt1.0-dom-munger": "~3.4", + "load-grunt-tasks": "^3.5.2", "simulant": "^0.2.2" }, "contributors": [ diff --git a/public/index.html b/public/index.html index 22351487362..518a432e967 100644 --- a/public/index.html +++ b/public/index.html @@ -7,7 +7,7 @@ - + diff --git a/public/index.proto.html b/public/index.proto.html index d39561474f7..46dfdde143f 100644 --- a/public/index.proto.html +++ b/public/index.proto.html @@ -7,7 +7,7 @@ - + diff --git a/public/options.html b/public/options.html index 1107c053fd8..97e12fed4b3 100644 --- a/public/options.html +++ b/public/options.html @@ -204,7 +204,7 @@

    Example:

    Chosen supports right-to-left text in select boxes. Add the class chosen-rtl to your select tag to support right-to-left text options.

    Note: The chosen-rtl class will pass through to the Chosen select even when the inherit_select_classes option is set to false.

    -

    Note: This is deprecated in favor of using the rtl: true option (see the Options section). +

    Note: This is deprecated in favor of using the rtl: true option (see the Options section).

    From 0cdcbde9ff61f1b79634277930319d7999efed2a Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Mon, 31 Jul 2017 14:45:59 +0200 Subject: [PATCH 11/37] Add testing on jQuery 3 Tests will now run on both jquery 3 (currently maintained version) and 1.12 (to ensure we don't break compat with it). --- Gruntfile.coffee | 9 ++++++++- public/index.html | 2 +- spec/jquery/basic.spec.coffee | 10 +++++----- spec/jquery/events.spec.coffee | 4 ++-- spec/jquery/max_shown_results.spec.coffee | 10 +++++----- 5 files changed, 21 insertions(+), 14 deletions(-) diff --git a/Gruntfile.coffee b/Gruntfile.coffee index d459ab78e43..9e7dd051e0b 100644 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -93,6 +93,13 @@ This file is generated by `grunt build`, do not edit it by hand. jasmine: jquery: + options: + vendor: [ + 'https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.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' @@ -113,7 +120,7 @@ This file is generated by `grunt build`, do not edit it by hand. grunt.registerTask 'default', ['build'] grunt.registerTask 'build', ['coffee:jquery', 'coffee:proto', 'sass', 'concat', 'uglify', 'postcss', 'cssmin'] grunt.registerTask 'test', ['coffee', 'jasmine'] - grunt.registerTask 'test:jquery', ['coffee:test', 'coffee:jquery', 'jasmine:jquery'] + grunt.registerTask 'test:jquery', ['coffee:test', 'coffee:jquery', 'jasmine:jquery', 'jasmine:jquery_old'] grunt.registerTask 'test:proto', ['coffee:test', 'coffee:proto', 'jasmine:proto'] diff --git a/public/index.html b/public/index.html index 22351487362..bcb057edda2 100644 --- a/public/index.html +++ b/public/index.html @@ -1458,7 +1458,7 @@

    Credits

    - + diff --git a/spec/jquery/basic.spec.coffee b/spec/jquery/basic.spec.coffee index cbb78589548..c71798fbaf0 100644 --- a/spec/jquery/basic.spec.coffee +++ b/spec/jquery/basic.spec.coffee @@ -13,12 +13,12 @@ describe "Basic setup", -> " div = $("
    ").html(tmpl) select = div.find("select") - expect(select.size()).toBe(1) + expect(select.length).toBe(1) select.chosen() # very simple check that the necessary elements have been created ["container", "container-single", "single", "default"].forEach (clazz)-> el = div.find(".chosen-#{clazz}") - expect(el.size()).toBe(1) + expect(el.length).toBe(1) # test a few interactions expect(select.val()).toBe "" @@ -44,7 +44,7 @@ describe "Basic setup", -> " div = $("
    ").html(tmpl) select = div.find("select") - expect(select.size()).toBe(1) + expect(select.length).toBe(1) select.chosen() placeholder = div.find(".chosen-single > span") expect(placeholder.text()).toBe("Choose a Country...") @@ -60,7 +60,7 @@ describe "Basic setup", -> " div = $("
    ").html(tmpl) select = div.find("select") - expect(select.size()).toBe(1) + expect(select.length).toBe(1) select.chosen() placeholder = div.find(".chosen-single > span") expect(placeholder.text()).toBe("") @@ -80,7 +80,7 @@ describe "Basic setup", -> " div = $("
    ").html(tmpl) select = div.find("select") - expect(select.size()).toBe(1) + expect(select.length).toBe(1) select.chosen() container = div.find(".chosen-container") diff --git a/spec/jquery/events.spec.coffee b/spec/jquery/events.spec.coffee index b6756048e85..278743be810 100644 --- a/spec/jquery/events.spec.coffee +++ b/spec/jquery/events.spec.coffee @@ -10,12 +10,12 @@ describe "Events", -> " div = $("
    ").html(tmpl) select = div.find("select") - expect(select.size()).toBe(1) + expect(select.length).toBe(1) select.chosen() # very simple check that the necessary elements have been created ["container", "container-single", "single", "default"].forEach (clazz)-> el = div.find(".chosen-#{clazz}") - expect(el.size()).toBe(1) + expect(el.length).toBe(1) # test a few interactions event_sequence = [] diff --git a/spec/jquery/max_shown_results.spec.coffee b/spec/jquery/max_shown_results.spec.coffee index e37cb23b475..e329e16fc8a 100644 --- a/spec/jquery/max_shown_results.spec.coffee +++ b/spec/jquery/max_shown_results.spec.coffee @@ -16,7 +16,7 @@ describe "search", -> container.trigger("mousedown") # open the drop # Expect all results to be shown results = div.find(".active-result") - expect(results.size()).toBe(3) + expect(results.length).toBe(3) # Enter some text in the search field. search_field = div.find(".chosen-search input").first() @@ -25,7 +25,7 @@ describe "search", -> # Expect to only have one result: 'Afghanistan'. results = div.find(".active-result") - expect(results.size()).toBe(1) + expect(results.length).toBe(1) expect(results.first().text()).toBe "Afghanistan" it "should only show max_shown_results items in results", -> @@ -44,7 +44,7 @@ describe "search", -> container = div.find(".chosen-container") container.trigger("mousedown") # open the drop results = div.find(".active-result") - expect(results.size()).toBe(1) + expect(results.length).toBe(1) # Enter some text in the search field. search_field = div.find(".chosen-search input").first() @@ -53,12 +53,12 @@ describe "search", -> # Showing only one result: the one that occurs first. results = div.find(".active-result") - expect(results.size()).toBe(1) + expect(results.length).toBe(1) expect(results.first().text()).toBe "United States" # Showing still only one result, but not the first one. search_field.val("United Ki") search_field.trigger("keyup") results = div.find(".active-result") - expect(results.size()).toBe(1) + expect(results.length).toBe(1) expect(results.first().text()).toBe "United Kingdom" From 1c62a34ed1e4cdae61d12dc20c9cc5718cad83d6 Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Mon, 31 Jul 2017 15:09:27 +0200 Subject: [PATCH 12/37] Use the non-deprecated jQuery API to listen for events This bumps the min jQuery version to 1.7 rather than 1.6 --- README.md | 2 +- coffee/chosen.jquery.coffee | 76 ++++++++++++++++++------------------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/README.md b/README.md index 53164e7eef7..a3aa89e217b 100644 --- a/README.md +++ b/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: diff --git a/coffee/chosen.jquery.coffee b/coffee/chosen.jquery.coffee index 76e5bda0f1a..142edf9e72b 100644 --- a/coffee/chosen.jquery.coffee +++ b/coffee/chosen.jquery.coffee @@ -71,43 +71,43 @@ class Chosen extends AbstractChosen @form_field_jq.trigger("chosen:ready", {chosen: this}) register_observers: -> - @container.bind 'touchstart.chosen', (evt) => this.container_mousedown(evt); return - @container.bind 'touchend.chosen', (evt) => this.container_mouseup(evt); return - - @container.bind 'mousedown.chosen', (evt) => this.container_mousedown(evt); return - @container.bind 'mouseup.chosen', (evt) => this.container_mouseup(evt); return - @container.bind 'mouseenter.chosen', (evt) => this.mouse_enter(evt); return - @container.bind 'mouseleave.chosen', (evt) => this.mouse_leave(evt); return - - @search_results.bind 'mouseup.chosen', (evt) => this.search_results_mouseup(evt); return - @search_results.bind 'mouseover.chosen', (evt) => this.search_results_mouseover(evt); return - @search_results.bind 'mouseout.chosen', (evt) => this.search_results_mouseout(evt); return - @search_results.bind 'mousewheel.chosen DOMMouseScroll.chosen', (evt) => this.search_results_mousewheel(evt); return - - @search_results.bind 'touchstart.chosen', (evt) => this.search_results_touchstart(evt); return - @search_results.bind 'touchmove.chosen', (evt) => this.search_results_touchmove(evt); return - @search_results.bind 'touchend.chosen', (evt) => this.search_results_touchend(evt); return - - @form_field_jq.bind "chosen:updated.chosen", (evt) => this.results_update_field(evt); return - @form_field_jq.bind "chosen:activate.chosen", (evt) => this.activate_field(evt); return - @form_field_jq.bind "chosen:open.chosen", (evt) => this.container_mousedown(evt); return - @form_field_jq.bind "chosen:close.chosen", (evt) => this.close_field(evt); return - - @search_field.bind 'blur.chosen', (evt) => this.input_blur(evt); return - @search_field.bind 'keyup.chosen', (evt) => this.keyup_checker(evt); return - @search_field.bind 'keydown.chosen', (evt) => this.keydown_checker(evt); return - @search_field.bind 'focus.chosen', (evt) => this.input_focus(evt); return - @search_field.bind 'cut.chosen', (evt) => this.clipboard_event_checker(evt); return - @search_field.bind 'paste.chosen', (evt) => this.clipboard_event_checker(evt); return + @container.on 'touchstart.chosen', (evt) => this.container_mousedown(evt); return + @container.on 'touchend.chosen', (evt) => this.container_mouseup(evt); return + + @container.on 'mousedown.chosen', (evt) => this.container_mousedown(evt); return + @container.on 'mouseup.chosen', (evt) => this.container_mouseup(evt); return + @container.on 'mouseenter.chosen', (evt) => this.mouse_enter(evt); return + @container.on 'mouseleave.chosen', (evt) => this.mouse_leave(evt); return + + @search_results.on 'mouseup.chosen', (evt) => this.search_results_mouseup(evt); return + @search_results.on 'mouseover.chosen', (evt) => this.search_results_mouseover(evt); return + @search_results.on 'mouseout.chosen', (evt) => this.search_results_mouseout(evt); return + @search_results.on 'mousewheel.chosen DOMMouseScroll.chosen', (evt) => this.search_results_mousewheel(evt); return + + @search_results.on 'touchstart.chosen', (evt) => this.search_results_touchstart(evt); return + @search_results.on 'touchmove.chosen', (evt) => this.search_results_touchmove(evt); return + @search_results.on 'touchend.chosen', (evt) => this.search_results_touchend(evt); return + + @form_field_jq.on "chosen:updated.chosen", (evt) => this.results_update_field(evt); return + @form_field_jq.on "chosen:activate.chosen", (evt) => this.activate_field(evt); return + @form_field_jq.on "chosen:open.chosen", (evt) => this.container_mousedown(evt); return + @form_field_jq.on "chosen:close.chosen", (evt) => this.close_field(evt); return + + @search_field.on 'blur.chosen', (evt) => this.input_blur(evt); return + @search_field.on 'keyup.chosen', (evt) => this.keyup_checker(evt); return + @search_field.on 'keydown.chosen', (evt) => this.keydown_checker(evt); return + @search_field.on 'focus.chosen', (evt) => this.input_focus(evt); return + @search_field.on 'cut.chosen', (evt) => this.clipboard_event_checker(evt); return + @search_field.on 'paste.chosen', (evt) => this.clipboard_event_checker(evt); return if @is_multiple - @search_choices.bind 'click.chosen', (evt) => this.choices_click(evt); return + @search_choices.on 'click.chosen', (evt) => this.choices_click(evt); return else - @container.bind 'click.chosen', (evt) -> evt.preventDefault(); return # gobble click of anchor + @container.on 'click.chosen', (evt) -> evt.preventDefault(); return # gobble click of anchor destroy: -> - $(@container[0].ownerDocument).unbind 'click.chosen', @click_test_action - @form_field_label.unbind 'click.chosen' if @form_field_label.length > 0 + $(@container[0].ownerDocument).off 'click.chosen', @click_test_action + @form_field_label.off 'click.chosen' if @form_field_label.length > 0 if @search_field[0].tabIndex @form_field_jq[0].tabIndex = @search_field[0].tabIndex @@ -123,12 +123,12 @@ class Chosen extends AbstractChosen @search_field[0].disabled = @is_disabled unless @is_multiple - @selected_item.unbind 'focus.chosen', this.activate_field + @selected_item.off 'focus.chosen', this.activate_field if @is_disabled this.close_field() else unless @is_multiple - @selected_item.bind 'focus.chosen', this.activate_field + @selected_item.on 'focus.chosen', this.activate_field container_mousedown: (evt) -> return if @is_disabled @@ -139,7 +139,7 @@ class Chosen extends AbstractChosen if not (evt? and ($ evt.target).hasClass "search-choice-close") if not @active_field @search_field.val "" if @is_multiple - $(@container[0].ownerDocument).bind 'click.chosen', @click_test_action + $(@container[0].ownerDocument).on 'click.chosen', @click_test_action this.results_show() else if not @is_multiple and evt and (($(evt.target)[0] == @selected_item[0]) || $(evt.target).parents("a.chosen-single").length) evt.preventDefault() @@ -161,7 +161,7 @@ class Chosen extends AbstractChosen this.close_field() if not @active_field and @container.hasClass "chosen-container-active" close_field: -> - $(@container[0].ownerDocument).unbind "click.chosen", @click_test_action + $(@container[0].ownerDocument).off "click.chosen", @click_test_action @active_field = false this.results_hide() @@ -277,7 +277,7 @@ class Chosen extends AbstractChosen @form_field_label = $("label[for='#{@form_field.id}']") #next check for a for=#{id} if @form_field_label.length > 0 - @form_field_label.bind 'click.chosen', this.label_click_handler + @form_field_label.on 'click.chosen', this.label_click_handler show_search_field_default: -> if @is_multiple and this.choices_count() < 1 and not @active_field @@ -308,7 +308,7 @@ class Chosen extends AbstractChosen choice.addClass 'search-choice-disabled' else close_link = $('', { class: 'search-choice-close', 'data-option-array-index': item.array_index }) - close_link.bind 'click.chosen', (evt) => this.choice_destroy_link_click(evt) + close_link.on 'click.chosen', (evt) => this.choice_destroy_link_click(evt) choice.append close_link @search_container.before choice From 2c96f904dc58ce174ed2ef045a99656f3614f4e1 Mon Sep 17 00:00:00 2001 From: Arun Srinivasan Date: Thu, 22 Jun 2017 14:13:53 -0500 Subject: [PATCH 13/37] Don't search escaped HTML text Before this change, if you tried to search for "&" to match "Stuff & Nonsense", what we would do is html-escape _both_ things and compare the escaped strings. This works fine in the case where you just type "&". However, if you type "mp", that will match the html entity "&" in the middle of the html-escaped text we're comparing it to. Which is incorrect. Additionally, we highlight our "matched" result. When we do, we break up the entity so that the resulting HTML looks like: Stuff &amp; Nonsense And you get to see what basically looks like garbage on the screen. ![screen garbage](https://camo.githubusercontent.com/b5e384f3f622f3560739c287c481e05a7b0668af/68747470733a2f2f646c2e64726f70626f7875736572636f6e74656e742e636f6d2f7370612f7470786279757478626b747069347a2f6c7566336c7835792e706e67) This commit fixes all of that by just comparing the actual text of things. We avoid the problem previous addressed in #2254 by escaping each piece of the to-be-highlighted option text before assembling it into HTML. --- coffee/chosen.jquery.coffee | 2 +- coffee/chosen.proto.coffee | 2 +- coffee/lib/abstract-chosen.coffee | 9 ++++++--- spec/jquery/searching.spec.coffee | 28 ++++++++++++++++++++++++++++ spec/proto/searching.spec.coffee | 30 ++++++++++++++++++++++++++++++ 5 files changed, 66 insertions(+), 5 deletions(-) create mode 100644 spec/jquery/searching.spec.coffee create mode 100644 spec/proto/searching.spec.coffee diff --git a/coffee/chosen.jquery.coffee b/coffee/chosen.jquery.coffee index 76e5bda0f1a..00056315bfb 100644 --- a/coffee/chosen.jquery.coffee +++ b/coffee/chosen.jquery.coffee @@ -420,7 +420,7 @@ class Chosen extends AbstractChosen @search_field.val() get_search_text: -> - this.escape_html $.trim(this.get_search_field_value()) + $.trim this.get_search_field_value() escape_html: (text) -> $('
    ').text(text).html() diff --git a/coffee/chosen.proto.coffee b/coffee/chosen.proto.coffee index 218308280b7..d754a068c25 100644 --- a/coffee/chosen.proto.coffee +++ b/coffee/chosen.proto.coffee @@ -417,7 +417,7 @@ class @Chosen extends AbstractChosen @search_field.value get_search_text: -> - this.escape_html this.get_search_field_value().strip() + this.get_search_field_value().strip() escape_html: (text) -> text.escapeHTML() diff --git a/coffee/lib/abstract-chosen.coffee b/coffee/lib/abstract-chosen.coffee index 8b68764ebf8..25f1f847de3 100644 --- a/coffee/lib/abstract-chosen.coffee +++ b/coffee/lib/abstract-chosen.coffee @@ -185,7 +185,7 @@ class AbstractChosen results += 1 if results_group.active_options is 0 and results_group.search_match results_group.active_options += 1 - option.search_text = if option.group then option.label else option.html + option.search_text = if option.group then option.label else option.text unless option.group and not @group_search search_match = this.search_string_match(option.search_text, regex) @@ -193,11 +193,14 @@ class AbstractChosen results += 1 if option.search_match and not option.group + if option.search_match if searchText.length startpos = search_match.index - text = option.search_text.substr(0, startpos + searchText.length) + '' + option.search_text.substr(startpos + searchText.length) - option.search_text = text.substr(0, startpos) + '' + text.substr(startpos) + prefix = option.search_text.slice(0, startpos) + fix = option.search_text.slice(startpos, startpos + query.length) + suffix = option.search_text.slice(startpos + query.length) + option.search_text = "#{this.escape_html(prefix)}#{this.escape_html(fix)}#{this.escape_html(suffix)}" results_group.group_match = true if results_group? diff --git a/spec/jquery/searching.spec.coffee b/spec/jquery/searching.spec.coffee new file mode 100644 index 00000000000..cd52cf409a1 --- /dev/null +++ b/spec/jquery/searching.spec.coffee @@ -0,0 +1,28 @@ +describe "Searching", -> + it "should not match the actual text of HTML entities", -> + tmpl = " + + " + + div = $("
    ").html(tmpl) + select = div.find("select") + select.chosen({search_contains: true}) + + container = div.find(".chosen-container") + container.trigger("mousedown") # open the drop + + # Both options should be active + results = div.find(".active-result") + expect(results.size()).toBe(2) + + # Search for the html entity by name + search_field = div.find(".chosen-search input").first() + search_field.val("mp") + search_field.trigger("keyup") + + results = div.find(".active-result") + expect(results.size()).toBe(0) diff --git a/spec/proto/searching.spec.coffee b/spec/proto/searching.spec.coffee new file mode 100644 index 00000000000..1c2c803feb7 --- /dev/null +++ b/spec/proto/searching.spec.coffee @@ -0,0 +1,30 @@ +describe "Searching", -> + it "should not match the actual text of HTML entities", -> + tmpl = " + + " + + div = new Element('div') + document.body.insert(div) + div.update(tmpl) + select = div.down('select') + new Chosen(select, {search_contains: true}) + + container = div.down('.chosen-container') + simulant.fire(container, 'mousedown') # open the drop + + # Both options should be active + results = div.select('.active-result') + expect(results.length).toBe(2) + + # Search for the html entity by name + search_field = div.down(".chosen-search input") + search_field.value = "mp" + simulant.fire(search_field, 'keyup') + + results = div.select(".active-result") + expect(results.length).toBe(0) From 88019b4f01eb8330a1cc3412c65332d16a8a03a7 Mon Sep 17 00:00:00 2001 From: Arun Srinivasan Date: Thu, 22 Jun 2017 14:14:48 -0500 Subject: [PATCH 14/37] Rename `searchText` to `query` --- coffee/lib/abstract-chosen.coffee | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/coffee/lib/abstract-chosen.coffee b/coffee/lib/abstract-chosen.coffee index 25f1f847de3..426c9b57cc6 100644 --- a/coffee/lib/abstract-chosen.coffee +++ b/coffee/lib/abstract-chosen.coffee @@ -164,9 +164,9 @@ class AbstractChosen results = 0 - searchText = this.get_search_text() - escapedSearchText = searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&") - regex = this.get_search_regex(escapedSearchText) + query = this.get_search_text() + escapedQuery = query.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&") + regex = this.get_search_regex(escapedQuery) for option in @results_data @@ -195,7 +195,7 @@ class AbstractChosen if option.search_match - if searchText.length + if query.length startpos = search_match.index prefix = option.search_text.slice(0, startpos) fix = option.search_text.slice(startpos, startpos + query.length) @@ -209,9 +209,9 @@ class AbstractChosen this.result_clear_highlight() - if results < 1 and searchText.length + if results < 1 and query.length this.update_results_content "" - this.no_results searchText + this.no_results query else this.update_results_content this.results_option_build() this.winnow_results_set_highlight() From 475a808fdcc1e9bd9a546effe0f4be008fa3a6be Mon Sep 17 00:00:00 2001 From: Arun Srinivasan Date: Thu, 22 Jun 2017 14:19:01 -0500 Subject: [PATCH 15/37] Rename `search_text` to `highlighted_html` It's no longer being used for the searching/matching process and is now simply a string of highlighted html. --- coffee/lib/abstract-chosen.coffee | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/coffee/lib/abstract-chosen.coffee b/coffee/lib/abstract-chosen.coffee index 426c9b57cc6..a70b7db6919 100644 --- a/coffee/lib/abstract-chosen.coffee +++ b/coffee/lib/abstract-chosen.coffee @@ -116,7 +116,7 @@ class AbstractChosen option_el.className = classes.join(" ") option_el.style.cssText = option.style option_el.setAttribute("data-option-array-index", option.array_index) - option_el.innerHTML = option.search_text + option_el.innerHTML = option.highlighted_html or option.html option_el.title = option.title if option.title this.outerHTML(option_el) @@ -131,7 +131,7 @@ class AbstractChosen group_el = document.createElement("li") group_el.className = classes.join(" ") - group_el.innerHTML = group.search_text + group_el.innerHTML = group.highlighted_html or group.label group_el.title = group.title if group.title this.outerHTML(group_el) @@ -173,6 +173,7 @@ class AbstractChosen option.search_match = false results_group = null search_match = null + option.highlighted_html = '' if this.include_option_in_results(option) @@ -200,7 +201,7 @@ class AbstractChosen prefix = option.search_text.slice(0, startpos) fix = option.search_text.slice(startpos, startpos + query.length) suffix = option.search_text.slice(startpos + query.length) - option.search_text = "#{this.escape_html(prefix)}#{this.escape_html(fix)}#{this.escape_html(suffix)}" + option.highlighted_html = "#{this.escape_html(prefix)}#{this.escape_html(fix)}#{this.escape_html(suffix)}" results_group.group_match = true if results_group? From 07e5179495ffde1ef968219be4348648b5aed9f4 Mon Sep 17 00:00:00 2001 From: Arun Srinivasan Date: Thu, 22 Jun 2017 14:21:57 -0500 Subject: [PATCH 16/37] Refactor `option.search_text` to be a local variable --- coffee/lib/abstract-chosen.coffee | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/coffee/lib/abstract-chosen.coffee b/coffee/lib/abstract-chosen.coffee index a70b7db6919..0608d6f72d7 100644 --- a/coffee/lib/abstract-chosen.coffee +++ b/coffee/lib/abstract-chosen.coffee @@ -186,21 +186,20 @@ class AbstractChosen results += 1 if results_group.active_options is 0 and results_group.search_match results_group.active_options += 1 - option.search_text = if option.group then option.label else option.text + text = if option.group then option.label else option.text unless option.group and not @group_search - search_match = this.search_string_match(option.search_text, regex) + search_match = this.search_string_match(text, regex) option.search_match = search_match? results += 1 if option.search_match and not option.group - if option.search_match if query.length startpos = search_match.index - prefix = option.search_text.slice(0, startpos) - fix = option.search_text.slice(startpos, startpos + query.length) - suffix = option.search_text.slice(startpos + query.length) + prefix = text.slice(0, startpos) + fix = text.slice(startpos, startpos + query.length) + suffix = text.slice(startpos + query.length) option.highlighted_html = "#{this.escape_html(prefix)}#{this.escape_html(fix)}#{this.escape_html(suffix)}" results_group.group_match = true if results_group? From 39bd9c05bf889e4a2b9b565daa5f826e1ce7e225 Mon Sep 17 00:00:00 2001 From: Andrew Dunkman Date: Mon, 21 Aug 2017 18:08:13 -0400 Subject: [PATCH 17/37] Clear input value when selecting a result. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The input value should be cleared when selecting a result, even if the dropdown isn’t hidden immediately (as per setting). --- coffee/chosen.jquery.coffee | 5 ++++- coffee/chosen.proto.coffee | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/coffee/chosen.jquery.coffee b/coffee/chosen.jquery.coffee index 00056315bfb..a62a8470818 100644 --- a/coffee/chosen.jquery.coffee +++ b/coffee/chosen.jquery.coffee @@ -366,13 +366,16 @@ class Chosen extends AbstractChosen @form_field.options[item.options_index].selected = true @selected_option_count = null + @search_field.val("") if @is_multiple this.choice_build item else this.single_set_selected_text(this.choice_label(item)) - unless @is_multiple && (!@hide_results_on_select || (evt.metaKey or evt.ctrlKey)) + if @is_multiple && (!@hide_results_on_select || (evt.metaKey or evt.ctrlKey)) + this.winnow_results() + else this.results_hide() this.show_search_field_default() diff --git a/coffee/chosen.proto.coffee b/coffee/chosen.proto.coffee index d754a068c25..5aedd76018d 100644 --- a/coffee/chosen.proto.coffee +++ b/coffee/chosen.proto.coffee @@ -364,13 +364,16 @@ class @Chosen extends AbstractChosen @form_field.options[item.options_index].selected = true @selected_option_count = null + @search_field.value = "" if @is_multiple this.choice_build item else this.single_set_selected_text(this.choice_label(item)) - unless @is_multiple && (!@hide_results_on_select || (evt.metaKey or evt.ctrlKey)) + if @is_multiple && (!@hide_results_on_select || (evt.metaKey or evt.ctrlKey)) + this.winnow_results() + else this.results_hide() this.show_search_field_default() From 1815ba0c90806a01a8b71207fcd613c0f82c3e97 Mon Sep 17 00:00:00 2001 From: Andrew Dunkman Date: Wed, 23 Aug 2017 11:42:21 -0400 Subject: [PATCH 18/37] Use .length instead of .size(). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit .size() isn’t a thing anymore. --- spec/jquery/searching.spec.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/jquery/searching.spec.coffee b/spec/jquery/searching.spec.coffee index cd52cf409a1..b1b49f7980b 100644 --- a/spec/jquery/searching.spec.coffee +++ b/spec/jquery/searching.spec.coffee @@ -17,7 +17,7 @@ describe "Searching", -> # Both options should be active results = div.find(".active-result") - expect(results.size()).toBe(2) + expect(results.length).toBe(2) # Search for the html entity by name search_field = div.find(".chosen-search input").first() @@ -25,4 +25,4 @@ describe "Searching", -> search_field.trigger("keyup") results = div.find(".active-result") - expect(results.size()).toBe(0) + expect(results.length).toBe(0) From 3e5da690fe13d9fca4367ca7c482c983f5779ca2 Mon Sep 17 00:00:00 2001 From: Patrick Filler Date: Thu, 24 Aug 2017 14:52:39 -0400 Subject: [PATCH 19/37] Replace outdated secure token My old token was deleted! --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e9e5fc596c1..67da37df4ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,4 +25,4 @@ after_success: ./publish-package.sh env: global: - secure: FHc3fAbJDydJywQ3HcFrTxqyAmmKbiAwP5Bi3qIzvXXCKNYbZb45iSjrMPFq7sHQR/evxDKl3zzBd8k6lvx0Sr77GDkmbN7HjI22fb3wu1Pi3WhmIM90/70ATs6hSZunsNEHCtQa4fDFM3NYeOeiwHFX8HQ9tVlqtjeAZngONL8= + secure: "SOYNh0YO4eLAM38FQxrg7iqytXgdjJHRkmj/1lFzGrGeuuXP6Owe/2TaMyTJXWb9nHAAtRRwQyhAUE07eKhxI6b3YNyozeRulMK4B0K8P3P1B2MslpROyvQYtZupno3dWc0tyvsQ3ucnZE25mtetH6KYcwiI+vHv6hT8HnzBnp0=" From 736b4299d1204702ce4412448a563cf7a011f06a Mon Sep 17 00:00:00 2001 From: Andrew Dunkman Date: Thu, 24 Aug 2017 15:37:07 -0400 Subject: [PATCH 20/37] Publish 1.8.0 --- package.json | 2 +- public/index.html | 2 +- public/index.proto.html | 2 +- public/options.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 65205e3c334..a329cc0ca31 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "author": "harvest", "name": "chosen", - "version": "1.7.0", + "version": "1.8.0", "description": "Chosen is a JavaScript plugin that makes select boxes user-friendly. It is currently available in both jQuery and Prototype flavors.", "keywords": [ "select", diff --git a/public/index.html b/public/index.html index fda0d266d0e..fe728ce1a4a 100644 --- a/public/index.html +++ b/public/index.html @@ -15,7 +15,7 @@
    -

    Chosen (v1.7.0)

    +

    Chosen (v1.8.0)

    Chosen is a jQuery plugin that makes long, unwieldy select boxes much more user-friendly.

    diff --git a/public/index.proto.html b/public/index.proto.html index 46dfdde143f..36d754b30e5 100644 --- a/public/index.proto.html +++ b/public/index.proto.html @@ -14,7 +14,7 @@
    -

    Chosen - Prototype Version (v1.7.0)

    +

    Chosen - Prototype Version (v1.8.0)

    Chosen is a Prototype plugin that makes long, unwieldy select boxes much more user-friendly.

    diff --git a/public/options.html b/public/options.html index 97e12fed4b3..5b18c0c29fe 100644 --- a/public/options.html +++ b/public/options.html @@ -15,7 +15,7 @@
    -

    Chosen (v1.7.0)

    +

    Chosen (v1.8.0)

    Chosen has a number of options and attributes that allow you to have full control of your select boxes.

    From 4c82d9ec7f0a57cfd0ff638c69b61edb0e72595f Mon Sep 17 00:00:00 2001 From: Andrew Dunkman Date: Tue, 29 Aug 2017 15:55:26 -0400 Subject: [PATCH 21/37] Add tests for searching Chinese characters. --- coffee/lib/abstract-chosen.coffee | 3 +- spec/jquery/searching.spec.coffee | 141 +++++++++++++++++++++++++++++ spec/proto/searching.spec.coffee | 146 ++++++++++++++++++++++++++++++ 3 files changed, 289 insertions(+), 1 deletion(-) diff --git a/coffee/lib/abstract-chosen.coffee b/coffee/lib/abstract-chosen.coffee index 0608d6f72d7..1401e9b97a8 100644 --- a/coffee/lib/abstract-chosen.coffee +++ b/coffee/lib/abstract-chosen.coffee @@ -197,6 +197,7 @@ class AbstractChosen if option.search_match if query.length startpos = search_match.index + startpos += 1 if /\s/.test(search_match[0]) # make up for lack of lookbehind operator prefix = text.slice(0, startpos) fix = text.slice(startpos, startpos + query.length) suffix = text.slice(startpos + query.length) @@ -217,7 +218,7 @@ class AbstractChosen this.winnow_results_set_highlight() get_search_regex: (escaped_search_string) -> - regex_string = if @search_contains then escaped_search_string else "\\b#{escaped_search_string}\\w*\\b" + regex_string = if @search_contains then escaped_search_string else "(?:^|\\s)#{escaped_search_string}[^\\s]*" regex_string = "^#{regex_string}" unless @enable_split_word_search or @search_contains regex_flag = if @case_sensitive_search then "" else "i" new RegExp(regex_string, regex_flag) diff --git a/spec/jquery/searching.spec.coffee b/spec/jquery/searching.spec.coffee index b1b49f7980b..cb46cb23207 100644 --- a/spec/jquery/searching.spec.coffee +++ b/spec/jquery/searching.spec.coffee @@ -26,3 +26,144 @@ describe "Searching", -> results = div.find(".active-result") expect(results.length).toBe(0) + + it "matches in non-ascii languages like Chinese when selecting a single item", -> + div = $("
    ").html(""" + + """) + + div.find("select").chosen() + div.find(".chosen-container").trigger("mousedown") # open the drop + + expect(div.find(".active-result").length).toBe(12) + + search_field = div.find(".chosen-search-input").first() + search_field.val("一") + search_field.trigger("keyup") + + expect(div.find(".active-result").length).toBe(1) + expect(div.find(".active-result")[0].innerHTML).toBe("一") + + it "matches in non-ascii languages like Chinese when selecting a single item with search_contains", -> + div = $("
    ").html(""" + + """) + + div.find("select").chosen({search_contains: true}) + div.find(".chosen-container").trigger("mousedown") # open the drop + + expect(div.find(".active-result").length).toBe(12) + + search_field = div.find(".chosen-search-input").first() + search_field.val("一") + search_field.trigger("keyup") + + expect(div.find(".active-result").length).toBe(2) + expect(div.find(".active-result")[0].innerHTML).toBe("一") + expect(div.find(".active-result")[1].innerHTML).toBe("十一") + + it "matches in non-ascii languages like Chinese when selecting multiple items", -> + div = $("
    ").html(""" + + """) + + div.find("select").chosen() + div.find(".chosen-container").trigger("mousedown") # open the drop + + expect(div.find(".active-result").length).toBe(12) + + search_field = div.find(".chosen-search-input") + search_field.val("一") + search_field.trigger("keyup") + + expect(div.find(".active-result").length).toBe(1) + expect(div.find(".active-result")[0].innerHTML).toBe("一") + + it "matches in non-ascii languages like Chinese when selecting multiple items with search_contains", -> + div = $("
    ").html(""" + + """) + + div.find("select").chosen({search_contains: true}) + div.find(".chosen-container").trigger("mousedown") # open the drop + + expect(div.find(".active-result").length).toBe(12) + + search_field = div.find(".chosen-search-input") + search_field.val("一") + search_field.trigger("keyup") + + expect(div.find(".active-result").length).toBe(2) + expect(div.find(".active-result")[0].innerHTML).toBe("一") + expect(div.find(".active-result")[1].innerHTML).toBe("十一") + + it "highlights results correctly when multiple words are present", -> + div = $("
    ").html(""" + + """) + + div.find("select").chosen() + div.find(".chosen-container").trigger("mousedown") # open the drop + + expect(div.find(".active-result").length).toBe(1) + + search_field = div.find(".chosen-search-input") + search_field.val("h") + search_field.trigger("keyup") + + expect(div.find(".active-result").length).toBe(1) + expect(div.find(".active-result")[0].innerHTML).toBe("oh hello") diff --git a/spec/proto/searching.spec.coffee b/spec/proto/searching.spec.coffee index 1c2c803feb7..4ce19906658 100644 --- a/spec/proto/searching.spec.coffee +++ b/spec/proto/searching.spec.coffee @@ -28,3 +28,149 @@ describe "Searching", -> results = div.select(".active-result") expect(results.length).toBe(0) + + it "matches in non-ascii languages like Chinese when selecting a single item", -> + div = new Element("div") + div.update(""" + + """) + + new Chosen(div.down("select")) + simulant.fire(div.down(".chosen-container"), "mousedown") # open the drop + + expect(div.select(".active-result").length).toBe(12) + + search_field = div.down(".chosen-search-input") + search_field.value = "一" + simulant.fire(search_field, "keyup") + + expect(div.select(".active-result").length).toBe(1) + expect(div.select(".active-result")[0].innerHTML).toBe("一") + + it "matches in non-ascii languages like Chinese when selecting a single item with search_contains", -> + div = new Element("div") + div.update(""" + + """) + + new Chosen(div.down("select"), {search_contains: true}) + simulant.fire(div.down(".chosen-container"), "mousedown") # open the drop + + expect(div.select(".active-result").length).toBe(12) + + search_field = div.down(".chosen-search-input") + search_field.value = "一" + simulant.fire(search_field, "keyup") + + expect(div.select(".active-result").length).toBe(2) + expect(div.select(".active-result")[0].innerHTML).toBe("一") + expect(div.select(".active-result")[1].innerHTML).toBe("十一") + + it "matches in non-ascii languages like Chinese when selecting multiple items", -> + div = new Element("div") + div.update(""" + + """) + + new Chosen(div.down("select")) + simulant.fire(div.down(".chosen-container"), "mousedown") # open the drop + + expect(div.select(".active-result").length).toBe(12) + + search_field = div.down(".chosen-search-input") + search_field.value = "一" + simulant.fire(search_field, "keyup") + + expect(div.select(".active-result").length).toBe(1) + expect(div.select(".active-result")[0].innerHTML).toBe("一") + + it "matches in non-ascii languages like Chinese when selecting multiple items with search_contains", -> + div = new Element("div") + div.update(""" + + """) + + new Chosen(div.down("select"), {search_contains: true}) + simulant.fire(div.down(".chosen-container"), "mousedown") # open the drop + + expect(div.select(".active-result").length).toBe(12) + + search_field = div.down(".chosen-search-input") + search_field.value = "一" + simulant.fire(search_field, "keyup") + + expect(div.select(".active-result").length).toBe(2) + expect(div.select(".active-result")[0].innerHTML).toBe("一") + expect(div.select(".active-result")[1].innerHTML).toBe("十一") + + it "highlights results correctly when multiple words are present", -> + div = new Element("div") + div.update(""" + + """) + + new Chosen(div.down("select")) + simulant.fire(div.down(".chosen-container"), "mousedown") # open the drop + + expect(div.select(".active-result").length).toBe(1) + + search_field = div.down(".chosen-search-input") + search_field.value = "h" + simulant.fire(search_field, "keyup") + + expect(div.select(".active-result").length).toBe(1) + expect(div.select(".active-result")[0].innerHTML).toBe("oh hello") From ffd59195ab71ce5f50f686146ebee54476154001 Mon Sep 17 00:00:00 2001 From: Andrew Dunkman Date: Thu, 31 Aug 2017 17:05:06 -0400 Subject: [PATCH 22/37] Use capture groups more intelligently. --- coffee/lib/abstract-chosen.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coffee/lib/abstract-chosen.coffee b/coffee/lib/abstract-chosen.coffee index 1401e9b97a8..e535b6fd36d 100644 --- a/coffee/lib/abstract-chosen.coffee +++ b/coffee/lib/abstract-chosen.coffee @@ -197,7 +197,7 @@ class AbstractChosen if option.search_match if query.length startpos = search_match.index - startpos += 1 if /\s/.test(search_match[0]) # make up for lack of lookbehind operator + startpos += 1 if search_match[1] # make up for lack of lookbehind operator prefix = text.slice(0, startpos) fix = text.slice(startpos, startpos + query.length) suffix = text.slice(startpos + query.length) @@ -218,7 +218,7 @@ class AbstractChosen this.winnow_results_set_highlight() get_search_regex: (escaped_search_string) -> - regex_string = if @search_contains then escaped_search_string else "(?:^|\\s)#{escaped_search_string}[^\\s]*" + regex_string = if @search_contains then escaped_search_string else "(^|\\s)#{escaped_search_string}[^\\s]*" regex_string = "^#{regex_string}" unless @enable_split_word_search or @search_contains regex_flag = if @case_sensitive_search then "" else "i" new RegExp(regex_string, regex_flag) From 9d613cf304028b55ca5af9d85e09fece68af96f2 Mon Sep 17 00:00:00 2001 From: Andrew Dunkman Date: Thu, 31 Aug 2017 17:07:43 -0400 Subject: [PATCH 23/37] Move index adjustment closer to related expression. --- coffee/lib/abstract-chosen.coffee | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/coffee/lib/abstract-chosen.coffee b/coffee/lib/abstract-chosen.coffee index e535b6fd36d..3c3011fccd4 100644 --- a/coffee/lib/abstract-chosen.coffee +++ b/coffee/lib/abstract-chosen.coffee @@ -197,7 +197,6 @@ class AbstractChosen if option.search_match if query.length startpos = search_match.index - startpos += 1 if search_match[1] # make up for lack of lookbehind operator prefix = text.slice(0, startpos) fix = text.slice(startpos, startpos + query.length) suffix = text.slice(startpos + query.length) @@ -224,7 +223,9 @@ class AbstractChosen new RegExp(regex_string, regex_flag) search_string_match: (search_string, regex) -> - regex.exec(search_string) + match = regex.exec(search_string) + match.index += 1 if !@search_contains && match?[1] # make up for lack of lookbehind operator in regex + match choices_count: -> return @selected_option_count if @selected_option_count? From 1282a81c82e0b6f072ad2fdabc77921c7c6b0e9d Mon Sep 17 00:00:00 2001 From: Andrew Dunkman Date: Thu, 31 Aug 2017 16:33:51 -0400 Subject: [PATCH 24/37] Do not escape group labels. This results in double-escaping of group labels. --- coffee/lib/select-parser.coffee | 17 +----------- spec/jquery/searching.spec.coffee | 42 +++++++++++++++++++++++++++++ spec/proto/searching.spec.coffee | 44 +++++++++++++++++++++++++++++++ 3 files changed, 87 insertions(+), 16 deletions(-) diff --git a/coffee/lib/select-parser.coffee b/coffee/lib/select-parser.coffee index 3cd0637b2d0..86258e3b77a 100644 --- a/coffee/lib/select-parser.coffee +++ b/coffee/lib/select-parser.coffee @@ -15,7 +15,7 @@ class SelectParser @parsed.push array_index: group_position group: true - label: this.escapeExpression(group.label) + label: group.label title: group.title if group.title children: 0 disabled: group.disabled, @@ -47,21 +47,6 @@ class SelectParser empty: true @options_index += 1 - escapeExpression: (text) -> - if not text? or text is false - return "" - unless /[\&\<\>\"\'\`]/.test(text) - return text - map = - "<": "<" - ">": ">" - '"': """ - "'": "'" - "`": "`" - unsafe_chars = /&(?!\w+;)|[\<\>\"\'\`]/g - text.replace unsafe_chars, (chr) -> - map[chr] || "&" - SelectParser.select_to_array = (select) -> parser = new SelectParser() parser.add_node( child ) for child in select.childNodes diff --git a/spec/jquery/searching.spec.coffee b/spec/jquery/searching.spec.coffee index b1b49f7980b..d9ee0135467 100644 --- a/spec/jquery/searching.spec.coffee +++ b/spec/jquery/searching.spec.coffee @@ -26,3 +26,45 @@ describe "Searching", -> results = div.find(".active-result") expect(results.length).toBe(0) + + it "renders options correctly when they contain characters that require HTML encoding", -> + div = $("
    ").html(""" + + """) + + div.find("select").chosen() + div.find(".chosen-container").trigger("mousedown") # open the drop + + expect(div.find(".active-result").length).toBe(1) + expect(div.find(".active-result").first().html()).toBe("A & B") + + search_field = div.find(".chosen-search-input").first() + search_field.val("A") + search_field.trigger("keyup") + + expect(div.find(".active-result").length).toBe(1) + expect(div.find(".active-result").first().html()).toBe("A & B") + + it "renders optgroups correctly when they contain characters that require HTML encoding", -> + div = $("
    ").html(""" + + """) + + div.find("select").chosen() + div.find(".chosen-container").trigger("mousedown") # open the drop + + expect(div.find(".group-result").length).toBe(1) + expect(div.find(".group-result").first().html()).toBe("A & B") + + search_field = div.find(".chosen-search-input").first() + search_field.val("A") + search_field.trigger("keyup") + + expect(div.find(".group-result").length).toBe(1) + expect(div.find(".group-result").first().html()).toBe("A & B") diff --git a/spec/proto/searching.spec.coffee b/spec/proto/searching.spec.coffee index 1c2c803feb7..69a5cdc2bf6 100644 --- a/spec/proto/searching.spec.coffee +++ b/spec/proto/searching.spec.coffee @@ -28,3 +28,47 @@ describe "Searching", -> results = div.select(".active-result") expect(results.length).toBe(0) + + it "renders options correctly when they contain characters that require HTML encoding", -> + div = new Element("div") + div.update(""" + + """) + + new Chosen(div.down("select")) + simulant.fire(div.down(".chosen-container"), "mousedown") # open the drop + + expect(div.select(".active-result").length).toBe(1) + expect(div.down(".active-result").innerHTML).toBe("A & B") + + search_field = div.down(".chosen-search-input") + search_field.value = "A" + simulant.fire(search_field, "keyup") + + expect(div.select(".active-result").length).toBe(1) + expect(div.down(".active-result").innerHTML).toBe("A & B") + + it "renders optgroups correctly when they contain characters that require HTML encoding", -> + div = new Element("div") + div.update(""" + + """) + + new Chosen(div.down("select")) + simulant.fire(div.down(".chosen-container"), "mousedown") # open the drop + + expect(div.select(".group-result").length).toBe(1) + expect(div.down(".group-result").innerHTML).toBe("A & B") + + search_field = div.down(".chosen-search-input") + search_field.value = "A" + simulant.fire(search_field, "keyup") + + expect(div.select(".group-result").length).toBe(1) + expect(div.down(".group-result").innerHTML).toBe("A & B") From 538a832387a9d20abcc33a5bd5a5dd3bfe33b8bd Mon Sep 17 00:00:00 2001 From: Andrew Dunkman Date: Thu, 31 Aug 2017 16:46:10 -0400 Subject: [PATCH 25/37] Escape typed text in no results message. --- coffee/chosen.proto.coffee | 8 +------- coffee/lib/abstract-chosen.coffee | 2 +- spec/jquery/searching.spec.coffee | 23 +++++++++++++++++++++++ spec/proto/searching.spec.coffee | 24 ++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 8 deletions(-) diff --git a/coffee/chosen.proto.coffee b/coffee/chosen.proto.coffee index 5aedd76018d..86ba904fa44 100644 --- a/coffee/chosen.proto.coffee +++ b/coffee/chosen.proto.coffee @@ -3,12 +3,6 @@ class @Chosen extends AbstractChosen setup: -> @current_selectedIndex = @form_field.selectedIndex - set_default_values: -> - super() - - # HTML Templates - @no_results_temp = new Template(this.get_no_results_html('#{terms}')) - set_up_html: -> container_classes = ["chosen-container"] container_classes.push "chosen-container-" + (if @is_multiple then "multi" else "single") @@ -435,7 +429,7 @@ class @Chosen extends AbstractChosen this.result_do_highlight do_high if do_high? no_results: (terms) -> - @search_results.insert @no_results_temp.evaluate( terms: terms ) + @search_results.insert this.get_no_results_html(terms) @form_field.fire("chosen:no_results", {chosen: this}) no_results_clear: -> diff --git a/coffee/lib/abstract-chosen.coffee b/coffee/lib/abstract-chosen.coffee index 0608d6f72d7..4bc24dc7bda 100644 --- a/coffee/lib/abstract-chosen.coffee +++ b/coffee/lib/abstract-chosen.coffee @@ -356,7 +356,7 @@ class AbstractChosen get_no_results_html: (terms) -> """
  • - #{@results_none_found} #{terms} + #{@results_none_found} #{this.escape_html(terms)}
    • """ diff --git a/spec/jquery/searching.spec.coffee b/spec/jquery/searching.spec.coffee index d9ee0135467..8a138d354f1 100644 --- a/spec/jquery/searching.spec.coffee +++ b/spec/jquery/searching.spec.coffee @@ -68,3 +68,26 @@ describe "Searching", -> expect(div.find(".group-result").length).toBe(1) expect(div.find(".group-result").first().html()).toBe("A & B") + + it "renders no results message correctly when it contains characters that require HTML encoding", -> + div = $("
    ").html(""" + + """) + + div.find("select").chosen() + div.find(".chosen-container").trigger("mousedown") # open the drop + + search_field = div.find(".chosen-search-input").first() + search_field.val("&") + search_field.trigger("keyup") + + expect(div.find(".no-results").length).toBe(1) + expect(div.find(".no-results").first().html().trim()).toBe("No results match &") + + search_field.val("&") + search_field.trigger("keyup") + + expect(div.find(".no-results").length).toBe(1) + expect(div.find(".no-results").first().html().trim()).toBe("No results match &amp;") diff --git a/spec/proto/searching.spec.coffee b/spec/proto/searching.spec.coffee index 69a5cdc2bf6..497ebb0692b 100644 --- a/spec/proto/searching.spec.coffee +++ b/spec/proto/searching.spec.coffee @@ -72,3 +72,27 @@ describe "Searching", -> expect(div.select(".group-result").length).toBe(1) expect(div.down(".group-result").innerHTML).toBe("A & B") + + it "renders no results message correctly when it contains characters that require HTML encoding", -> + div = new Element("div") + div.update(""" + + """) + + new Chosen(div.down("select")) + simulant.fire(div.down(".chosen-container"), "mousedown") # open the drop + + search_field = div.down(".chosen-search-input") + search_field.value = "&" + simulant.fire(search_field, "keyup") + + expect(div.select(".no-results").length).toBe(1) + expect(div.down(".no-results").innerHTML.trim()).toBe("No results match &") + + search_field.value = "&" + simulant.fire(search_field, "keyup") + + expect(div.select(".no-results").length).toBe(1) + expect(div.down(".no-results").innerHTML.trim()).toBe("No results match &amp;") From fb6e071ec3992979b87ada5cdd318179bc116683 Mon Sep 17 00:00:00 2001 From: Arun Srinivasan Date: Fri, 1 Sep 2017 13:57:59 -0500 Subject: [PATCH 26/37] Find strings starting after non-string characters Restores old word-boundary matching behavior while also preserving the new whitespace-based word-boundary matching for non-ASCII languages. Adds a test for the common word-starters that we think are especially important. --- coffee/lib/abstract-chosen.coffee | 2 +- spec/jquery/searching.spec.coffee | 32 ++++++++++++++++++++++++++++++ spec/proto/searching.spec.coffee | 33 +++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 1 deletion(-) diff --git a/coffee/lib/abstract-chosen.coffee b/coffee/lib/abstract-chosen.coffee index 3c3011fccd4..6a32437e7cd 100644 --- a/coffee/lib/abstract-chosen.coffee +++ b/coffee/lib/abstract-chosen.coffee @@ -217,7 +217,7 @@ class AbstractChosen this.winnow_results_set_highlight() get_search_regex: (escaped_search_string) -> - regex_string = if @search_contains then escaped_search_string else "(^|\\s)#{escaped_search_string}[^\\s]*" + regex_string = if @search_contains then escaped_search_string else "(^|\\s|\\b)#{escaped_search_string}[^\\s]*" regex_string = "^#{regex_string}" unless @enable_split_word_search or @search_contains regex_flag = if @case_sensitive_search then "" else "i" new RegExp(regex_string, regex_flag) diff --git a/spec/jquery/searching.spec.coffee b/spec/jquery/searching.spec.coffee index cb46cb23207..efd71a41f8c 100644 --- a/spec/jquery/searching.spec.coffee +++ b/spec/jquery/searching.spec.coffee @@ -167,3 +167,35 @@ describe "Searching", -> expect(div.find(".active-result").length).toBe(1) expect(div.find(".active-result")[0].innerHTML).toBe("oh hello") + + describe "respects word boundaries when not using search_contains", -> + div = $("
    ").html(""" + + """) + + div.find("select").chosen() + div.find(".chosen-container").trigger("mousedown") # open the drop + + search_field = div.find(".chosen-search-input") + + div.find("option").each () -> + boundary_thing = this.value.slice(1) + it "correctly finds words that start after a(n) #{boundary_thing}", -> + search_field.val(boundary_thing) + search_field.trigger("keyup") + expect(div.find(".active-result").length).toBe(1) + expect(div.find(".active-result")[0].innerText.slice(1)).toBe(boundary_thing) diff --git a/spec/proto/searching.spec.coffee b/spec/proto/searching.spec.coffee index 4ce19906658..cd552e5d450 100644 --- a/spec/proto/searching.spec.coffee +++ b/spec/proto/searching.spec.coffee @@ -174,3 +174,36 @@ describe "Searching", -> expect(div.select(".active-result").length).toBe(1) expect(div.select(".active-result")[0].innerHTML).toBe("oh hello") + + describe "respects word boundaries when not using search_contains", -> + div = new Element("div") + div.update(""" + + """) + + new Chosen(div.down("select")) + simulant.fire(div.down(".chosen-container"), "mousedown") # open the drop + + search_field = div.down(".chosen-search-input") + + div.select("option").forEach (option) -> + boundary_thing = option.value.slice(1) + it "correctly finds words that start after a(n) #{boundary_thing}", -> + search_field.value = boundary_thing + simulant.fire(search_field, "keyup") + expect(div.select(".active-result").length).toBe(1) + expect(div.select(".active-result")[0].innerText.slice(1)).toBe(boundary_thing) From c6974087dce6807df5b9000814e586f4eef151ae Mon Sep 17 00:00:00 2001 From: Andrew Dunkman Date: Thu, 31 Aug 2017 18:01:51 -0400 Subject: [PATCH 27/37] Only trim to container_width when calculable. --- coffee/chosen.jquery.coffee | 5 ++--- coffee/chosen.proto.coffee | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/coffee/chosen.jquery.coffee b/coffee/chosen.jquery.coffee index a8ba80d528a..203af36aeda 100644 --- a/coffee/chosen.jquery.coffee +++ b/coffee/chosen.jquery.coffee @@ -500,9 +500,8 @@ class Chosen extends AbstractChosen width = div.width() + 25 div.remove() - container_width = @container.outerWidth() - - width = Math.min(container_width - 10, width) + if @container.is(':visible') + width = Math.min(@container.outerWidth() - 10, width) @search_field.width(width) diff --git a/coffee/chosen.proto.coffee b/coffee/chosen.proto.coffee index 5aedd76018d..2090405db79 100644 --- a/coffee/chosen.proto.coffee +++ b/coffee/chosen.proto.coffee @@ -505,9 +505,8 @@ class @Chosen extends AbstractChosen width = div.measure('width') + 25 div.remove() - container_width = @container.getWidth() - - width = Math.min(container_width - 10, width) + if container_width = @container.getWidth() + width = Math.min(container_width - 10, width) @search_field.setStyle(width: width + 'px') From 908b0bfc819ef407532c7bf289959045ea3c0b34 Mon Sep 17 00:00:00 2001 From: Andrew Dunkman Date: Tue, 5 Sep 2017 14:41:44 -0400 Subject: [PATCH 28/37] Release v1.8.1 --- package.json | 2 +- public/index.html | 2 +- public/index.proto.html | 2 +- public/options.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index a329cc0ca31..3004ba96020 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "author": "harvest", "name": "chosen", - "version": "1.8.0", + "version": "1.8.1", "description": "Chosen is a JavaScript plugin that makes select boxes user-friendly. It is currently available in both jQuery and Prototype flavors.", "keywords": [ "select", diff --git a/public/index.html b/public/index.html index fe728ce1a4a..01d8aae9f5c 100644 --- a/public/index.html +++ b/public/index.html @@ -15,7 +15,7 @@
    -

    Chosen (v1.8.0)

    +

    Chosen (v1.8.1)

    Chosen is a jQuery plugin that makes long, unwieldy select boxes much more user-friendly.

    diff --git a/public/index.proto.html b/public/index.proto.html index 36d754b30e5..b226d5241f0 100644 --- a/public/index.proto.html +++ b/public/index.proto.html @@ -14,7 +14,7 @@
    -

    Chosen - Prototype Version (v1.8.0)

    +

    Chosen - Prototype Version (v1.8.1)

    Chosen is a Prototype plugin that makes long, unwieldy select boxes much more user-friendly.

    diff --git a/public/options.html b/public/options.html index 5b18c0c29fe..8efaf1f0242 100644 --- a/public/options.html +++ b/public/options.html @@ -15,7 +15,7 @@
    -

    Chosen (v1.8.0)

    +

    Chosen (v1.8.1)

    Chosen has a number of options and attributes that allow you to have full control of your select boxes.

    From 42d9c88e0498f99a61a2918499c3865347311186 Mon Sep 17 00:00:00 2001 From: Andrew Dunkman Date: Tue, 5 Sep 2017 15:44:56 -0400 Subject: [PATCH 29/37] Escape optgroup label when appending to HTML. --- coffee/lib/abstract-chosen.coffee | 2 +- spec/jquery/searching.spec.coffee | 17 ++++++++++++++++- spec/proto/searching.spec.coffee | 16 ++++++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/coffee/lib/abstract-chosen.coffee b/coffee/lib/abstract-chosen.coffee index b42391f0104..a83c194f826 100644 --- a/coffee/lib/abstract-chosen.coffee +++ b/coffee/lib/abstract-chosen.coffee @@ -131,7 +131,7 @@ class AbstractChosen group_el = document.createElement("li") group_el.className = classes.join(" ") - group_el.innerHTML = group.highlighted_html or group.label + group_el.innerHTML = group.highlighted_html or this.escape_html(group.label) group_el.title = group.title if group.title this.outerHTML(group_el) diff --git a/spec/jquery/searching.spec.coffee b/spec/jquery/searching.spec.coffee index 7368ad8378b..d17f62f85bc 100644 --- a/spec/jquery/searching.spec.coffee +++ b/spec/jquery/searching.spec.coffee @@ -47,7 +47,22 @@ describe "Searching", -> expect(div.find(".active-result").length).toBe(1) expect(div.find(".active-result").first().html()).toBe("A & B") - it "renders optgroups correctly when they contain characters that require HTML encoding", -> + it "renders optgroups correctly when they contain html encoded tags", -> + div = $("
    ").html(""" + + """) + + div.find("select").chosen() + div.find(".chosen-container").trigger("mousedown") # open the drop + + expect(div.find(".group-result").length).toBe(1) + expect(div.find(".group-result").first().html()).toBe("A <b>hi</b> B") + + it "renders optgroups correctly when they contain characters that require HTML encoding when searching", -> div = $("
    ").html(""" + + + + + """) + + new Chosen(div.down("select")) + simulant.fire(div.down(".chosen-container"), "mousedown") # open the drop + + expect(div.select(".group-result").length).toBe(1) + expect(div.down(".group-result").innerHTML).toBe("A <b>hi</b> B") + + it "renders optgroups correctly when they contain characters that require HTML encoding when searching", -> div = new Element("div") div.update(""" ",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ia(function(a){var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Z.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ia(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",O)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Z.test(o.compareDocumentPosition),t=b||Z.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return ka(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?ka(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},fa.matches=function(a,b){return fa(a,null,null,b)},fa.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(T,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fa(b,n,null,[a]).length>0},fa.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fa.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fa.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fa.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fa.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fa.selectors={cacheLength:50,createPseudo:ha,match:W,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ba,ca),a[3]=(a[3]||a[4]||a[5]||"").replace(ba,ca),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fa.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fa.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return W.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&U.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ba,ca).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fa.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(P," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fa.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ha(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ha(function(a){var b=[],c=[],d=h(a.replace(Q,"$1"));return d[u]?ha(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ha(function(a){return function(b){return fa(a,b).length>0}}),contains:ha(function(a){return a=a.replace(ba,ca),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ha(function(a){return V.test(a||"")||fa.error("unsupported lang: "+a),a=a.replace(ba,ca).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Y.test(a.nodeName)},input:function(a){return X.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:na(function(){return[0]}),last:na(function(a,b){return[b-1]}),eq:na(function(a,b,c){return[0>c?c+b:c]}),even:na(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:na(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:na(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:na(function(a,b,c){for(var d=0>c?c+b:c;++db;b++)d+=a[b].value;return d}function ra(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j,k=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(j=b[u]||(b[u]={}),i=j[b.uniqueID]||(j[b.uniqueID]={}),(h=i[d])&&h[0]===w&&h[1]===f)return k[2]=h[2];if(i[d]=k,k[2]=a(b,c,g))return!0}}}function sa(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ta(a,b,c){for(var d=0,e=b.length;e>d;d++)fa(a,b[d],c);return c}function ua(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(c&&!c(f,d,e)||(g.push(f),j&&b.push(h)));return g}function va(a,b,c,d,e,f){return d&&!d[u]&&(d=va(d)),e&&!e[u]&&(e=va(e,f)),ha(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ta(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ua(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ua(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ua(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function wa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ra(function(a){return a===b},h,!0),l=ra(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[ra(sa(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return va(i>1&&sa(m),i>1&&qa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(Q,"$1"),c,e>i&&wa(a.slice(i,e)),f>e&&wa(a=a.slice(e)),f>e&&qa(a))}m.push(c)}return sa(m)}function xa(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=F.call(i));u=ua(u)}H.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&fa.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ha(f):f}return h=fa.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xa(e,d)),f.selector=a}return f},i=fa.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ba,ca),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=W.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ba,ca),_.test(j[0].type)&&oa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qa(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,!b||_.test(a)&&oa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ia(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ia(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||ja("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ia(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ja("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ia(function(a){return null==a.getAttribute("disabled")})||ja(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fa}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.uniqueSort=n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},v=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},w=n.expr.match.needsContext,x=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,y=/^.[^:#\[\.,]*$/;function z(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(y.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return n.inArray(a,b)>-1!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;e>b;b++)if(n.contains(d[b],this))return!0}));for(b=0;e>b;b++)n.find(a,d[b],c);return c=this.pushStack(e>1?n.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(z(this,a||[],!1))},not:function(a){return this.pushStack(z(this,a||[],!0))},is:function(a){return!!z(this,"string"==typeof a&&w.test(a)?n(a):a||[],!1).length}});var A,B=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=n.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||A,"string"==typeof a){if(e="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:B.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),x.test(e[1])&&n.isPlainObject(b))for(e in b)n.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}if(f=d.getElementById(e[2]),f&&f.parentNode){if(f.id!==e[2])return A.find(a);this.length=1,this[0]=f}return this.context=d,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof c.ready?c.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};C.prototype=n.fn,A=n(d);var D=/^(?:parents|prev(?:Until|All))/,E={children:!0,contents:!0,next:!0,prev:!0};n.fn.extend({has:function(a){var b,c=n(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(n.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=w.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?n.inArray(this[0],n(a)):n.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.uniqueSort(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function F(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return u(a,"parentNode")},parentsUntil:function(a,b,c){return u(a,"parentNode",c)},next:function(a){return F(a,"nextSibling")},prev:function(a){return F(a,"previousSibling")},nextAll:function(a){return u(a,"nextSibling")},prevAll:function(a){return u(a,"previousSibling")},nextUntil:function(a,b,c){return u(a,"nextSibling",c)},prevUntil:function(a,b,c){return u(a,"previousSibling",c)},siblings:function(a){return v((a.parentNode||{}).firstChild,a)},children:function(a){return v(a.firstChild)},contents:function(a){return n.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(E[a]||(e=n.uniqueSort(e)),D.test(a)&&(e=e.reverse())),this.pushStack(e)}});var G=/\S+/g;function H(a){var b={};return n.each(a.match(G)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?H(a):n.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h-1)f.splice(c,1),h>=c&&h--}),this},has:function(a){return a?n.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=!0,c||j.disable(),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().progress(c.notify).done(c.resolve).fail(c.reject):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=e.call(arguments),d=c.length,f=1!==d||a&&n.isFunction(a.promise)?d:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?e.call(arguments):d,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(d>1)for(i=new Array(d),j=new Array(d),k=new Array(d);d>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().progress(h(b,j,i)).done(h(b,k,c)).fail(g.reject):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(d,[n]),n.fn.triggerHandler&&(n(d).triggerHandler("ready"),n(d).off("ready"))))}});function J(){d.addEventListener?(d.removeEventListener("DOMContentLoaded",K),a.removeEventListener("load",K)):(d.detachEvent("onreadystatechange",K),a.detachEvent("onload",K))}function K(){(d.addEventListener||"load"===a.event.type||"complete"===d.readyState)&&(J(),n.ready())}n.ready.promise=function(b){if(!I)if(I=n.Deferred(),"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll)a.setTimeout(n.ready);else if(d.addEventListener)d.addEventListener("DOMContentLoaded",K),a.addEventListener("load",K);else{d.attachEvent("onreadystatechange",K),a.attachEvent("onload",K);var c=!1;try{c=null==a.frameElement&&d.documentElement}catch(e){}c&&c.doScroll&&!function f(){if(!n.isReady){try{c.doScroll("left")}catch(b){return a.setTimeout(f,50)}J(),n.ready()}}()}return I.promise(b)},n.ready.promise();var L;for(L in n(l))break;l.ownFirst="0"===L,l.inlineBlockNeedsLayout=!1,n(function(){var a,b,c,e;c=d.getElementsByTagName("body")[0],c&&c.style&&(b=d.createElement("div"),e=d.createElement("div"),e.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(e).appendChild(b),"undefined"!=typeof b.style.zoom&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",l.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(e))}),function(){var a=d.createElement("div");l.deleteExpando=!0;try{delete a.test}catch(b){l.deleteExpando=!1}a=null}();var M=function(a){var b=n.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b},N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(O,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}n.data(a,b,c)}else c=void 0; +}return c}function Q(a){var b;for(b in a)if(("data"!==b||!n.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function R(a,b,d,e){if(M(a)){var f,g,h=n.expando,i=a.nodeType,j=i?n.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||n.guid++:h),j[k]||(j[k]=i?{}:{toJSON:n.noop}),"object"!=typeof b&&"function"!=typeof b||(e?j[k]=n.extend(j[k],b):j[k].data=n.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[n.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[n.camelCase(b)])):f=g,f}}function S(a,b,c){if(M(a)){var d,e,f=a.nodeType,g=f?n.cache:a,h=f?a[n.expando]:n.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){n.isArray(b)?b=b.concat(n.map(b,n.camelCase)):b in d?b=[b]:(b=n.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!Q(d):!n.isEmptyObject(d))return}(c||(delete g[h].data,Q(g[h])))&&(f?n.cleanData([a],!0):l.deleteExpando||g!=g.window?delete g[h]:g[h]=void 0)}}}n.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?n.cache[a[n.expando]]:a[n.expando],!!a&&!Q(a)},data:function(a,b,c){return R(a,b,c)},removeData:function(a,b){return S(a,b)},_data:function(a,b,c){return R(a,b,c,!0)},_removeData:function(a,b){return S(a,b,!0)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=n.data(f),1===f.nodeType&&!n._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));n._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){n.data(this,a)}):arguments.length>1?this.each(function(){n.data(this,a,b)}):f?P(f,a,n.data(f,a)):void 0},removeData:function(a){return this.each(function(){n.removeData(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=n._data(a,b),c&&(!d||n.isArray(c)?d=n._data(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return n._data(a,c)||n._data(a,c,{empty:n.Callbacks("once memory").add(function(){n._removeData(a,b+"queue"),n._removeData(a,c)})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.lengthh;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},Z=/^(?:checkbox|radio)$/i,$=/<([\w:-]+)/,_=/^$|\/(?:java|ecma)script/i,aa=/^\s+/,ba="abbr|article|aside|audio|bdi|canvas|data|datalist|details|dialog|figcaption|figure|footer|header|hgroup|main|mark|meter|nav|output|picture|progress|section|summary|template|time|video";function ca(a){var b=ba.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}!function(){var a=d.createElement("div"),b=d.createDocumentFragment(),c=d.createElement("input");a.innerHTML="
    a",l.leadingWhitespace=3===a.firstChild.nodeType,l.tbody=!a.getElementsByTagName("tbody").length,l.htmlSerialize=!!a.getElementsByTagName("link").length,l.html5Clone="<:nav>"!==d.createElement("nav").cloneNode(!0).outerHTML,c.type="checkbox",c.checked=!0,b.appendChild(c),l.appendChecked=c.checked,a.innerHTML="",l.noCloneChecked=!!a.cloneNode(!0).lastChild.defaultValue,b.appendChild(a),c=d.createElement("input"),c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),a.appendChild(c),l.checkClone=a.cloneNode(!0).cloneNode(!0).lastChild.checked,l.noCloneEvent=!!a.addEventListener,a[n.expando]=1,l.attributes=!a.getAttribute(n.expando)}();var da={option:[1,""],legend:[1,"
    ","
    "],area:[1,"",""],param:[1,"",""],thead:[1,"","
    "],tr:[2,"","
    "],col:[2,"","
    "],td:[3,"","
    "],_default:l.htmlSerialize?[0,"",""]:[1,"X
    ","
    "]};da.optgroup=da.option,da.tbody=da.tfoot=da.colgroup=da.caption=da.thead,da.th=da.td;function ea(a,b){var c,d,e=0,f="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||n.nodeName(d,b)?f.push(d):n.merge(f,ea(d,b));return void 0===b||b&&n.nodeName(a,b)?n.merge([a],f):f}function fa(a,b){for(var c,d=0;null!=(c=a[d]);d++)n._data(c,"globalEval",!b||n._data(b[d],"globalEval"))}var ga=/<|&#?\w+;/,ha=/r;r++)if(g=a[r],g||0===g)if("object"===n.type(g))n.merge(q,g.nodeType?[g]:g);else if(ga.test(g)){i=i||p.appendChild(b.createElement("div")),j=($.exec(g)||["",""])[1].toLowerCase(),m=da[j]||da._default,i.innerHTML=m[1]+n.htmlPrefilter(g)+m[2],f=m[0];while(f--)i=i.lastChild;if(!l.leadingWhitespace&&aa.test(g)&&q.push(b.createTextNode(aa.exec(g)[0])),!l.tbody){g="table"!==j||ha.test(g)?""!==m[1]||ha.test(g)?0:i:i.firstChild,f=g&&g.childNodes.length;while(f--)n.nodeName(k=g.childNodes[f],"tbody")&&!k.childNodes.length&&g.removeChild(k)}n.merge(q,i.childNodes),i.textContent="";while(i.firstChild)i.removeChild(i.firstChild);i=p.lastChild}else q.push(b.createTextNode(g));i&&p.removeChild(i),l.appendChecked||n.grep(ea(q,"input"),ia),r=0;while(g=q[r++])if(d&&n.inArray(g,d)>-1)e&&e.push(g);else if(h=n.contains(g.ownerDocument,g),i=ea(p.appendChild(g),"script"),h&&fa(i),c){f=0;while(g=i[f++])_.test(g.type||"")&&c.push(g)}return i=null,p}!function(){var b,c,e=d.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(l[b]=c in a)||(e.setAttribute(c,"t"),l[b]=e.attributes[c].expando===!1);e=null}();var ka=/^(?:input|select|textarea)$/i,la=/^key/,ma=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,na=/^(?:focusinfocus|focusoutblur)$/,oa=/^([^.]*)(?:\.(.+)|)/;function pa(){return!0}function qa(){return!1}function ra(){try{return d.activeElement}catch(a){}}function sa(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)sa(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=qa;else if(!e)return a;return 1===f&&(g=e,e=function(a){return n().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=n.guid++)),a.each(function(){n.event.add(this,b,e,d,c)})}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=n.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return"undefined"==typeof n||a&&n.event.triggered===a.type?void 0:n.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(G)||[""],h=b.length;while(h--)f=oa.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=n.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=n.event.special[o]||{},l=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},i),(m=g[o])||(m=g[o]=[],m.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,l):m.push(l),n.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n.hasData(a)&&n._data(a);if(r&&(k=r.events)){b=(b||"").match(G)||[""],j=b.length;while(j--)if(h=oa.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=m.length;while(f--)g=m[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(m.splice(f,1),g.selector&&m.delegateCount--,l.remove&&l.remove.call(a,g));i&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(k)&&(delete r.handle,n._removeData(a,"events"))}},trigger:function(b,c,e,f){var g,h,i,j,l,m,o,p=[e||d],q=k.call(b,"type")?b.type:b,r=k.call(b,"namespace")?b.namespace.split("."):[];if(i=m=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!na.test(q+n.event.triggered)&&(q.indexOf(".")>-1&&(r=q.split("."),q=r.shift(),r.sort()),h=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=r.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:n.makeArray(c,[b]),l=n.event.special[q]||{},f||!l.trigger||l.trigger.apply(e,c)!==!1)){if(!f&&!l.noBubble&&!n.isWindow(e)){for(j=l.delegateType||q,na.test(j+q)||(i=i.parentNode);i;i=i.parentNode)p.push(i),m=i;m===(e.ownerDocument||d)&&p.push(m.defaultView||m.parentWindow||a)}o=0;while((i=p[o++])&&!b.isPropagationStopped())b.type=o>1?j:l.bindType||q,g=(n._data(i,"events")||{})[b.type]&&n._data(i,"handle"),g&&g.apply(i,c),g=h&&i[h],g&&g.apply&&M(i)&&(b.result=g.apply(i,c),b.result===!1&&b.preventDefault());if(b.type=q,!f&&!b.isDefaultPrevented()&&(!l._default||l._default.apply(p.pop(),c)===!1)&&M(e)&&h&&e[q]&&!n.isWindow(e)){m=e[h],m&&(e[h]=null),n.event.triggered=q;try{e[q]()}catch(s){}n.event.triggered=void 0,m&&(e[h]=m)}return b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,d,f,g,h=[],i=e.call(arguments),j=(n._data(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())a.rnamespace&&!a.rnamespace.test(g.namespace)||(a.handleObj=g,a.data=g.data,d=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==d&&(a.result=d)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&("click"!==a.type||isNaN(a.button)||a.button<1))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>-1:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h]","i"),va=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,wa=/\s*$/g,Aa=ca(d),Ba=Aa.appendChild(d.createElement("div"));function Ca(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function Da(a){return a.type=(null!==n.find.attr(a,"type"))+"/"+a.type,a}function Ea(a){var b=ya.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Fa(a,b){if(1===b.nodeType&&n.hasData(a)){var c,d,e,f=n._data(a),g=n._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)n.event.add(b,c,h[c][d])}g.data&&(g.data=n.extend({},g.data))}}function Ga(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!l.noCloneEvent&&b[n.expando]){e=n._data(b);for(d in e.events)n.removeEvent(b,d,e.handle);b.removeAttribute(n.expando)}"script"===c&&b.text!==a.text?(Da(b).text=a.text,Ea(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),l.html5Clone&&a.innerHTML&&!n.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&Z.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:"input"!==c&&"textarea"!==c||(b.defaultValue=a.defaultValue)}}function Ha(a,b,c,d){b=f.apply([],b);var e,g,h,i,j,k,m=0,o=a.length,p=o-1,q=b[0],r=n.isFunction(q);if(r||o>1&&"string"==typeof q&&!l.checkClone&&xa.test(q))return a.each(function(e){var f=a.eq(e);r&&(b[0]=q.call(this,e,f.html())),Ha(f,b,c,d)});if(o&&(k=ja(b,a[0].ownerDocument,!1,a,d),e=k.firstChild,1===k.childNodes.length&&(k=e),e||d)){for(i=n.map(ea(k,"script"),Da),h=i.length;o>m;m++)g=k,m!==p&&(g=n.clone(g,!0,!0),h&&n.merge(i,ea(g,"script"))),c.call(a[m],g,m);if(h)for(j=i[i.length-1].ownerDocument,n.map(i,Ea),m=0;h>m;m++)g=i[m],_.test(g.type||"")&&!n._data(g,"globalEval")&&n.contains(j,g)&&(g.src?n._evalUrl&&n._evalUrl(g.src):n.globalEval((g.text||g.textContent||g.innerHTML||"").replace(za,"")));k=e=null}return a}function Ia(a,b,c){for(var d,e=b?n.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||n.cleanData(ea(d)),d.parentNode&&(c&&n.contains(d.ownerDocument,d)&&fa(ea(d,"script")),d.parentNode.removeChild(d));return a}n.extend({htmlPrefilter:function(a){return a.replace(va,"<$1>")},clone:function(a,b,c){var d,e,f,g,h,i=n.contains(a.ownerDocument,a);if(l.html5Clone||n.isXMLDoc(a)||!ua.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(Ba.innerHTML=a.outerHTML,Ba.removeChild(f=Ba.firstChild)),!(l.noCloneEvent&&l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(d=ea(f),h=ea(a),g=0;null!=(e=h[g]);++g)d[g]&&Ga(e,d[g]);if(b)if(c)for(h=h||ea(a),d=d||ea(f),g=0;null!=(e=h[g]);g++)Fa(e,d[g]);else Fa(a,f);return d=ea(f,"script"),d.length>0&&fa(d,!i&&ea(a,"script")),d=h=e=null,f},cleanData:function(a,b){for(var d,e,f,g,h=0,i=n.expando,j=n.cache,k=l.attributes,m=n.event.special;null!=(d=a[h]);h++)if((b||M(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)m[e]?n.event.remove(d,e):n.removeEvent(d,e,g.handle);j[f]&&(delete j[f],k||"undefined"==typeof d.removeAttribute?d[i]=void 0:d.removeAttribute(i),c.push(f))}}}),n.fn.extend({domManip:Ha,detach:function(a){return Ia(this,a,!0)},remove:function(a){return Ia(this,a)},text:function(a){return Y(this,function(a){return void 0===a?n.text(this):this.empty().append((this[0]&&this[0].ownerDocument||d).createTextNode(a))},null,a,arguments.length)},append:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.appendChild(a)}})},prepend:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&n.cleanData(ea(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&n.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return Y(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(ta,""):void 0;if("string"==typeof a&&!wa.test(a)&&(l.htmlSerialize||!ua.test(a))&&(l.leadingWhitespace||!aa.test(a))&&!da[($.exec(a)||["",""])[1].toLowerCase()]){a=n.htmlPrefilter(a);try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(ea(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return Ha(this,arguments,function(b){var c=this.parentNode;n.inArray(this,a)<0&&(n.cleanData(ea(this)),c&&c.replaceChild(b,this))},a)}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=0,e=[],f=n(a),h=f.length-1;h>=d;d++)c=d===h?this:this.clone(!0),n(f[d])[b](c),g.apply(e,c.get());return this.pushStack(e)}});var Ja,Ka={HTML:"block",BODY:"block"};function La(a,b){var c=n(b.createElement(a)).appendTo(b.body),d=n.css(c[0],"display");return c.detach(),d}function Ma(a){var b=d,c=Ka[a];return c||(c=La(a,b),"none"!==c&&c||(Ja=(Ja||n("