phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #266 from integ3r/dialog

Browse Source 
Dialog fixups: Mobile
This commit is contained in:
Philipp Schaefer
2013-05-11 16:10:31 -07:00
parent 96add49516 59fce850c8
commit cb66801d9f
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/dialog.js
View File

@ -127,7 +127,7 @@ window.dialog = function(options) {
var dialog = $(this).closest('.ui-dialog'); var dialog = $(this).closest('.ui-dialog');
var selector = dialog.find('.ui-dialog-content,.ui-dialog-buttonpane'); var selector = dialog.find('.ui-dialog-content,.ui-dialog-buttonpane');
var button = dialog.find('.ui-dialog-titlebar-button-collapse'); var button = dialog.find('.ui-dialog-titlebar-button-collapse');
if (collapsed) { if(collapsed) {
$(selector).removeClass('ui-dialog-content-hidden'); $(selector).removeClass('ui-dialog-content-hidden');
$(button).removeClass('ui-dialog-titlebar-button-collapse-collapsed'); $(button).removeClass('ui-dialog-titlebar-button-collapse-collapsed');
$(button).addClass('ui-dialog-titlebar-button-collapse-expanded'); $(button).addClass('ui-dialog-titlebar-button-collapse-expanded');
@ -151,7 +151,7 @@ window.dialog = function(options) {
console.log('window.dialog: ' + $(this).data('id') + ' (' + $(this).dialog('option', 'title') + ') opened. ' + window.DIALOG_COUNT + ' remain.'); console.log('window.dialog: ' + $(this).data('id') + ' (' + $(this).dialog('option', 'title') + ') opened. ' + window.DIALOG_COUNT + ' remain.');
}, },
close: function() { close: function() {
// Run the close callback if we have one // Run the close callback if we have one
if($(this).data('closeCallback')) { if($(this).data('closeCallback')) {
$.proxy($(this).data('closeCallback'), this)(); $.proxy($(this).data('closeCallback'), this)();
@ -203,14 +203,14 @@ window.dialog = function(options) {
dialog.data('focusCallback', options.focusCallback); dialog.data('focusCallback', options.focusCallback);
dialog.data('blurCallback', options.blurCallback); dialog.data('blurCallback', options.blurCallback);
// ui-modal includes overrides for modal dialogs if(options.modal) {
if (options.modal) { // ui-modal includes overrides for modal dialogs
dialog.parent().addClass('ui-modal'); 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 // Run it
dialog.dialog('open'); dialog.dialog('open');

2
code/utils_misc.js
View File

@ -159,7 +159,7 @@ window.showPortalPosLinks = function(lat, lng, name) {
encoded_name = encodeURIComponent(' (' + name + ')'); encoded_name = encodeURIComponent(' (' + name + ')');
} }
if (typeof android !== 'undefined' && android && android.intentPosLink) { if (typeof android !== 'undefined' && android && android.intentPosLink) {
android.intentPosLink(lat, lng, portal_name); android.intentPosLink(lat, lng, encoded_name);
} else { } else {
var qrcode = '<div id="qrcode"></div>'; var qrcode = '<div id="qrcode"></div>';
var script = '<script>$(\'#qrcode\').qrcode({text:\'GEO:'+lat+','+lng+'\'});</script>'; var script = '<script>$(\'#qrcode\').qrcode({text:\'GEO:'+lat+','+lng+'\'});</script>';