From 6a5fdd0837be67bccd471928430f725a8f68518b Mon Sep 17 00:00:00 2001 From: Damian Karzon Date: Sun, 9 Nov 2014 11:03:11 +1300 Subject: [PATCH 1/5] Fixed touch scrolling and the js errors on windows --- js/angular/controller/scrollController.js | 5 ++++- js/angular/service/viewService.js | 5 ++++- release/js/ionic-angular.js | 5 ++++- scss/_scaffolding.scss | 1 + 4 files changed, 13 insertions(+), 3 deletions(-) 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, From 7e762b9cbfc4cdd7c2c2997ff44d36abbb66ab8a Mon Sep 17 00:00:00 2001 From: mhartington Date: Wed, 28 Jan 2015 14:17:33 -0500 Subject: [PATCH 2/5] fix(video): prevent styles from bleeding into html video tag --- scss/_form.scss | 27 ++++++++++++++++----------- scss/_range.scss | 3 +-- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/scss/_form.scss b/scss/_form.scss index ce735af115..8976a2f6ac 100644 --- a/scss/_form.scss +++ b/scss/_form.scss @@ -214,10 +214,13 @@ input[type="color"] { } } -input, -textarea { - width: 100%; +.item-input { + input, + textarea { + width: 100%; + } } + textarea { padding-left: 0; @include placeholder($input-color-placeholder, -3px); @@ -255,14 +258,16 @@ input[type="checkbox"] { } // Reset width of input images, buttons, radios, checkboxes -input[type="file"], -input[type="image"], -input[type="submit"], -input[type="reset"], -input[type="button"], -input[type="radio"], -input[type="checkbox"] { - width: auto; // Override of generic input selector +.item-input { + input[type="file"], + input[type="image"], + input[type="submit"], + input[type="reset"], + input[type="button"], + input[type="radio"], + input[type="checkbox"] { + width: auto; // Override of generic input selector + } } // Set the height of file to match text inputs diff --git a/scss/_range.scss b/scss/_range.scss index ebff266eb6..e926b51315 100644 --- a/scss/_range.scss +++ b/scss/_range.scss @@ -4,7 +4,7 @@ * -------------------------------------------------- */ -input[type="range"] { + .range input{ display: inline-block; overflow: hidden; margin-top: 5px; @@ -119,4 +119,3 @@ input[type="range"] { padding-right: 5px; padding-left: 0; } - From 3c74a9dc5429be9bd4e4a781234b11abc9933241 Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Fri, 30 Jan 2015 12:52:53 -0600 Subject: [PATCH 3/5] Update README.md --- README.md | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/README.md b/README.md index 9fb0f56c6d..366739d4bf 100644 --- a/README.md +++ b/README.md @@ -66,25 +66,7 @@ For most cases, you'll need AngularJS as well. This is bundled in `js/angular/` ## Authors -**Max Lynch** - -+ -+ - -**Ben Sperry** - -+ -+ - -**Adam Bradley** - -+ -+ - -**Andrew Joslin** - -+ -+ +Originally created by [Adam Bradley](http://twitter.com/adamdbradley), [Ben Sperry](http://twitter.com/benjsperry), and [Max Lynch](http://twitter.com/maxlynch), Ionic has seen hundreds of great [contributors](https://github.com/driftyco/ionic/graphs/contributors) from around the world, including Ionic Team Members [Andrew Joslin](http://twitter.com/andrewtjoslin), [Perry Govier](http://twitter.com/perrygovier), and [Mike Hartington](http://twitter.com/mhartington). ## Development From c1ef471883d8c93d4f8dd444664572742563c56a Mon Sep 17 00:00:00 2001 From: mhartington Date: Fri, 30 Jan 2015 23:02:52 -0500 Subject: [PATCH 4/5] fix(css): add height to item-image and fix nav-bar --- scss/_items.scss | 4 ++++ scss/_platform.scss | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/scss/_items.scss b/scss/_items.scss index 24ddd8c34f..ae69322cde 100644 --- a/scss/_items.scss +++ b/scss/_items.scss @@ -474,6 +474,7 @@ button.item.item-button-right { max-width: $item-avatar-width; max-height: $item-avatar-height; width: 100%; + height: 100%; border-radius: $item-avatar-border-radius; } } @@ -491,6 +492,7 @@ button.item.item-button-right { max-width: $item-avatar-width; max-height: $item-avatar-height; width: 100%; + height: 100%; border-radius: $item-avatar-border-radius; } } @@ -513,6 +515,7 @@ button.item.item-button-right { max-width: $item-thumbnail-width; max-height: $item-thumbnail-height; width: 100%; + height: 100%; } } .item-avatar.item-complex, @@ -536,6 +539,7 @@ button.item.item-button-right { max-width: $item-thumbnail-width; max-height: $item-thumbnail-height; width: 100%; + height: 100%; } } .item-avatar-right.item-complex, diff --git a/scss/_platform.scss b/scss/_platform.scss index aaf5e68b53..75747cd445 100644 --- a/scss/_platform.scss +++ b/scss/_platform.scss @@ -33,7 +33,7 @@ .has-subheader { top: $bar-height + $bar-subheader-height + $ios-statusbar-height; } - .has-tabs-top { + .has-header.has-tabs-top { top: $bar-height + $tabs-height + $ios-statusbar-height; } .has-header.has-subheader.has-tabs-top { From 8b4b800f164a29b88a8b0bf285c1c95761027526 Mon Sep 17 00:00:00 2001 From: Damian Karzon Date: Sun, 9 Nov 2014 11:03:11 +1300 Subject: [PATCH 5/5] Fixed touch scrolling and the js errors on windows Conflicts: js/angular/service/viewService.js --- js/angular/controller/scrollController.js | 5 ++++- js/angular/service/viewService.js | 4 ++++ release/js/ionic-angular.js | 5 ++++- scss/_scaffolding.scss | 1 + 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/js/angular/controller/scrollController.js b/js/angular/controller/scrollController.js index a342d0bf26..05d365b90b 100644 --- a/js/angular/controller/scrollController.js +++ b/js/angular/controller/scrollController.js @@ -67,7 +67,10 @@ function($scope, scrollViewOptions, $timeout, $window, $location, $document, $io $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); scrollViewOptions = null; diff --git a/js/angular/service/viewService.js b/js/angular/service/viewService.js index f27794ead9..cc25cc917c 100644 --- a/js/angular/service/viewService.js +++ b/js/angular/service/viewService.js @@ -9,6 +9,10 @@ IonicModule $log.warn('$ionicViewService' + oldMethod + ' is deprecated, please use $ionicHistory' + newMethod + ' instead: http://ionicframework.com/docs/nightly/api/service/$ionicHistory/'); } + //Windows: no hide method available + if (ionic.keyboard.hide) { + ionic.keyboard.hide(); + } warn('', ''); var methodsMap = { diff --git a/release/js/ionic-angular.js b/release/js/ionic-angular.js index 4c0fa7c0b2..0b68bb3c51 100644 --- a/release/js/ionic-angular.js +++ b/release/js/ionic-angular.js @@ -6559,7 +6559,10 @@ function($scope, scrollViewOptions, $timeout, $window, $location, $document, $io $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); scrollViewOptions = null; diff --git a/scss/_scaffolding.scss b/scss/_scaffolding.scss index bdbaa8b209..1d6d9f8576 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,