javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

added Math.min in case the parent is smaller

Browse Source
This commit is contained in:
Travis Russi
2013-11-30 16:57:56 -08:00
parent c96a46a0d7
commit 1fd7be8785
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
js/ext/angular/src/directive/ionicContent.js vendored
View File

@@ -62,7 +62,11 @@ angular.module('ionic.ui.content', [])
addedPadding = true;
}
$element.append(sc);
// Pass the parent scope down to the child
clone = transclude($scope.$parent);
angular.element($element[0].firstElementChild).append(clone);
// Otherwise, supercharge this baby!
// Add timeout to let content render so Scroller.resize grabs the right content height
$timeout(function() {
@@ -85,9 +89,6 @@ angular.module('ionic.ui.content', [])
$scope.$parent.scrollView = sv;
}, 100);
// Pass the parent scope down to the child
clone = transclude($scope.$parent);
angular.element($element[0].firstElementChild).append(clone);
}
// if padding attribute is true, then add padding if it wasn't added to the .scroll

6
js/views/scrollZyng.js
View File

@@ -583,7 +583,11 @@ var Scroller;
resize: function() {
// Update Scroller dimensions for changed content
// Add padding to bottom of content
this.setDimensions(this.__container.clientWidth, this.__container.clientHeight, this.__content.offsetWidth, this.__content.offsetHeight+50);
this.setDimensions(
Math.min(this.__container.clientWidth, this.__container.parentElement.clientWidth),
Math.min(this.__container.clientHeight, this.__container.parentElement.clientHeight),
this.__content.offsetWidth,
this.__content.offsetHeight+50);
},
/*
---------------------------------------------------------------------------