mirror/piskel
1
0
Fork 0
mirror of https://github.com/piskelapp/piskel.git synced 2023-08-10 21:12:52 +03:00
Code Issues Projects Releases Wiki Activity

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"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
</head> </head>
<body> <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> <script type="text/javascript" src="js/lib/iframeLoader.js"></script>
<div class="piskel-name-container"> <div class="piskel-name-container">
<input readonly id="piskel-name" type="text" value=""/> <input readonly id="piskel-name" type="text" value=""/>

2
js/controller/PreviewFilmController.js
View File

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

2
js/drawingtools/BaseTool.js
View File

@ -32,9 +32,11 @@
}; };
ns.BaseTool.prototype.hideHighlightedPixel = function(overlay) { ns.BaseTool.prototype.hideHighlightedPixel = function(overlay) {
if (this.highlightedPixelRow !== null && this.highlightedPixelCol !== null) {
overlay.setPixel(this.highlightedPixelCol, this.highlightedPixelRow, Constants.TRANSPARENT_COLOR); overlay.setPixel(this.highlightedPixelCol, this.highlightedPixelRow, Constants.TRANSPARENT_COLOR);
this.highlightedPixelRow = null; this.highlightedPixelRow = null;
this.highlightedPixelCol = 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 * 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 () { (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) { var prefixPath = function (path) {
if (window.pskl && window.pskl.appEngineToken_) { if (window.pskl && window.pskl.appEngineToken_) {
return '../' + path; return '../' + path;
@ -29,11 +41,7 @@
var scriptIndex = 0; var scriptIndex = 0;
window.loadNextScript = function () { window.loadNextScript = function () {
if (scriptIndex == window.exports.scripts.length) { if (scriptIndex == window.exports.scripts.length) {
pskl.app.init(); window.onPiskelReady();
// cleanup
delete window.exports;
delete window.loadDebugScripts;
delete window.done;
} else { } else {
loadScript(window.exports.scripts[scriptIndex], "loadNextScript()"); loadScript(window.exports.scripts[scriptIndex], "loadNextScript()");
scriptIndex ++; scriptIndex ++;
@ -60,7 +68,7 @@
var loaderInterval = window.setInterval(function () { var loaderInterval = window.setInterval(function () {
if (document.querySelectorAll("[data-iframe-loader]").length === 0) { if (document.querySelectorAll("[data-iframe-loader]").length === 0) {
window.clearInterval(loaderInterval); window.clearInterval(loaderInterval);
loadScript(script, "pskl.app.init()"); loadScript(script, "onPiskelReady()");
} else { } else {
console.log("waiting for templates to load ...."); console.log("waiting for templates to load ....");
} }