From e8c9932014f91505b375fa088a3571c8f83a6221 Mon Sep 17 00:00:00 2001 From: Wouter R Date: Wed, 15 Jan 2014 17:52:30 +0100 Subject: [PATCH] Prevent magnifying glass from appearing on iPad. Cancel wordart on click/tap outside dialog popup. --- js/Button.js | 2 ++ js/WordArt.js | 2 ++ 2 files changed, 4 insertions(+) diff --git a/js/Button.js b/js/Button.js index e88842d..f3c46c4 100644 --- a/js/Button.js +++ b/js/Button.js @@ -63,6 +63,8 @@ var onTouchStart = function(e) { updateCursor(e); startDownTimer(); + $(element).trigger("onButtonClick",{x:_x,y:_y}); + e.preventDefault(); } var onTouchEnd = function(e) { diff --git a/js/WordArt.js b/js/WordArt.js index 9e45d12..ea67c48 100644 --- a/js/WordArt.js +++ b/js/WordArt.js @@ -8,11 +8,13 @@ function initWordArt() { function showWordArtDialog() { buttonGroupAdd.hide(); showPopup(popupWordArt); + $("#popupMask").bind("click", onWordArtCancel); $("#txtWordArt").focus(); $("#txtWordArt").val(""); //clear textbox } function onWordArtCancel() { + $("#popupMask").unbind("click"); hidePopup(popupWordArt); }