From 592df533b78783f0ea9a234828ce275edd53061f Mon Sep 17 00:00:00 2001 From: Marko Zabreznik Date: Sat, 13 Jan 2018 11:53:34 +0100 Subject: [PATCH 01/15] Fix for https://github.com/sagalbot/vue-select/issues/350 Builds on https://github.com/sagalbot/vue-select/pull/420 and fixes the string options array edge case. Added dev.html example. --- dev.html | 8 ++++++++ src/components/Select.vue | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dev.html b/dev.html index 1a39950..cfc55ef 100644 --- a/dev.html +++ b/dev.html @@ -46,6 +46,14 @@ {{option.label}} ({{option.value}}) + + + + + :option="(typeof option === 'object')?option:{[label]: option}" :deselect="deselect" :multiple="multiple" :disabled="disabled"> - + {{ getOptionLabel(option) }} - - - - - - - - - - - - - diff --git a/src/fuseSearchOptions.js b/dev/data/books.js similarity index 100% rename from src/fuseSearchOptions.js rename to dev/data/books.js diff --git a/dev/data/countries.js b/dev/data/countries.js new file mode 100644 index 0000000..d9f12a1 --- /dev/null +++ b/dev/data/countries.js @@ -0,0 +1 @@ +export default ["Afghanistan", "Åland Islands", "Albania", "Algeria", "American Samoa", "Andorra", "Angola", "Anguilla", "Antarctica", "Antigua and Barbuda", "Argentina", "Armenia", "Aruba", "Australia", "Austria", "Azerbaijan", "Bahamas", "Bahrain", "Bangladesh", "Barbados", "Belarus", "Belgium", "Belize", "Benin", "Bermuda", "Bhutan", "Bolivia", "Bosnia and Herzegovina", "Botswana", "Bouvet Island", "Brazil", "British Indian Ocean Territory", "Brunei Darussalam", "Bulgaria", "Burkina Faso", "Burundi", "Cambodia", "Cameroon", "Canada", "Cape Verde", "Cayman Islands", "Central African Republic", "Chad", "Chile", "China", "Christmas Island", "Cocos (Keeling) Islands", "Colombia", "Comoros", "Congo", "Congo, The Democratic Republic of The", "Cook Islands", "Costa Rica", "Cote D'ivoire", "Croatia", "Cuba", "Cyprus", "Czech Republic", "Denmark", "Djibouti", "Dominica", "Dominican Republic", "Ecuador", "Egypt", "El Salvador", "Equatorial Guinea", "Eritrea", "Estonia", "Ethiopia", "Falkland Islands (Malvinas)", "Faroe Islands", "Fiji", "Finland", "France", "French Guiana", "French Polynesia", "French Southern Territories", "Gabon", "Gambia", "Georgia", "Germany", "Ghana", "Gibraltar", "Greece", "Greenland", "Grenada", "Guadeloupe", "Guam", "Guatemala", "Guernsey", "Guinea", "Guinea-bissau", "Guyana", "Haiti", "Heard Island and Mcdonald Islands", "Holy See (Vatican City State)", "Honduras", "Hong Kong", "Hungary", "Iceland", "India", "Indonesia", "Iran, Islamic Republic of", "Iraq", "Ireland", "Isle of Man", "Israel", "Italy", "Jamaica", "Japan", "Jersey", "Jordan", "Kazakhstan", "Kenya", "Kiribati", "Korea, Democratic People's Republic of", "Korea, Republic of", "Kuwait", "Kyrgyzstan", "Lao People's Democratic Republic", "Latvia", "Lebanon", "Lesotho", "Liberia", "Libyan Arab Jamahiriya", "Liechtenstein", "Lithuania", "Luxembourg", "Macao", "Macedonia, The Former Yugoslav Republic of", "Madagascar", "Malawi", "Malaysia", "Maldives", "Mali", "Malta", "Marshall Islands", "Martinique", "Mauritania", "Mauritius", "Mayotte", "Mexico", "Micronesia, Federated States of", "Moldova, Republic of", "Monaco", "Mongolia", "Montenegro", "Montserrat", "Morocco", "Mozambique", "Myanmar", "Namibia", "Nauru", "Nepal", "Netherlands", "Netherlands Antilles", "New Caledonia", "New Zealand", "Nicaragua", "Niger", "Nigeria", "Niue", "Norfolk Island", "Northern Mariana Islands", "Norway", "Oman", "Pakistan", "Palau", "Palestinian Territory, Occupied", "Panama", "Papua New Guinea", "Paraguay", "Peru", "Philippines", "Pitcairn", "Poland", "Portugal", "Puerto Rico", "Qatar", "Reunion", "Romania", "Russian Federation", "Rwanda", "Saint Helena", "Saint Kitts and Nevis", "Saint Lucia", "Saint Pierre and Miquelon", "Saint Vincent and The Grenadines", "Samoa", "San Marino", "Sao Tome and Principe", "Saudi Arabia", "Senegal", "Serbia", "Seychelles", "Sierra Leone", "Singapore", "Slovakia", "Slovenia", "Solomon Islands", "Somalia", "South Africa", "South Georgia and The South Sandwich Islands", "Spain", "Sri Lanka", "Sudan", "Suriname", "Svalbard and Jan Mayen", "Swaziland", "Sweden", "Switzerland", "Syrian Arab Republic", "Taiwan, Province of China", "Tajikistan", "Tanzania, United Republic of", "Thailand", "Timor-leste", "Togo", "Tokelau", "Tonga", "Trinidad and Tobago", "Tunisia", "Turkey", "Turkmenistan", "Turks and Caicos Islands", "Tuvalu", "Uganda", "Ukraine", "United Arab Emirates", "United Kingdom", "United States", "United States Minor Outlying Islands", "Uruguay", "Uzbekistan", "Vanuatu", "Venezuela", "Viet Nam", "Virgin Islands, British", "Virgin Islands, U.S.", "Wallis and Futuna", "Western Sahara", "Yemen", "Zambia", "Zimbabwe"]; diff --git a/dev/data/countryCodes.js b/dev/data/countryCodes.js new file mode 100644 index 0000000..96dbcb8 --- /dev/null +++ b/dev/data/countryCodes.js @@ -0,0 +1,246 @@ +export default [ + {value: "AF", label: "Afghanistan"}, + {value: "AX", label: "Åland Islands"}, + {value: "AL", label: "Albania"}, + {value: "DZ", label: "Algeria"}, + {value: "AS", label: "American Samoa"}, + {value: "AD", label: "Andorra"}, + {value: "AO", label: "Angola"}, + {value: "AI", label: "Anguilla"}, + {value: "AQ", label: "Antarctica"}, + {value: "AG", label: "Antigua and Barbuda"}, + {value: "AR", label: "Argentina"}, + {value: "AM", label: "Armenia"}, + {value: "AW", label: "Aruba"}, + {value: "AU", label: "Australia"}, + {value: "AT", label: "Austria"}, + {value: "AZ", label: "Azerbaijan"}, + {value: "BS", label: "Bahamas"}, + {value: "BH", label: "Bahrain"}, + {value: "BD", label: "Bangladesh"}, + {value: "BB", label: "Barbados"}, + {value: "BY", label: "Belarus"}, + {value: "BE", label: "Belgium"}, + {value: "BZ", label: "Belize"}, + {value: "BJ", label: "Benin"}, + {value: "BM", label: "Bermuda"}, + {value: "BT", label: "Bhutan"}, + {value: "BO", label: "Bolivia"}, + {value: "BA", label: "Bosnia and Herzegovina"}, + {value: "BW", label: "Botswana"}, + {value: "BV", label: "Bouvet Island"}, + {value: "BR", label: "Brazil"}, + {value: "IO", label: "British Indian Ocean Territory"}, + {value: "BN", label: "Brunei Darussalam"}, + {value: "BG", label: "Bulgaria"}, + {value: "BF", label: "Burkina Faso"}, + {value: "BI", label: "Burundi"}, + {value: "KH", label: "Cambodia"}, + {value: "CM", label: "Cameroon"}, + {value: "CA", label: "Canada"}, + {value: "CV", label: "Cape Verde"}, + {value: "KY", label: "Cayman Islands"}, + {value: "CF", label: "Central African Republic"}, + {value: "TD", label: "Chad"}, + {value: "CL", label: "Chile"}, + {value: "CN", label: "China"}, + {value: "CX", label: "Christmas Island"}, + {value: "CC", label: "Cocos (Keeling) Islands"}, + {value: "CO", label: "Colombia"}, + {value: "KM", label: "Comoros"}, + {value: "CG", label: "Congo"}, + {value: "CD", label: "Congo, The Democratic Republic of The"}, + {value: "CK", label: "Cook Islands"}, + {value: "CR", label: "Costa Rica"}, + {value: "CI", label: "Cote D'ivoire"}, + {value: "HR", label: "Croatia"}, + {value: "CU", label: "Cuba"}, + {value: "CY", label: "Cyprus"}, + {value: "CZ", label: "Czech Republic"}, + {value: "DK", label: "Denmark"}, + {value: "DJ", label: "Djibouti"}, + {value: "DM", label: "Dominica"}, + {value: "DO", label: "Dominican Republic"}, + {value: "EC", label: "Ecuador"}, + {value: "EG", label: "Egypt"}, + {value: "SV", label: "El Salvador"}, + {value: "GQ", label: "Equatorial Guinea"}, + {value: "ER", label: "Eritrea"}, + {value: "EE", label: "Estonia"}, + {value: "ET", label: "Ethiopia"}, + {value: "FK", label: "Falkland Islands (Malvinas)"}, + {value: "FO", label: "Faroe Islands"}, + {value: "FJ", label: "Fiji"}, + {value: "FI", label: "Finland"}, + {value: "FR", label: "France"}, + {value: "GF", label: "French Guiana"}, + {value: "PF", label: "French Polynesia"}, + {value: "TF", label: "French Southern Territories"}, + {value: "GA", label: "Gabon"}, + {value: "GM", label: "Gambia"}, + {value: "GE", label: "Georgia"}, + {value: "DE", label: "Germany"}, + {value: "GH", label: "Ghana"}, + {value: "GI", label: "Gibraltar"}, + {value: "GR", label: "Greece"}, + {value: "GL", label: "Greenland"}, + {value: "GD", label: "Grenada"}, + {value: "GP", label: "Guadeloupe"}, + {value: "GU", label: "Guam"}, + {value: "GT", label: "Guatemala"}, + {value: "GG", label: "Guernsey"}, + {value: "GN", label: "Guinea"}, + {value: "GW", label: "Guinea-bissau"}, + {value: "GY", label: "Guyana"}, + {value: "HT", label: "Haiti"}, + {value: "HM", label: "Heard Island and Mcdonald Islands"}, + {value: "VA", label: "Holy See (Vatican City State)"}, + {value: "HN", label: "Honduras"}, + {value: "HK", label: "Hong Kong"}, + {value: "HU", label: "Hungary"}, + {value: "IS", label: "Iceland"}, + {value: "IN", label: "India"}, + {value: "ID", label: "Indonesia"}, + {value: "IR", label: "Iran, Islamic Republic of"}, + {value: "IQ", label: "Iraq"}, + {value: "IE", label: "Ireland"}, + {value: "IM", label: "Isle of Man"}, + {value: "IL", label: "Israel"}, + {value: "IT", label: "Italy"}, + {value: "JM", label: "Jamaica"}, + {value: "JP", label: "Japan"}, + {value: "JE", label: "Jersey"}, + {value: "JO", label: "Jordan"}, + {value: "KZ", label: "Kazakhstan"}, + {value: "KE", label: "Kenya"}, + {value: "KI", label: "Kiribati"}, + {value: "KP", label: "Korea, Democratic People's Republic of"}, + {value: "KR", label: "Korea, Republic of"}, + {value: "KW", label: "Kuwait"}, + {value: "KG", label: "Kyrgyzstan"}, + {value: "LA", label: "Lao People's Democratic Republic"}, + {value: "LV", label: "Latvia"}, + {value: "LB", label: "Lebanon"}, + {value: "LS", label: "Lesotho"}, + {value: "LR", label: "Liberia"}, + {value: "LY", label: "Libyan Arab Jamahiriya"}, + {value: "LI", label: "Liechtenstein"}, + {value: "LT", label: "Lithuania"}, + {value: "LU", label: "Luxembourg"}, + {value: "MO", label: "Macao"}, + {value: "MK", label: "Macedonia, The Former Yugoslav Republic of"}, + {value: "MG", label: "Madagascar"}, + {value: "MW", label: "Malawi"}, + {value: "MY", label: "Malaysia"}, + {value: "MV", label: "Maldives"}, + {value: "ML", label: "Mali"}, + {value: "MT", label: "Malta"}, + {value: "MH", label: "Marshall Islands"}, + {value: "MQ", label: "Martinique"}, + {value: "MR", label: "Mauritania"}, + {value: "MU", label: "Mauritius"}, + {value: "YT", label: "Mayotte"}, + {value: "MX", label: "Mexico"}, + {value: "FM", label: "Micronesia, Federated States of"}, + {value: "MD", label: "Moldova, Republic of"}, + {value: "MC", label: "Monaco"}, + {value: "MN", label: "Mongolia"}, + {value: "ME", label: "Montenegro"}, + {value: "MS", label: "Montserrat"}, + {value: "MA", label: "Morocco"}, + {value: "MZ", label: "Mozambique"}, + {value: "MM", label: "Myanmar"}, + {value: "NA", label: "Namibia"}, + {value: "NR", label: "Nauru"}, + {value: "NP", label: "Nepal"}, + {value: "NL", label: "Netherlands"}, + {value: "AN", label: "Netherlands Antilles"}, + {value: "NC", label: "New Caledonia"}, + {value: "NZ", label: "New Zealand"}, + {value: "NI", label: "Nicaragua"}, + {value: "NE", label: "Niger"}, + {value: "NG", label: "Nigeria"}, + {value: "NU", label: "Niue"}, + {value: "NF", label: "Norfolk Island"}, + {value: "MP", label: "Northern Mariana Islands"}, + {value: "NO", label: "Norway"}, + {value: "OM", label: "Oman"}, + {value: "PK", label: "Pakistan"}, + {value: "PW", label: "Palau"}, + {value: "PS", label: "Palestinian Territory, Occupied"}, + {value: "PA", label: "Panama"}, + {value: "PG", label: "Papua New Guinea"}, + {value: "PY", label: "Paraguay"}, + {value: "PE", label: "Peru"}, + {value: "PH", label: "Philippines"}, + {value: "PN", label: "Pitcairn"}, + {value: "PL", label: "Poland"}, + {value: "PT", label: "Portugal"}, + {value: "PR", label: "Puerto Rico"}, + {value: "QA", label: "Qatar"}, + {value: "RE", label: "Reunion"}, + {value: "RO", label: "Romania"}, + {value: "RU", label: "Russian Federation"}, + {value: "RW", label: "Rwanda"}, + {value: "SH", label: "Saint Helena"}, + {value: "KN", label: "Saint Kitts and Nevis"}, + {value: "LC", label: "Saint Lucia"}, + {value: "PM", label: "Saint Pierre and Miquelon"}, + {value: "VC", label: "Saint Vincent and The Grenadines"}, + {value: "WS", label: "Samoa"}, + {value: "SM", label: "San Marino"}, + {value: "ST", label: "Sao Tome and Principe"}, + {value: "SA", label: "Saudi Arabia"}, + {value: "SN", label: "Senegal"}, + {value: "RS", label: "Serbia"}, + {value: "SC", label: "Seychelles"}, + {value: "SL", label: "Sierra Leone"}, + {value: "SG", label: "Singapore"}, + {value: "SK", label: "Slovakia"}, + {value: "SI", label: "Slovenia"}, + {value: "SB", label: "Solomon Islands"}, + {value: "SO", label: "Somalia"}, + {value: "ZA", label: "South Africa"}, + {value: "GS", label: "South Georgia and The South Sandwich Islands"}, + {value: "ES", label: "Spain"}, + {value: "LK", label: "Sri Lanka"}, + {value: "SD", label: "Sudan"}, + {value: "SR", label: "Suriname"}, + {value: "SJ", label: "Svalbard and Jan Mayen"}, + {value: "SZ", label: "Swaziland"}, + {value: "SE", label: "Sweden"}, + {value: "CH", label: "Switzerland"}, + {value: "SY", label: "Syrian Arab Republic"}, + {value: "TW", label: "Taiwan, Province of China"}, + {value: "TJ", label: "Tajikistan"}, + {value: "TZ", label: "Tanzania, United Republic of"}, + {value: "TH", label: "Thailand"}, + {value: "TL", label: "Timor-leste"}, + {value: "TG", label: "Togo"}, + {value: "TK", label: "Tokelau"}, + {value: "TO", label: "Tonga"}, + {value: "TT", label: "Trinidad and Tobago"}, + {value: "TN", label: "Tunisia"}, + {value: "TR", label: "Turkey"}, + {value: "TM", label: "Turkmenistan"}, + {value: "TC", label: "Turks and Caicos Islands"}, + {value: "TV", label: "Tuvalu"}, + {value: "UG", label: "Uganda"}, + {value: "UA", label: "Ukraine"}, + {value: "AE", label: "United Arab Emirates"}, + {value: "GB", label: "United Kingdom"}, + {value: "US", label: "United States"}, + {value: "UM", label: "United States Minor Outlying Islands"}, + {value: "UY", label: "Uruguay"}, + {value: "UZ", label: "Uzbekistan"}, + {value: "VU", label: "Vanuatu"}, + {value: "VE", label: "Venezuela"}, + {value: "VN", label: "Viet Nam"}, + {value: "VG", label: "Virgin Islands, British"}, + {value: "VI", label: "Virgin Islands, U.S."}, + {value: "WF", label: "Wallis and Futuna"}, + {value: "EH", label: "Western Sahara"}, + {value: "YE", label: "Yemen"}, + {value: "ZM", label: "Zambia"}, + {value: "ZW", label: "Zimbabwe"}, +]; diff --git a/dev/dev.html b/dev/dev.html new file mode 100644 index 0000000..e961669 --- /dev/null +++ b/dev/dev.html @@ -0,0 +1,83 @@ + + + + + + Vue Select Dev + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + diff --git a/src/dev.js b/dev/dev.js similarity index 89% rename from src/dev.js rename to dev/dev.js index 385059b..3baa9db 100644 --- a/src/dev.js +++ b/dev/dev.js @@ -2,9 +2,9 @@ import Vue from 'vue' import Fuse from 'fuse.js' import debounce from 'lodash/debounce' import resource from 'vue-resource' -import vSelect from './components/Select.vue' -import countries from 'docs/data/advanced.js' -import fuseSearchOptions from './fuseSearchOptions' +import vSelect from '../src/components/Select.vue' +import countries from './data/countryCodes' +import fuseSearchOptions from './data/books' Vue.use(resource) From 4ead15f7bf5f0cedc35ebb313e8472c0ece828f5 Mon Sep 17 00:00:00 2001 From: Jeff Date: Mon, 22 Jan 2018 19:01:06 -0800 Subject: [PATCH 07/15] devtools are always on --- yarn.lock | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 71 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index d02c3d9..118909e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1076,6 +1076,16 @@ change-case@3.0.x: upper-case "^1.1.1" upper-case-first "^1.1.0" +cheerio@^0.19.0: + version "0.19.0" + resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-0.19.0.tgz#772e7015f2ee29965096d71ea4175b75ab354925" + dependencies: + css-select "~1.0.0" + dom-serializer "~0.1.0" + entities "~1.1.1" + htmlparser2 "~3.8.1" + lodash "^3.2.0" + cheerio@^0.20.0: version "0.20.0" resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-0.20.0.tgz#5c710f2bab95653272842ba01c6ea61b3545ec35" @@ -1414,6 +1424,15 @@ css-select@^1.1.0, css-select@~1.2.0: domutils "1.5.1" nth-check "~1.0.1" +css-select@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.0.0.tgz#b1121ca51848dd264e2244d058cee254deeb44b0" + dependencies: + boolbase "~1.0.0" + css-what "1.0" + domutils "1.4" + nth-check "~1.0.0" + css-selector-tokenizer@^0.5.1: version "0.5.4" resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.5.4.tgz#139bafd34a35fd0c1428487049e0699e6f6a2c21" @@ -1429,6 +1448,10 @@ css-selector-tokenizer@^0.7.0: fastparse "^1.1.1" regexpu-core "^1.0.0" +css-what@1.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-1.0.0.tgz#d7cc2df45180666f99d2b14462639469e00f736c" + css-what@2.1: version "2.1.0" resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd" @@ -1648,6 +1671,12 @@ domutils@1.1: dependencies: domelementtype "1" +domutils@1.4: + version "1.4.3" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.4.3.tgz#0865513796c6b306031850e175516baf80b72a6f" + dependencies: + domelementtype "1" + domutils@1.5, domutils@1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" @@ -2194,6 +2223,22 @@ gh-pages@^0.11.0: q-io "1.13.2" wrench "1.5.8" +gitbook-plugin-codepen@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/gitbook-plugin-codepen/-/gitbook-plugin-codepen-0.1.2.tgz#64fb5ba9be9734328a44bab2214422c044a85f16" + dependencies: + cheerio "^0.19.0" + underscore "^1.8.3" + url-parse "^1.0.0" + +gitbook-plugin-edit-link@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/gitbook-plugin-edit-link/-/gitbook-plugin-edit-link-2.0.2.tgz#d8fcd927eced81e7a662a72d59db609eafd7e72f" + +gitbook-plugin-github@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/gitbook-plugin-github/-/gitbook-plugin-github-3.0.0.tgz#67457df98a57ea8ef9b2518b88340db370a5317b" + glob-base@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" @@ -3322,7 +3367,7 @@ lodash.words@^3.0.0: dependencies: lodash._root "^3.0.0" -lodash@^3.8.0: +lodash@^3.2.0, lodash@^3.8.0: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" @@ -3717,6 +3762,10 @@ normalize-url@^1.4.0: query-string "^4.1.0" sort-keys "^1.0.0" +normalize.css@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-7.0.0.tgz#abfb1dd82470674e0322b53ceb1aaf412938e4bf" + "npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" @@ -3726,7 +3775,7 @@ normalize-url@^1.4.0: gauge "~2.7.3" set-blocking "~2.0.0" -nth-check@~1.0.1: +nth-check@~1.0.0, nth-check@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4" dependencies: @@ -4365,6 +4414,10 @@ querystring@0.2.0, querystring@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" +querystringify@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-1.0.0.tgz#6286242112c5b712fa654e526652bf6a13ff05cb" + randomatic@^1.1.3: version "1.1.7" resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c" @@ -4673,7 +4726,7 @@ require-main-filename@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" -requires-port@1.x.x: +requires-port@1.x.x, requires-port@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" @@ -5281,6 +5334,10 @@ ultron@1.0.x: version "1.0.2" resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa" +underscore@^1.8.3: + version "1.8.3" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022" + underscore@~1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8" @@ -5326,6 +5383,13 @@ url-parse-lax@^1.0.0: dependencies: prepend-http "^1.0.1" +url-parse@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.2.0.tgz#3a19e8aaa6d023ddd27dcc44cb4fc8f7fec23986" + dependencies: + querystringify "~1.0.0" + requires-port "~1.0.0" + url-to-options@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9" @@ -5453,6 +5517,10 @@ vue-resource@^1.0.3: dependencies: got "^7.1.0" +vue-select@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/vue-select/-/vue-select-2.4.0.tgz#ef06547fe857f3259841ab2f3d29c5d8a1e52630" + vue-style-loader@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-1.0.0.tgz#abeb7bd0f46313083741244d3079d4f14449e049" From eec0302a60db3bfe7ecff5f1955a568b6bdb0e26 Mon Sep 17 00:00:00 2001 From: Jeff Date: Mon, 22 Jan 2018 19:02:09 -0800 Subject: [PATCH 08/15] Revert "devtools are always on" This reverts commit 4ead15f7bf5f0cedc35ebb313e8472c0ece828f5. --- yarn.lock | 74 +++---------------------------------------------------- 1 file changed, 3 insertions(+), 71 deletions(-) diff --git a/yarn.lock b/yarn.lock index 118909e..d02c3d9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1076,16 +1076,6 @@ change-case@3.0.x: upper-case "^1.1.1" upper-case-first "^1.1.0" -cheerio@^0.19.0: - version "0.19.0" - resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-0.19.0.tgz#772e7015f2ee29965096d71ea4175b75ab354925" - dependencies: - css-select "~1.0.0" - dom-serializer "~0.1.0" - entities "~1.1.1" - htmlparser2 "~3.8.1" - lodash "^3.2.0" - cheerio@^0.20.0: version "0.20.0" resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-0.20.0.tgz#5c710f2bab95653272842ba01c6ea61b3545ec35" @@ -1424,15 +1414,6 @@ css-select@^1.1.0, css-select@~1.2.0: domutils "1.5.1" nth-check "~1.0.1" -css-select@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.0.0.tgz#b1121ca51848dd264e2244d058cee254deeb44b0" - dependencies: - boolbase "~1.0.0" - css-what "1.0" - domutils "1.4" - nth-check "~1.0.0" - css-selector-tokenizer@^0.5.1: version "0.5.4" resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.5.4.tgz#139bafd34a35fd0c1428487049e0699e6f6a2c21" @@ -1448,10 +1429,6 @@ css-selector-tokenizer@^0.7.0: fastparse "^1.1.1" regexpu-core "^1.0.0" -css-what@1.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/css-what/-/css-what-1.0.0.tgz#d7cc2df45180666f99d2b14462639469e00f736c" - css-what@2.1: version "2.1.0" resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd" @@ -1671,12 +1648,6 @@ domutils@1.1: dependencies: domelementtype "1" -domutils@1.4: - version "1.4.3" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.4.3.tgz#0865513796c6b306031850e175516baf80b72a6f" - dependencies: - domelementtype "1" - domutils@1.5, domutils@1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" @@ -2223,22 +2194,6 @@ gh-pages@^0.11.0: q-io "1.13.2" wrench "1.5.8" -gitbook-plugin-codepen@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/gitbook-plugin-codepen/-/gitbook-plugin-codepen-0.1.2.tgz#64fb5ba9be9734328a44bab2214422c044a85f16" - dependencies: - cheerio "^0.19.0" - underscore "^1.8.3" - url-parse "^1.0.0" - -gitbook-plugin-edit-link@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/gitbook-plugin-edit-link/-/gitbook-plugin-edit-link-2.0.2.tgz#d8fcd927eced81e7a662a72d59db609eafd7e72f" - -gitbook-plugin-github@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/gitbook-plugin-github/-/gitbook-plugin-github-3.0.0.tgz#67457df98a57ea8ef9b2518b88340db370a5317b" - glob-base@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" @@ -3367,7 +3322,7 @@ lodash.words@^3.0.0: dependencies: lodash._root "^3.0.0" -lodash@^3.2.0, lodash@^3.8.0: +lodash@^3.8.0: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" @@ -3762,10 +3717,6 @@ normalize-url@^1.4.0: query-string "^4.1.0" sort-keys "^1.0.0" -normalize.css@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-7.0.0.tgz#abfb1dd82470674e0322b53ceb1aaf412938e4bf" - "npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" @@ -3775,7 +3726,7 @@ normalize.css@^7.0.0: gauge "~2.7.3" set-blocking "~2.0.0" -nth-check@~1.0.0, nth-check@~1.0.1: +nth-check@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4" dependencies: @@ -4414,10 +4365,6 @@ querystring@0.2.0, querystring@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" -querystringify@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-1.0.0.tgz#6286242112c5b712fa654e526652bf6a13ff05cb" - randomatic@^1.1.3: version "1.1.7" resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c" @@ -4726,7 +4673,7 @@ require-main-filename@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" -requires-port@1.x.x, requires-port@~1.0.0: +requires-port@1.x.x: version "1.0.0" resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" @@ -5334,10 +5281,6 @@ ultron@1.0.x: version "1.0.2" resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa" -underscore@^1.8.3: - version "1.8.3" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022" - underscore@~1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8" @@ -5383,13 +5326,6 @@ url-parse-lax@^1.0.0: dependencies: prepend-http "^1.0.1" -url-parse@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.2.0.tgz#3a19e8aaa6d023ddd27dcc44cb4fc8f7fec23986" - dependencies: - querystringify "~1.0.0" - requires-port "~1.0.0" - url-to-options@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9" @@ -5517,10 +5453,6 @@ vue-resource@^1.0.3: dependencies: got "^7.1.0" -vue-select@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/vue-select/-/vue-select-2.4.0.tgz#ef06547fe857f3259841ab2f3d29c5d8a1e52630" - vue-style-loader@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-1.0.0.tgz#abeb7bd0f46313083741244d3079d4f14449e049" From ec930c5b535fd834dca38fa7bb467c2152277d22 Mon Sep 17 00:00:00 2001 From: Jeff Date: Mon, 22 Jan 2018 19:02:38 -0800 Subject: [PATCH 09/15] =?UTF-8?q?maybe=20try=20committing=20the=20right=20?= =?UTF-8?q?file=20=F0=9F=A4=A6=E2=80=8D=E2=99=82=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dev/dev.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/dev/dev.js b/dev/dev.js index 3baa9db..83e4580 100644 --- a/dev/dev.js +++ b/dev/dev.js @@ -7,11 +7,8 @@ import countries from './data/countryCodes' import fuseSearchOptions from './data/books' Vue.use(resource) - Vue.component('v-select', vSelect) -Vue.config.devtools = true - /* eslint-disable no-new */ new Vue({ el: '#app', From df0cc83e05f2e25ef2c42def56343643673bc7df Mon Sep 17 00:00:00 2001 From: Jeff Date: Mon, 22 Jan 2018 19:09:43 -0800 Subject: [PATCH 10/15] - add vue-select as a dev dependency so that the homepage is always using the latest release - fix text-align:center issue on homepage --- docs/homepage/assets/scss/_cyan_theme.scss | 12 +--- docs/homepage/home.js | 2 +- package.json | 1 + yarn.lock | 74 +++++++++++++++++++++- 4 files changed, 76 insertions(+), 13 deletions(-) diff --git a/docs/homepage/assets/scss/_cyan_theme.scss b/docs/homepage/assets/scss/_cyan_theme.scss index e4638c0..4ebe3ac 100644 --- a/docs/homepage/assets/scss/_cyan_theme.scss +++ b/docs/homepage/assets/scss/_cyan_theme.scss @@ -4,19 +4,13 @@ font-family: 'Source Sans Pro', 'Helvetica Neue', Arial, sans-serif; max-width: 500px; margin: 0 auto; + text-align: left; + .dropdown-toggle { background: #fff; border-color: rgba(82, 166, 183, 0.39); } - //.selected-tag { - // color: #147688; - // background-color: #d7f3f9; - // border-color: #91ddec; - // .close { - // color: #147688; - // opacity: .5; - // } - //} + &.dropdown.open .dropdown-toggle, &.dropdown.open .dropdown-menu, &.dropdown.open .open-indicator:before { diff --git a/docs/homepage/home.js b/docs/homepage/home.js index 4c1d5d0..5b9e37d 100644 --- a/docs/homepage/home.js +++ b/docs/homepage/home.js @@ -1,5 +1,5 @@ import Vue from 'vue' -import vSelect from '../../src/components/Select' +import vSelect from 'vue-select' import './assets/scss/home.scss' diff --git a/package.json b/package.json index 702490c..786d7dc 100644 --- a/package.json +++ b/package.json @@ -76,6 +76,7 @@ "vue-loader": "^10.0.2", "vue-markdown-loader": "^0.6.1", "vue-resource": "^1.0.3", + "vue-select": "*", "vue-style-loader": "^1.0.0", "vue-template-compiler": "^2.1.8", "vuex": "^2.1.1", diff --git a/yarn.lock b/yarn.lock index d02c3d9..3429a1c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1076,6 +1076,16 @@ change-case@3.0.x: upper-case "^1.1.1" upper-case-first "^1.1.0" +cheerio@^0.19.0: + version "0.19.0" + resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-0.19.0.tgz#772e7015f2ee29965096d71ea4175b75ab354925" + dependencies: + css-select "~1.0.0" + dom-serializer "~0.1.0" + entities "~1.1.1" + htmlparser2 "~3.8.1" + lodash "^3.2.0" + cheerio@^0.20.0: version "0.20.0" resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-0.20.0.tgz#5c710f2bab95653272842ba01c6ea61b3545ec35" @@ -1414,6 +1424,15 @@ css-select@^1.1.0, css-select@~1.2.0: domutils "1.5.1" nth-check "~1.0.1" +css-select@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.0.0.tgz#b1121ca51848dd264e2244d058cee254deeb44b0" + dependencies: + boolbase "~1.0.0" + css-what "1.0" + domutils "1.4" + nth-check "~1.0.0" + css-selector-tokenizer@^0.5.1: version "0.5.4" resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.5.4.tgz#139bafd34a35fd0c1428487049e0699e6f6a2c21" @@ -1429,6 +1448,10 @@ css-selector-tokenizer@^0.7.0: fastparse "^1.1.1" regexpu-core "^1.0.0" +css-what@1.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-1.0.0.tgz#d7cc2df45180666f99d2b14462639469e00f736c" + css-what@2.1: version "2.1.0" resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd" @@ -1648,6 +1671,12 @@ domutils@1.1: dependencies: domelementtype "1" +domutils@1.4: + version "1.4.3" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.4.3.tgz#0865513796c6b306031850e175516baf80b72a6f" + dependencies: + domelementtype "1" + domutils@1.5, domutils@1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" @@ -2194,6 +2223,22 @@ gh-pages@^0.11.0: q-io "1.13.2" wrench "1.5.8" +gitbook-plugin-codepen@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/gitbook-plugin-codepen/-/gitbook-plugin-codepen-0.1.2.tgz#64fb5ba9be9734328a44bab2214422c044a85f16" + dependencies: + cheerio "^0.19.0" + underscore "^1.8.3" + url-parse "^1.0.0" + +gitbook-plugin-edit-link@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/gitbook-plugin-edit-link/-/gitbook-plugin-edit-link-2.0.2.tgz#d8fcd927eced81e7a662a72d59db609eafd7e72f" + +gitbook-plugin-github@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/gitbook-plugin-github/-/gitbook-plugin-github-3.0.0.tgz#67457df98a57ea8ef9b2518b88340db370a5317b" + glob-base@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" @@ -3322,7 +3367,7 @@ lodash.words@^3.0.0: dependencies: lodash._root "^3.0.0" -lodash@^3.8.0: +lodash@^3.2.0, lodash@^3.8.0: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" @@ -3717,6 +3762,10 @@ normalize-url@^1.4.0: query-string "^4.1.0" sort-keys "^1.0.0" +normalize.css@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-7.0.0.tgz#abfb1dd82470674e0322b53ceb1aaf412938e4bf" + "npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" @@ -3726,7 +3775,7 @@ normalize-url@^1.4.0: gauge "~2.7.3" set-blocking "~2.0.0" -nth-check@~1.0.1: +nth-check@~1.0.0, nth-check@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4" dependencies: @@ -4365,6 +4414,10 @@ querystring@0.2.0, querystring@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" +querystringify@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-1.0.0.tgz#6286242112c5b712fa654e526652bf6a13ff05cb" + randomatic@^1.1.3: version "1.1.7" resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c" @@ -4673,7 +4726,7 @@ require-main-filename@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" -requires-port@1.x.x: +requires-port@1.x.x, requires-port@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" @@ -5281,6 +5334,10 @@ ultron@1.0.x: version "1.0.2" resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa" +underscore@^1.8.3: + version "1.8.3" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022" + underscore@~1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8" @@ -5326,6 +5383,13 @@ url-parse-lax@^1.0.0: dependencies: prepend-http "^1.0.1" +url-parse@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.2.0.tgz#3a19e8aaa6d023ddd27dcc44cb4fc8f7fec23986" + dependencies: + querystringify "~1.0.0" + requires-port "~1.0.0" + url-to-options@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9" @@ -5453,6 +5517,10 @@ vue-resource@^1.0.3: dependencies: got "^7.1.0" +vue-select@*: + version "2.4.0" + resolved "https://registry.yarnpkg.com/vue-select/-/vue-select-2.4.0.tgz#ef06547fe857f3259841ab2f3d29c5d8a1e52630" + vue-style-loader@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-1.0.0.tgz#abeb7bd0f46313083741244d3079d4f14449e049" From a861b1655396c08280bd30d64b35623e3a1339e5 Mon Sep 17 00:00:00 2001 From: Jeff Date: Mon, 22 Jan 2018 19:17:38 -0800 Subject: [PATCH 11/15] just redirect on option click --- docs/homepage/home.html | 13 ++----------- docs/homepage/home.js | 5 +++++ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/docs/homepage/home.html b/docs/homepage/home.html index e6e6c5c..46ce592 100644 --- a/docs/homepage/home.html +++ b/docs/homepage/home.html @@ -59,22 +59,14 @@ to Select2/Chosen without the overhead of jQuery.

- + - - -
- +
  • Supports Vuex
  • @@ -108,7 +100,6 @@
-