From 7d028ec344cd6e96f6ef770218a29899f7f35c47 Mon Sep 17 00:00:00 2001
From: crdlc <crdlc@tid.es>
Date: Fri, 12 Jul 2013 14:10:22 +0200
Subject: [PATCH] Bug 892357 - Followup to bug 890454 - [Homescreen] The
 save-bookmark screen does not work fine when Add to Home Screen button is
 pressed continuously

---
 apps/homescreen/js/bookmark.js     | 26 +++++++++++++++++++-------
 apps/homescreen/save-bookmark.html |  2 +-
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/apps/homescreen/js/bookmark.js b/apps/homescreen/js/bookmark.js
index ad4eb6340615..833bd56b2ec6 100644
--- a/apps/homescreen/js/bookmark.js
+++ b/apps/homescreen/js/bookmark.js
@@ -47,6 +47,21 @@ var BookmarkEditor = {
     this.data = options.data;
     this.onsaved = options.onsaved;
     this.oncancelled = options.oncancelled;
+    this.origin = document.location.protocol + '//homescreen.' +
+          document.location.host.replace(/(^[\w\d]+.)?([\w\d]+.[a-z]+)/, '$2');
+    if (document.readyState === 'complete' ||
+        document.readyState === 'interactive') {
+      this._init();
+    } else {
+      var self = this;
+      document.addEventListener('DOMContentLoaded', function loaded() {
+        document.removeEventListener('DOMContentLoaded', loaded);
+        self._init();
+      });
+    }
+  },
+
+  _init: function bookmarkEditor_init() {
     document.getElementById('bookmark-form').onsubmit = function() {
       return false;
     };
@@ -57,13 +72,12 @@ var BookmarkEditor = {
     this.addButton = document.getElementById('button-bookmark-add');
 
     this.cancelButton.addEventListener('click', this.close.bind(this));
-    this.addButton.addEventListener('click', this.save.bind(this));
+    this.saveListener = this.save.bind(this);
+    this.addButton.addEventListener('click', this.saveListener);
+    this.addButton.removeAttribute('disabled');
 
     this.bookmarkTitle.value = this.data.name || '';
     this.bookmarkUrl.value = this.data.url || '';
-
-    this.origin = document.location.protocol + '//homescreen.' +
-      document.location.host.replace(/(^[\w\d]+.)?([\w\d]+.[a-z]+)/, '$2');
   },
 
   close: function bookmarkEditor_close() {
@@ -71,14 +85,12 @@ var BookmarkEditor = {
   },
 
   save: function bookmarkEditor_save(evt) {
-    evt.stopPropagation();
-    evt.preventDefault();
+    this.addButton.removeEventListener('click', this.saveListener);
 
     // Only allow http(s): urls to be bookmarked.
     if (/^https?:/.test(this.bookmarkUrl.value) == false)
       return;
 
-    this.addButton.disabled = true;
     this.data.name = this.bookmarkTitle.value;
     this.data.bookmarkURL = this.bookmarkUrl.value;
 
diff --git a/apps/homescreen/save-bookmark.html b/apps/homescreen/save-bookmark.html
index 205fe6fdfcb3..672d2376efc4 100644
--- a/apps/homescreen/save-bookmark.html
+++ b/apps/homescreen/save-bookmark.html
@@ -42,7 +42,7 @@ <h1 data-l10n-id="add-to-home-screen">Add to Home Screen</h1>
         <label data-l10n-id="address">
           Address <input type="url" id="bookmark-url"></input>
         </label>
-        <button id="button-bookmark-add" data-l10n-id="add-to-home-screen">Add to Home Screen</button>
+        <button id="button-bookmark-add" disabled data-l10n-id="add-to-home-screen">Add to Home Screen</button>
       </form>
     </section>
   </body>