diff --git a/index.html b/index.html
index b6bb7fff..9550a6b8 100644
--- a/index.html
+++ b/index.html
@@ -9,6 +9,19 @@
+
+ Loading pixels ...
+
diff --git a/js/drawingtools/BaseTool.js b/js/drawingtools/BaseTool.js
index 890c045b..1d2dfd40 100644
--- a/js/drawingtools/BaseTool.js
+++ b/js/drawingtools/BaseTool.js
@@ -32,9 +32,11 @@
};
ns.BaseTool.prototype.hideHighlightedPixel = function(overlay) {
- overlay.setPixel(this.highlightedPixelCol, this.highlightedPixelRow, Constants.TRANSPARENT_COLOR);
- this.highlightedPixelRow = null;
- this.highlightedPixelCol = null;
+ if (this.highlightedPixelRow !== null && this.highlightedPixelCol !== null) {
+ overlay.setPixel(this.highlightedPixelCol, this.highlightedPixelRow, Constants.TRANSPARENT_COLOR);
+ this.highlightedPixelRow = null;
+ this.highlightedPixelCol = null;
+ }
};
diff --git a/js/drawingtools/selectiontools/BaseSelect.js b/js/drawingtools/selectiontools/BaseSelect.js
index 19972394..f6475699 100644
--- a/js/drawingtools/selectiontools/BaseSelect.js
+++ b/js/drawingtools/selectiontools/BaseSelect.js
@@ -70,6 +70,9 @@
}
};
+ ns.BaseSelect.prototype.hideHighlightedPixel = function () {
+ // not implemented for selection tools
+ };
/**
* If we mouseover the selection draw inside the overlay frame, show the 'move' cursor
diff --git a/js/rendering/DrawingLoop.js b/js/rendering/DrawingLoop.js
index d746f684..e1816011 100644
--- a/js/rendering/DrawingLoop.js
+++ b/js/rendering/DrawingLoop.js
@@ -6,7 +6,6 @@
this.isRunning = false;
this.previousTime = 0;
this.callbacks = [];
- this.i = 0;
};
ns.DrawingLoop.prototype.addCallback = function (callback, scope, args) {
@@ -34,10 +33,7 @@
ns.DrawingLoop.prototype.loop_ = function () {
var currentTime = Date.now();
var delta = currentTime - this.previousTime;
- this.i++;
- if(this.i%2 === 0) {
- this.executeCallbacks_(delta);
- }
+ this.executeCallbacks_(delta);
this.previousTime = currentTime;
this.requestAnimationFrame.call(window, this.loop_.bind(this));
};
diff --git a/piskel-boot.js b/piskel-boot.js
index 9317ca2b..b9be8a96 100644
--- a/piskel-boot.js
+++ b/piskel-boot.js
@@ -1,4 +1,16 @@
(function () {
+
+ window.onPiskelReady = function () {
+ var loadingMask = document.getElementById('loading-mask');
+ loadingMask.style.opacity = 0;
+ window.setTimeout(function () {loadingMask.parentNode.removeChild(loadingMask);}, 600)
+ pskl.app.init();
+ // cleanup
+ delete window.exports;
+ delete window.loadDebugScripts;
+ delete window.done;
+ };
+
var prefixPath = function (path) {
if (window.pskl && window.pskl.appEngineToken_) {
return '../' + path;
@@ -29,11 +41,7 @@
var scriptIndex = 0;
window.loadNextScript = function () {
if (scriptIndex == window.exports.scripts.length) {
- pskl.app.init();
- // cleanup
- delete window.exports;
- delete window.loadDebugScripts;
- delete window.done;
+ window.onPiskelReady();
} else {
loadScript(window.exports.scripts[scriptIndex], "loadNextScript()");
scriptIndex ++;
@@ -60,7 +68,7 @@
var loaderInterval = window.setInterval(function () {
if (document.querySelectorAll("[data-iframe-loader]").length === 0) {
window.clearInterval(loaderInterval);
- loadScript(script, "pskl.app.init()");
+ loadScript(script, "onPiskelReady()");
} else {
console.log("waiting for templates to load ....");
}