diff --git a/js/angular/controller/scrollController.js b/js/angular/controller/scrollController.js index e5c997c37e..92b4a49bca 100644 --- a/js/angular/controller/scrollController.js +++ b/js/angular/controller/scrollController.js @@ -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(); diff --git a/js/angular/service/viewService.js b/js/angular/service/viewService.js index b247b0f0df..1a895bf8a4 100644 --- a/js/angular/service/viewService.js +++ b/js/angular/service/viewService.js @@ -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) { diff --git a/release/js/ionic-angular.js b/release/js/ionic-angular.js index 6c0fc0691f..ab2e9055c6 100644 --- a/release/js/ionic-angular.js +++ b/release/js/ionic-angular.js @@ -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(); diff --git a/scss/_scaffolding.scss b/scss/_scaffolding.scss index 7182fe925a..34b976854f 100644 --- a/scss/_scaffolding.scss +++ b/scss/_scaffolding.scss @@ -41,6 +41,7 @@ body, text-rendering: optimizeLegibility; -webkit-backface-visibility: hidden; -webkit-user-drag: none; + -ms-content-zooming: none; } body.grade-b,