CSS-Styles - Englische Namen eingebunden

This commit is contained in:
Hilmer, Carsten
2016-09-16 13:38:34 +02:00
parent 0d1b440b7d
commit c4088694a8
9 changed files with 63 additions and 174 deletions

View File

@@ -104,6 +104,14 @@ appControllers.controller('menuCtrl', function ($scope, $timeout, $mdUtil, $mdSi
if($ionicHistory.backView() == null){
var myView=$ionicHistory.currentView();
if (myView.stateName=='app.imagedownload'){
$scope.navigateTo('app.pokemonlist');
}
else{
//Check is popup dialog is not open.
if(jQuery('[id^=dialog]').length == 0 ) {
@@ -130,6 +138,9 @@ appControllers.controller('menuCtrl', function ($scope, $timeout, $mdUtil, $mdSi
// For cancel button actions.
}); //End mdDialog
}
}//Else myView
}
else{
//Go to the view of lasted state.