Skip to content

Commit

Permalink
Minor fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Sebastian Werner committed Nov 16, 2011
1 parent c3602ee commit 341d09c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
15 changes: 8 additions & 7 deletions demo/asset/render.js
Expand Up @@ -22,17 +22,18 @@ var render = (function(global) {
}[engine];

var helperElem = document.createElement("div");
var undef;

var perspectiveProperty = vendorPrefix + "perspective";
var transformProperty = vendorPrefix + "transform";
var perspectiveProperty = vendorPrefix + "Perspective";
var transformProperty = vendorPrefix + "Transform";

if (helperElem.style[perspectiveProperty]) {
if (helperElem.style[perspectiveProperty] !== undef) {

return function(left, top, zoom) {
content.style[perspectiveProperty] = 'translate3d(' + (-left) + 'px,' + (-top) + 'px,0) scale(' + zoom + ')';
content.style[transformProperty] = 'translate3d(' + (-left) + 'px,' + (-top) + 'px,0) scale(' + zoom + ')';
};

} else if (helperElem.style[transformProperty]) {
} else if (helperElem.style[transformProperty] !== undef) {

return function(left, top, zoom) {
content.style[transformProperty] = 'translate(' + (-left) + 'px,' + (-top) + 'px) scale(' + zoom + ')';
Expand All @@ -41,8 +42,8 @@ var render = (function(global) {
} else {

return function(left, top, zoom) {
content.style.marginLeft = left ? (-left) + 'px' : '';
content.style.marginTop = top ? (-top) + 'px' : '';
content.style.marginLeft = left ? (-left/zoom) + 'px' : '';
content.style.marginTop = top ? (-top/zoom) + 'px' : '';
content.style.zoom = zoom || '';
};

Expand Down
5 changes: 2 additions & 3 deletions src/Scroller.js
Expand Up @@ -345,7 +345,6 @@ var Scroller;

/**
* Signalizes that pull-to-refresh is finished.
*
*/
finishPullToRefresh: function() {

Expand Down Expand Up @@ -1063,14 +1062,14 @@ var Scroller;
__computeScrollMax: function(zoomLevel) {

var self = this;

if (zoomLevel == null) {
zoomLevel = self.__zoomLevel;
}

self.__maxScrollLeft = Math.max((self.__contentWidth * zoomLevel) - self.__clientWidth, 0);
self.__maxScrollTop = Math.max((self.__contentHeight * zoomLevel) - self.__clientHeight, 0);

},


Expand Down

0 comments on commit 341d09c

Please sign in to comment.