sharpetronics/crunchbutton
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed a couple mobile issues

Browse Source
This commit is contained in:
arzynik 2013-07-24 19:11:23 -07:00
parent 722583b340
commit 8069ab64f2
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/views/default/crunchbutton/layout/html.bottom.phtml
View File

@ -21,6 +21,7 @@ if (App){
<div class="snap-drawer snap-drawer-left">
<div>
<ul>
<li><a href="javascript:;" ng-tap="navigation.link('/food-delivery')">Restaurants</a></li>
<li><a href="javascript:;" ng-tap="navigation.link('/location')">Change Location</a></li>
<li><a ng-show="navigation.account.user" href="javascript:;" ng-tap="navigation.link('/orders')">Order History</a></li>
<li><a href="javascript:;" ng-tap="navigation.link('/help')">Help</a></li>
@ -47,11 +48,10 @@ if (App){
<div class="content<?=$e?>">
<div class="pacman-loading pacman-left"></div>
<div class="nav-back" ng-tap="back()"></div>
<div class="logo"><a href="javascript:;" ng-tap="navigation.link('/')"><div class="logo-img"></div></a></div>
<div title="Back" ng-show="navigation.buttons.back" class="nav-back" ng-tap="back()"></div>
<div title="Change location" ng-show="navigation.buttons.location" class="location-icon {{ navigation.page == 'home' && 'config-icon-desktop-hide' || '' }}" ng-tap="navigation.link('/location')"></div>
<div title="Menu" ng-show="navigation.buttons.menu" class="menu-icon {{ navigation.page == 'home' && 'config-icon-desktop-hide' || '' }}" ng-tap="navigation.link('/location')"></div>

2
www/assets/css/style.css
View File

@ -1005,7 +1005,7 @@ html[xmlns] .clearfix {
}
.nav-back {
display: none;
}
.meal-item-tag, .meal-item-tag-closed {

7
www/assets/js/app.js
View File

@ -514,6 +514,7 @@ $(function() {
$(window).resize(function() {
snapperCheck();
});
App.snap = snapper;
$.totalStorage.ls(App.localStorage);
@ -521,7 +522,6 @@ $(function() {
App._init = true;
App.NGinit();
App.test.init();
$(document).on('touchclick', '.delivery-toggle-delivery', function(e) {
@ -654,8 +654,6 @@ $(function() {
e.preventDefault();
});
*/
}
$('.dish-item').tap(function() {
@ -787,7 +785,8 @@ $(function() {
focused = focused.get(0);
if (focused.tagName == 'SELECT' || focused.tagName == 'INPUT' || focused.tagName == 'TEXTAREA') {
$('[data-position="fixed"]').hide();
// @todo: fix this so it hides
//$('[data-position="fixed"]').hide();
} else {
$('[data-position="fixed"]').show();
}

13
www/assets/js/services.navigation.js
View File

@ -14,22 +14,25 @@ NGApp.factory( 'MainNavigationService', function( $http, $location, AccountServi
service.link = function( path ){
$location.path( path || '/' );
App.snap.close();
}
service.signin = function(){
service.modal.signinOpen();
}
service.control = function(){
service.control = function() {
switch (service.page) {
case 'location':
case 'restaurant':
service.buttons.location = false;
service.buttons.menu = true;
service.buttons.back = true;
service.buttons.menu = false;
break;
default:
service.buttons.location = true;
service.buttons.menu = false;
service.buttons.back = false;
service.buttons.location = false;
service.buttons.menu = true;
break;
}
}