wbrawner/piskel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'feature-save-panel' of https://github.com/juliandescottes/piskel into feature-save-panel

Browse source
This commit is contained in:
jdescottes 2014-02-09 21:10:09 +01:00
commit a31e3570f3
5 changed files with 36 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
index.html
View file

@ -9,6 +9,19 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
</head>
<body>
<div
id="loading-mask"
style="
position:fixed;
top:0;right:0;bottom:0;left:0;
background:black;
opacity:1;
text-align:center;
z-index : 20000;
transition:opacity 0.5s;
color:white;">
<span style="top:45%">Loading pixels ...</span>
</div>
<script type="text/javascript" src="js/lib/iframeLoader.js"></script>
<div class="piskel-name-container">
<input readonly id="piskel-name" type="text" value=""/>

2
js/controller/PreviewFilmController.js
View file

@ -180,7 +180,7 @@
}
var tileCount = document.createElement("div");
tileCount.className = "tile-overlay tile-count";
tileCount.innerHTML = tileNumber;
tileCount.innerHTML = tileNumber + 1;
previewTileRoot.appendChild(tileCount);

8
js/drawingtools/BaseTool.js
View file

@ -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;
}
};

3
js/drawingtools/selectiontools/BaseSelect.js
View file

@ -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

20
piskel-boot.js
View file

@ -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 ....");
}