Skip to content

Commit 674208b

Browse files
IonitronIonitron
committed
demos: update for nightly
1 parent cb2a8ed commit 674208b

9 files changed

+40
-32
lines changed

Diff for: ‎nightly/ionic/css/ionic.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright 2014 Drifty Co.
33
* http://drifty.com/
44
*
5-
* Ionic, v1.0.0-beta.12-nightly-470
5+
* Ionic, v1.0.0-beta.12-nightly-471
66
* A powerful HTML5 mobile app framework.
77
* http://ionicframework.com/
88
*

Diff for: ‎nightly/ionic/css/ionic.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎nightly/ionic/js/ionic-angular.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright 2014 Drifty Co.
33
* http://drifty.com/
44
*
5-
* Ionic, v1.0.0-beta.12-nightly-470
5+
* Ionic, v1.0.0-beta.12-nightly-471
66
* A powerful HTML5 mobile app framework.
77
* http://ionicframework.com/
88
*
@@ -4743,7 +4743,7 @@ function($scope, scrollViewOptions, $timeout, $window, $$scrollValueCache, $loca
47434743
*/
47444744
this._setRefresher = function(refresherScope, refresherElement) {
47454745
var refresher = this.refresher = refresherElement;
4746-
var refresherHeight = self.refresher.clientHeight || 0;
4746+
var refresherHeight = self.refresher.clientHeight || 60;
47474747
scrollView.activatePullToRefresh(refresherHeight, function() {
47484748
// activateCallback
47494749
refresher.classList.add('active');

Diff for: ‎nightly/ionic/js/ionic-angular.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎nightly/ionic/js/ionic.bundle.js

+13-9
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Copyright 2014 Drifty Co.
1010
* http://drifty.com/
1111
*
12-
* Ionic, v1.0.0-beta.12-nightly-470
12+
* Ionic, v1.0.0-beta.12-nightly-471
1313
* A powerful HTML5 mobile app framework.
1414
* http://ionicframework.com/
1515
*
@@ -25,7 +25,7 @@
2525
// build processes may have already created an ionic obj
2626
window.ionic = window.ionic || {};
2727
window.ionic.views = {};
28-
window.ionic.version = '1.0.0-beta.12-nightly-470';
28+
window.ionic.version = '1.0.0-beta.12-nightly-471';
2929

3030
(function(window, document, ionic) {
3131

@@ -4396,11 +4396,13 @@ ionic.views.Scroll = ionic.views.View.inherit({
43964396

43974397
self.resetScrollView = function(e) {
43984398
//return scrollview to original height once keyboard has hidden
4399-
self.isScrolledIntoView = false;
4400-
container.style.height = "";
4401-
container.style.overflow = "";
4402-
self.resize();
4403-
ionic.scroll.isScrolling = false;
4399+
if(self.isScrolledIntoView) {
4400+
self.isScrolledIntoView = false;
4401+
container.style.height = "";
4402+
container.style.overflow = "";
4403+
self.resize();
4404+
ionic.scroll.isScrolling = false;
4405+
}
44044406
};
44054407

44064408
//Broadcasted when keyboard is shown on some platforms.
@@ -4823,6 +4825,8 @@ ionic.views.Scroll = ionic.views.View.inherit({
48234825
},
48244826

48254827
resize: function() {
4828+
if(!this.__container || !this.options) return;
4829+
48264830
// Update Scroller dimensions for changed content
48274831
// Add padding to bottom of content
48284832
this.setDimensions(
@@ -35224,7 +35228,7 @@ angular.module('ui.router.compat')
3522435228
* Copyright 2014 Drifty Co.
3522535229
* http://drifty.com/
3522635230
*
35227-
* Ionic, v1.0.0-beta.12-nightly-470
35231+
* Ionic, v1.0.0-beta.12-nightly-471
3522835232
* A powerful HTML5 mobile app framework.
3522935233
* http://ionicframework.com/
3523035234
*
@@ -39965,7 +39969,7 @@ function($scope, scrollViewOptions, $timeout, $window, $$scrollValueCache, $loca
3996539969
*/
3996639970
this._setRefresher = function(refresherScope, refresherElement) {
3996739971
var refresher = this.refresher = refresherElement;
39968-
var refresherHeight = self.refresher.clientHeight || 0;
39972+
var refresherHeight = self.refresher.clientHeight || 60;
3996939973
scrollView.activatePullToRefresh(refresherHeight, function() {
3997039974
// activateCallback
3997139975
refresher.classList.add('active');

Diff for: ‎nightly/ionic/js/ionic.bundle.min.js

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎nightly/ionic/js/ionic.js

+11-7
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright 2014 Drifty Co.
33
* http://drifty.com/
44
*
5-
* Ionic, v1.0.0-beta.12-nightly-470
5+
* Ionic, v1.0.0-beta.12-nightly-471
66
* A powerful HTML5 mobile app framework.
77
* http://ionicframework.com/
88
*
@@ -18,7 +18,7 @@
1818
// build processes may have already created an ionic obj
1919
window.ionic = window.ionic || {};
2020
window.ionic.views = {};
21-
window.ionic.version = '1.0.0-beta.12-nightly-470';
21+
window.ionic.version = '1.0.0-beta.12-nightly-471';
2222

2323
(function(window, document, ionic) {
2424

@@ -4389,11 +4389,13 @@ ionic.views.Scroll = ionic.views.View.inherit({
43894389

43904390
self.resetScrollView = function(e) {
43914391
//return scrollview to original height once keyboard has hidden
4392-
self.isScrolledIntoView = false;
4393-
container.style.height = "";
4394-
container.style.overflow = "";
4395-
self.resize();
4396-
ionic.scroll.isScrolling = false;
4392+
if(self.isScrolledIntoView) {
4393+
self.isScrolledIntoView = false;
4394+
container.style.height = "";
4395+
container.style.overflow = "";
4396+
self.resize();
4397+
ionic.scroll.isScrolling = false;
4398+
}
43974399
};
43984400

43994401
//Broadcasted when keyboard is shown on some platforms.
@@ -4816,6 +4818,8 @@ ionic.views.Scroll = ionic.views.View.inherit({
48164818
},
48174819

48184820
resize: function() {
4821+
if(!this.__container || !this.options) return;
4822+
48194823
// Update Scroller dimensions for changed content
48204824
// Add padding to bottom of content
48214825
this.setDimensions(

Diff for: ‎nightly/ionic/js/ionic.min.js

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎nightly/ionic/version.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"version": "1.0.0-beta.12-nightly-470",
2+
"version": "1.0.0-beta.12-nightly-471",
33
"codename": "krypton-koala",
44
"date": "2014-09-17",
5-
"time": "01:01:22"
5+
"time": "03:56:29"
66
}

0 commit comments

Comments
 (0)