Merge pull request web2py#1531 from vinyldarkscratch/master

Mobile (iOS) flash dismissal fix
maxslimmer · Nov 14, 2016 · ad9ebea · ad9ebea
2 parents c72330f + e19435d
commit ad9ebea
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,7 @@
 *.orig
 Thumbs.db
 .DS_Store
+*.DS_Store
 index.yaml
 routes.py
 logging.conf

diff --git a/applications/admin/static/js/web2py.js b/applications/admin/static/js/web2py.js
@@ -168,7 +168,8 @@
              * and require no dom manipulations
              */
             var doc = $(document);
-            doc.on('click', '.w2p_flash', function () {
+            doc.on('click', '.w2p_flash', function (event) {
+                event.preventDefault();
                 var t = $(this);
                 if (t.css('top') == '0px') t.slideUp('slow');
                 else t.fadeOut();

diff --git a/applications/examples/static/js/web2py.js b/applications/examples/static/js/web2py.js
@@ -168,7 +168,8 @@
              * and require no dom manipulations
              */
             var doc = $(document);
-            doc.on('click', '.w2p_flash', function () {
+            doc.on('click', '.w2p_flash', function (event) {
+                event.preventDefault();
                 var t = $(this);
                 if (t.css('top') == '0px') t.slideUp('slow');
                 else t.fadeOut();

diff --git a/applications/welcome/static/js/web2py.js b/applications/welcome/static/js/web2py.js
@@ -168,7 +168,8 @@
              * and require no dom manipulations
              */
             var doc = $(document);
-            doc.on('click', '.w2p_flash', function () {
+            doc.on('click', '.w2p_flash', function (event) {
+                event.preventDefault();
                 var t = $(this);
                 if (t.css('top') == '0px') t.slideUp('slow');
                 else t.fadeOut();