diff --git a/code/panes.js b/code/panes.js index 8ab4610e..5fd037fe 100644 --- a/code/panes.js +++ b/code/panes.js @@ -1,10 +1,17 @@ // created to start cleaning up "window" interaction // window.show = function(id) { - window.hideall(); if (typeof android !== 'undefined' && android && android.switchToPane) { android.switchToPane(id); } + /* + * disable all map properties when switching to another pane + * because sometimes (bug?) touch events are passed to the map when + * other panes are focussed + */ + window.disableMapProperties(); + window.hideall(); + switch(id) { case 'full': window.chat.show('full'); @@ -22,6 +29,7 @@ window.show = function(id) { window.debug.console.show(); break; case 'map': + window.enableMapProperties(); window.smartphone.mapButton.click(); $('#portal_highlight_select').show(); $('#farm_level_select').show(); @@ -35,8 +43,23 @@ window.show = function(id) { } } +window.enableMapProperties = function() { + window.map.tap.enable(); + window.map.dragging.enable(); + window.map.touchZoom.enable(); + window.map.doubleClickZoom.enable(); +} + +window.disableMapProperties = function() { + window.map.tap.disable(); + window.map.dragging.disable(); + window.map.touchZoom.disable(); + window.map.doubleClickZoom.disable(); +} + window.hideall = function() { $('#chatcontrols, #chat, #chatinput, #sidebartoggle, #scrollwrapper, #updatestatus, #portal_highlight_select').hide(); $('#farm_level_select').hide(); $('#map').css('visibility', 'hidden'); + $('.ui-tooltip').remove(); } diff --git a/mobile/AndroidManifest.xml b/mobile/AndroidManifest.xml index 9416f52f..bfe5e003 100644 --- a/mobile/AndroidManifest.xml +++ b/mobile/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="55" + android:versionName="0.7.5"> 1) + actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS); + mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this); int selected = mSharedPrefs.getInt("pref_share_selected_tab", 0); if (selected < mFragmentAdapter.getCount()) { mViewPager.setCurrentItem(selected); - actionBar.setSelectedNavigationItem(selected); + if (actionBar.getNavigationMode() != ActionBar.NAVIGATION_MODE_STANDARD) + actionBar.setSelectedNavigationItem(selected); } }