From 99bbcbcb30a44c796031d4f99c159d16795042d5 Mon Sep 17 00:00:00 2001
From: Morgan Jones <mjones@rice.edu>
Date: Sat, 11 May 2013 16:33:30 -0600
Subject: [PATCH] * Fix bug that would cause modal dialogs to not show up
 (modal dialogs aren't draggables) * Fix issue that broke portal poslinks on
 mobile

---
 code/dialog.js     | 10 +++++-----
 code/utils_misc.js |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/dialog.js b/code/dialog.js
index 0fd05311..4615f73e 100644
--- a/code/dialog.js
+++ b/code/dialog.js
@@ -127,7 +127,7 @@ window.dialog = function(options) {
           var dialog   = $(this).closest('.ui-dialog');
           var selector = dialog.find('.ui-dialog-content,.ui-dialog-buttonpane');
           var button   = dialog.find('.ui-dialog-titlebar-button-collapse');
-          if (collapsed) {
+          if(collapsed) {
             $(selector).removeClass('ui-dialog-content-hidden');
             $(button).removeClass('ui-dialog-titlebar-button-collapse-collapsed');
             $(button).addClass('ui-dialog-titlebar-button-collapse-expanded');
@@ -203,14 +203,14 @@ window.dialog = function(options) {
   dialog.data('focusCallback', options.focusCallback);
   dialog.data('blurCallback', options.blurCallback);
 
-  // ui-modal includes overrides for modal dialogs
   if (options.modal) {
+    // ui-modal includes overrides for modal dialogs
     dialog.parent().addClass('ui-modal');
+  } else {
+    // Enable snapping
+    dialog.dialog().parents('.ui-dialog').draggable('option', 'snap', true);
   }
 
-  // Enable snapping
-  dialog.dialog().parents('.ui-dialog').draggable('option', 'snap', true);
-
   // Run it
   dialog.dialog('open');
 
diff --git a/code/utils_misc.js b/code/utils_misc.js
index a236f5ad..df66a507 100644
--- a/code/utils_misc.js
+++ b/code/utils_misc.js
@@ -159,7 +159,7 @@ window.showPortalPosLinks = function(lat, lng, name) {
     encoded_name = encodeURIComponent(' (' + name + ')');
   }
   if (typeof android !== 'undefined' && android && android.intentPosLink) {
-    android.intentPosLink(lat, lng, portal_name);
+    android.intentPosLink(lat, lng, encoded_name);
   } else {
     var qrcode = '<div id="qrcode"></div>';
     var script = '<script>$(\'#qrcode\').qrcode({text:\'GEO:'+lat+','+lng+'\'});</script>';