Merge pull request #12533 from EverythingMe/912386-apps-hold-click

[Bug 912386] fix long-tap on app won't prevent normal click [r=crdlc]
mozilla-b2g · Sep 30, 2013 · e7c0113 · e7c0113
2 parents 3b22ac5 + ff950a9
commit e7c0113
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/apps/homescreen/everything.me/js/Brain.js b/apps/homescreen/everything.me/js/Brain.js
@@ -31,6 +31,7 @@
         CLASS_WHEN_HAS_QUERY = 'evme-has-query',
         CLASS_WHEN_COLLECTION_VISIBLE = 'evme-collection-visible',
         CLASS_WHEN_LOADING_SHORTCUTS_SUGGESTIONS = 'evme-suggest-collections-loading',
+        CLASS_WHEN_SAVING_TO_HOMESCREEN = 'save-to-homescreen',
 
         L10N_SYSTEM_ALERT = 'alert',
 
@@ -672,20 +673,28 @@ this.InstalledAppsService = new function InstalledAppsService() {
         }
 
         function saveToHomescreen(data, showConfirm) {
-            var isAppInstalled = EvmeManager.isAppInstalled(data.app.getFavLink());
+            var isAppInstalled = EvmeManager.isAppInstalled(data.app.getFavLink()),
+                classList = data.el.classList;
 
             if (isAppInstalled) {
+                classList.add(CLASS_WHEN_SAVING_TO_HOMESCREEN);
                 window.alert(Evme.Utils.l10n(L10N_SYSTEM_ALERT, 'app-install-exists', {
                     'name': data.data.name
                 }));
+                classList.remove(CLASS_WHEN_SAVING_TO_HOMESCREEN);
                 return;
             }
 
             if (showConfirm) {
                 var msg = Evme.Utils.l10n(L10N_SYSTEM_ALERT, 'app-install-confirm', {
                     'name': data.data.name
                 });
-                if (!window.confirm(msg)) {
+
+                classList.add(CLASS_WHEN_SAVING_TO_HOMESCREEN);
+                var saved = window.confirm(msg);
+                classList.remove(CLASS_WHEN_SAVING_TO_HOMESCREEN);
+
+                if (!saved) {
                     return;
                 }
             }

diff --git a/apps/homescreen/everything.me/modules/Results/Results.css b/apps/homescreen/everything.me/modules/Results/Results.css
@@ -52,10 +52,14 @@
     position: relative; /* for span.remove positioning */
 }
 
-.evmeScope .evme-apps ul.marketapps li{
+.evmeScope .evme-apps ul.marketapps li {
     height: 9.3rem;
 }
 
+.evmeScope .evme-apps ul li.save-to-homescreen {
+  pointer-events: none;
+}
+
 .evmeScope .evme-apps:not(.has-installed) .has-installed-visible {
     display: none;
 }