summaryrefslogtreecommitdiff
path: root/morphic.js
diff options
context:
space:
mode:
Diffstat (limited to 'morphic.js')
-rw-r--r--morphic.js13
1 files changed, 7 insertions, 6 deletions
diff --git a/morphic.js b/morphic.js
index b3c9769..b55b180 100644
--- a/morphic.js
+++ b/morphic.js
@@ -8,7 +8,7 @@
written by Jens Mönig
jens@moenig.org
- Copyright (C) 2013 by Jens Mönig
+ Copyright (C) 2014 by Jens Mönig
This file is part of Snap!.
@@ -1035,7 +1035,7 @@
/*global window, HTMLCanvasElement, getMinimumFontHeight, FileReader, Audio,
FileList, getBlurredShadowSupport*/
-var morphicVersion = '2013-December-12';
+var morphicVersion = '2014-February-03';
var modules = {}; // keep track of additional loaded modules
var useBlurredShadows = getBlurredShadowSupport(); // check for Chrome-bug
@@ -3068,7 +3068,7 @@ Morph.prototype.updateReferences = function (dict) {
*/
var property;
for (property in this) {
- if (property.isMorph && dict[property]) {
+ if (this[property] && this[property].isMorph && dict[property]) {
this[property] = dict[property];
}
}
@@ -10029,13 +10029,14 @@ WorldMorph.prototype.fillPage = function () {
this.worldCanvas.style.top = "0px";
pos.y = 0;
}
- if (document.body.scrollTop) { // scrolled down b/c of viewport scaling
+ if (document.documentElement.scrollTop) {
+ // scrolled down b/c of viewport scaling
clientHeight = document.documentElement.clientHeight;
}
- if (document.body.scrollLeft) { // scrolled left b/c of viewport scaling
+ if (document.documentElement.scrollLeft) {
+ // scrolled left b/c of viewport scaling
clientWidth = document.documentElement.clientWidth;
}
-
if (this.worldCanvas.width !== clientWidth) {
this.worldCanvas.width = clientWidth;
this.setWidth(clientWidth);