Merge pull request #16944 from crdlc/bug-980237

Bug 980237 - The bookmarks edition screen closes automatically
mozilla-b2g · Mar 6, 2014 · 0d588b2 · 0d588b2
2 parents fcc877f + 6db0c7f
commit 0d588b2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/apps/homescreen/js/edit_dialog.js b/apps/homescreen/js/edit_dialog.js
@@ -12,12 +12,14 @@ var EditDialog = (function() {
     form.removeEventListener('input', updateDoneButton);
 
     var classList = dialog.classList;
-    dialog.addEventListener('transitionend', function hidden() {
-      dialog.removeEventListener('transitionend', hidden);
-      classList.remove('visible');
-    });
+    if (classList.contains('show')) {
+      dialog.addEventListener('transitionend', function hidden() {
+        dialog.removeEventListener('transitionend', hidden);
+        classList.remove('visible');
+      });
 
-    classList.remove('show');
+      classList.remove('show');
+    }
   }
 
   function show(icon) {

diff --git a/apps/homescreen/test/unit/edit_dialog_test.js b/apps/homescreen/test/unit/edit_dialog_test.js
@@ -156,4 +156,12 @@ suite('edit_dialog.js >', function() {
     assert.isFalse(setURLSpy.called);
     assertDialogIsHidden();
   });
+
+  test(' Hide edit dialog twice - no transitionend listeners lost', function() {
+    var dialogSpy = this.sinon.spy(dialog, 'addEventListener');
+    EditDialog.hide();
+    EditDialog.hide();
+    sinon.assert.callCount(dialogSpy, 1);
+    dialogSpy.restore();
+  });
 });