mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2026-03-13 10:22:08 +08:00
Fixed touch scrolling and the js errors on windows
This commit is contained in:
5
js/angular/controller/scrollController.js
vendored
5
js/angular/controller/scrollController.js
vendored
@@ -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();
|
||||
|
||||
5
js/angular/service/viewService.js
vendored
5
js/angular/service/viewService.js
vendored
@@ -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) {
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -41,6 +41,7 @@ body,
|
||||
text-rendering: optimizeLegibility;
|
||||
-webkit-backface-visibility: hidden;
|
||||
-webkit-user-drag: none;
|
||||
-ms-content-zooming: none;
|
||||
}
|
||||
|
||||
body.grade-b,
|
||||
|
||||
Reference in New Issue
Block a user