fix merge conflicts

craigh411 · Sep 25, 2020 · 4a9a836 · 4a9a836
2 parents 96118d0 + 62e6040
commit 4a9a836
Show file tree

Hide file tree

Showing 11 changed files with 166 additions and 218 deletions.
diff --git a/README.md b/README.md
@@ -146,8 +146,9 @@ These props are used to style the star rating component
 | padding  | Pads the right of each star so distance between stars can be altered | 0 |
 | rounded-corners | Whether or not to round the star's corners | false |
 | inline  | Sets the star rating to display inline | false |
-| glow | Adds a subtle glow around each active star, this should be a number to spread the glow | 0 |
-| glow-color | Sets the color for the glow (note, this effect can be very subtle) | #000 |
+| clearable  | When set to true a second click on the same rating clears the rating | false |
+| glow | Adds a subtle glow around each active star, this should be a number to spread the glow (requires `glow-color` to be set) | 0 |
+| glow-color | Sets the color for the glow (note, this effect can be very subtle) | null |
 | text-class  | A css class name to style the rating text for a specific star rating component | '' |
 
 **Important:** Vue requires you to pass numbers and boolean values using `v-bind`, any props that require a number or bool should use `v-bind:` or the colon (`:`) shorthand.

diff --git a/dist/VueStarRating.common.js b/dist/VueStarRating.common.js
diff --git a/dist/VueStarRating.common.js.map b/dist/VueStarRating.common.js.map
diff --git a/dist/VueStarRating.umd.js b/dist/VueStarRating.umd.js
diff --git a/dist/VueStarRating.umd.js.map b/dist/VueStarRating.umd.js.map
diff --git a/dist/VueStarRating.umd.min.js b/dist/VueStarRating.umd.min.js
diff --git a/dist/VueStarRating.umd.min.js.map b/dist/VueStarRating.umd.min.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-star-rating",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "A simple, highly customisable star rating component for Vue 3.x.",
   "main": "dist/VueStarRating.common.js",
   "scripts": {

diff --git a/spec/star-rating.spec.js b/spec/star-rating.spec.js
@@ -221,9 +221,9 @@ describe('star-rating component', () => {
             const wrapper = mount(StarRating)
             let stars = wrapper.findAll('polygon')
 
-            // expect there to be 15 polygons, because we have 3 polygons for each star to account for border and glow
-            // so, 5 stars is 15 polygons
-            expect(stars.length).toEqual(15);
+            // expect there to be 10 polygons, because we have 2 polygons for each star (3 if glow is turned on) to account for border and glow
+            // so, 5 stars is 10 polygons
+            expect(stars.length).toEqual(10);
         });
 
 

diff --git a/src/star-rating.vue b/src/star-rating.vue
@@ -126,7 +126,7 @@ export default {
         },
         glowColor: {
             type: String,
-            default: '#fff'
+            default: null
         },
         clearable: {
             type: Boolean,