Merge pull request #998 from Pomax/colorbacker

color picker always hides on 'back' now
mozilla · Feb 11, 2015 · 9787484 · 9787484
2 parents 4a9d0fa + 84abe4b
commit 9787484
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/components/colorPicker/index.js b/components/colorPicker/index.js
@@ -9,6 +9,9 @@ module.exports = {
         this.$on('openCP', function (event) {
             this.show = true;
             this.originalColor = event;
+            this.cancelIntercept = this.onCancel.bind(this);
+            document.addEventListener('backbutton',
+                this.cancelIntercept, true);
         });
     },
     computed: {
@@ -38,6 +41,9 @@ module.exports = {
         },
         onCancel: function (e) {
             e.preventDefault();
+            e.stopPropagation();
+            document.removeEventListener('backbutton',
+                this.cancelIntercept, true);
             this.selectedColor = this.originalColor;
             this.show = false;
         }