Fixed touch scrolling and the js errors on windows

This commit is contained in:
Damian Karzon
2014-11-09 11:03:11 +13:00
parent 8b1bef3ea1
commit 6a5fdd0837
4 changed files with 13 additions and 3 deletions

View File

@@ -73,7 +73,10 @@ function($scope, scrollViewOptions, $timeout, $window, $$scrollValueCache, $loca
$scope.$on('$destroy', function() {
deregisterInstance();
scrollView.__cleanup();
//Windows: make sure the scrollView.__cleanup exists before calling it
if (scrollView.__cleanup) {
scrollView.__cleanup();
}
ionic.off('resize', resize, $window);
$window.removeEventListener('resize', resize);
viewContentLoaded();

View File

@@ -32,7 +32,10 @@ function($rootScope, $state, $location, $document, $animate, $ionicPlatform, $io
// always reset the keyboard state when change stage
$rootScope.$on('$stateChangeStart', function(){
ionic.keyboard.hide();
//Windows: no hide method available
if (ionic.keyboard.hide) {
ionic.keyboard.hide();
}
});
$rootScope.$on('viewState.changeHistory', function(e, data) {

View File

@@ -4606,7 +4606,10 @@ function($scope, scrollViewOptions, $timeout, $window, $$scrollValueCache, $loca
$scope.$on('$destroy', function() {
deregisterInstance();
scrollView.__cleanup();
//Windows: make sure the scrollView.__cleanup exists before calling it
if (scrollView.__cleanup) {
scrollView.__cleanup();
}
ionic.off('resize', resize, $window);
$window.removeEventListener('resize', resize);
viewContentLoaded();

View File

@@ -41,6 +41,7 @@ body,
text-rendering: optimizeLegibility;
-webkit-backface-visibility: hidden;
-webkit-user-drag: none;
-ms-content-zooming: none;
}
body.grade-b,