summaryrefslogtreecommitdiff
path: root/morphic.js
diff options
context:
space:
mode:
authorjmoenig <jens@moenig.org>2013-08-06 13:02:09 +0200
committerjmoenig <jens@moenig.org>2013-08-06 13:02:09 +0200
commita9a8ad6c9df9ad65e6b197b2170d5f5f39fbd323 (patch)
treeaa309fccdb996a8700558ac7608833754002ee5b /morphic.js
parentade3c6ab48df170af5ed82124aed9dd620773a8a (diff)
downloadsnap-yow-a9a8ad6c9df9ad65e6b197b2170d5f5f39fbd323.tar.gz
snap-yow-a9a8ad6c9df9ad65e6b197b2170d5f5f39fbd323.zip
Morphic: mouseEnterDragging fix
and a few cosmetic changes due to JSLint's latest nitpickings
Diffstat (limited to 'morphic.js')
-rw-r--r--morphic.js18
1 files changed, 9 insertions, 9 deletions
diff --git a/morphic.js b/morphic.js
index 1a20946..aae17fd 100644
--- a/morphic.js
+++ b/morphic.js
@@ -1035,7 +1035,7 @@
/*global window, HTMLCanvasElement, getMinimumFontHeight, FileReader, Audio,
FileList, getBlurredShadowSupport*/
-var morphicVersion = '2013-June-28';
+var morphicVersion = '2013-August-06';
var modules = {}; // keep track of additional loaded modules
var useBlurredShadows = getBlurredShadowSupport(); // check for Chrome-bug
@@ -9635,7 +9635,7 @@ HandMorph.prototype.processMouseMove = function (event) {
if (old.mouseLeave) {
old.mouseLeave();
}
- if (old.mouseLeaveDragging && this.mouseButton) {
+ if (old.mouseLeaveDragging && myself.mouseButton) {
old.mouseLeaveDragging();
}
}
@@ -9645,7 +9645,7 @@ HandMorph.prototype.processMouseMove = function (event) {
if (newMorph.mouseEnter) {
newMorph.mouseEnter();
}
- if (newMorph.mouseEnterDragging && this.mouseButton) {
+ if (newMorph.mouseEnterDragging && myself.mouseButton) {
newMorph.mouseEnterDragging();
}
}
@@ -9788,18 +9788,18 @@ HandMorph.prototype.processDrop = function (event) {
}
function parseImgURL(html) {
- var url = '',
- i,
+ var iurl = '',
+ idx,
c,
start = html.indexOf('<img src="');
if (start === -1) {return null; }
start += 10;
- for (i = start; i < html.length; i += 1) {
- c = html[i];
+ for (idx = start; idx < html.length; idx += 1) {
+ c = html[idx];
if (c === '"') {
- return url;
+ return iurl;
}
- url = url.concat(c);
+ iurl = iurl.concat(c);
}
return null;
}